misc: Update package version.

Merge pull request #315 from irihitech/rc/313-content-control-template
Remove default implementation of ContentControl and UserControl
2026-03-03 00:00:55 +08:00 · 2024-03-16 18:33:09 +08:00 · 2024-03-15 23:14:09 +08:00 · 2024-03-15 23:07:04 +08:00 · 2024-03-15 20:55:00 +08:00 · 2024-03-15 18:10:39 +08:00
116 changed files with 1011 additions and 1171 deletions
--- a/.github/workflows/Pack.yml
+++ b/.github/workflows/Pack.yml
@@ -49,7 +49,7 @@ jobs:
        run: dotnet restore

      - name: Build
-        run: dotnet publish ./demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore
+        run: dotnet publish ./demo/Semi.Avalonia.Demo.Android -c Release -f net7.0-android --no-restore

      - name: Upload a Build Artifact
        uses: actions/upload-artifact@v4.3.1
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -2,7 +2,7 @@ name: Deploy to GitHub Pages

 env:
  PROJECT_PATH: demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
-  OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Release/net8.0-browser/publish/wwwroot
+  OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Release/net7.0/browser-wasm/AppBundle
 on:
  push:
    branches: [ "action/deploy" ]
@@ -16,16 +16,19 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4.1.1

-      - name: Setup .NET 8
+      - name: Setup .NET 7
        uses: actions/setup-dotnet@v4
        with:
-          dotnet-version: 8.0.x
+          dotnet-version: 7.0.405

      - name: Install wasm-tools
-        run: dotnet workload install wasm-tools
+        run: dotnet workload install wasm-tools wasm-tools-net7
+
+      - name: Install DotNetCompress
+        run: dotnet tool install --global DotNetCompress --version 3.0.0 --no-cache

      - name: Publish .NET Project
-        run: dotnet publish $PROJECT_PATH -c Release --nologo
+        run: dotnet publish $PROJECT_PATH -c Release -o release --nologo

      - name: Change base-tag in index.html
        run: sed -i 's/<base href="\/" \/>/<base href="\/Semi.Avalonia\/" \/>/g' $OUTPUT_PATH/index.html
@@ -33,6 +36,12 @@ jobs:
      - name: copy index.html to 404.html
        run: cp $OUTPUT_PATH/index.html $OUTPUT_PATH/404.html

+      - name: Compress Output using Brotli
+        run: DotNetCompress -d $OUTPUT_PATH -p "*.dll" "*.js" "*.wasm" --format br --threads 4
+
+      - name: Compress Output using GZip
+        run: DotNetCompress -d $OUTPUT_PATH -p "*.dll" "*.js" "*.wasm" --format gz --threads 4
+
      - name: Add .nojekyll file
        run: touch $OUTPUT_PATH/.nojekyll

--- a/.run/SC-Single.run.xml
+++ b/.run/SC-Single.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="SC-Single" type="DotNetFolderPublish" factoryName="Publish to folder">
-    <riderPublish configuration="Release" include_native_libs_for_self_extract="true" platform="Any CPU" produce_single_file="true" runtime="win-x64" self_contained="true" target_folder="$PROJECT_DIR$/demo/Semi.Avalonia.Demo.Desktop/bin/Release/net8.0/win-x64/publish" target_framework="net8.0" uuid_high="3088527218258560748" uuid_low="-8649338673481336678" />
+    <riderPublish configuration="Release" include_native_libs_for_self_extract="true" platform="Any CPU" produce_single_file="true" runtime="win-x64" self_contained="true" target_folder="$PROJECT_DIR$/demo/Semi.Avalonia.Demo.Desktop/bin/Release/net7.0/win-x64/publish" target_framework="net7.0" uuid_high="3088527218258560748" uuid_low="-8649338673481336678" />
    <method v="2" />
  </configuration>
 </component>
--- a/README.md
+++ b/README.md
@@ -1,16 +1,24 @@
-# Semi.Avalonia
+# Semi Avalonia

 [![Semi Avalonia](https://img.shields.io/nuget/v/Semi.Avalonia.svg?color=red&style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
 [![Semi Avalonia](https://img.shields.io/nuget/dt/Semi.Avalonia.svg?style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)

+[中文](./README_CN.md)
+
 Avalonia Theme inspired by Semi Design

-# How to Use
+If you are looking for more customized controls, Please try [Ursa](https://github.com/irihitech/Ursa.Avalonia)
+
+![Light](./docs/demo.jpg)
+
+## How to Use
+
+### Installation

-## Installation
 ```bash
-dotnet add package Semi.Avalonia
+dotnet add package Semi.Avalonia --version 11.0.7
 ```
+
 Include Semi Design Styles in application:

 ```xaml
@@ -19,14 +27,16 @@ Include Semi Design Styles in application:
 </Application.Styles>
 ```

-That's all. 
+That's all.

 ColorPicker, DataGrid and TreeDataGrid are distributed in separated packages. Please install if you need. 
+
 ```bash
-dotnet add package Semi.Avalonia.ColorPicker
-dotnet add package Semi.Avalonia.DataGrid
-dotnet add package Semi.Avalonia.TreeDataGrid
+dotnet add package Semi.Avalonia.ColorPicker --version 11.0.7
+dotnet add package Semi.Avalonia.DataGrid --version 11.0.7
+dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.7
 ```
+
 ```xaml
 <Application.Styles>
    <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
@@ -38,7 +48,7 @@ dotnet add package Semi.Avalonia.TreeDataGrid
 ## Demo

 You can always download demo executable to play around with Semi Avalonia Themes.
-https://github.com/irihitech/Semi.Avalonia/releases
+<https://github.com/irihitech/Semi.Avalonia/releases>

 ## Version compatibility

@@ -48,6 +58,7 @@ https://github.com/irihitech/Semi.Avalonia/releases
 | 11.0.1              | <=11.0.6         |

 ## TODO
+
 * FocusAdorner

 ## Credits
@@ -62,10 +73,3 @@ https://github.com/irihitech/Semi.Avalonia/releases

 [CommunityToolKit](https://github.com/CommunityToolkit/dotnet)

-## Screenshot
-
-Light Mode
-![Light](./docs/Light.png)
-
-Dark Mode
-![Dark](./docs/Dark.png)
--- a/README_CN.md
+++ b/README_CN.md
@@ -0,0 +1,76 @@
+# Semi Avalonia
+
+[![Semi Avalonia](https://img.shields.io/nuget/v/Semi.Avalonia.svg?color=red&style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
+[![Semi Avalonia](https://img.shields.io/nuget/dt/Semi.Avalonia.svg?style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
+
+[English](./README.md)
+
+Avalonia UI 控件主题，灵感来自 Semi Design
+
+如果您希望使用更多的拓展控件，欢迎尝试 [Ursa](https://github.com/irihitech/Ursa.Avalonia)
+
+![Light](./docs/demo.jpg)
+
+## 如何使用
+
+### 安装
+
+```bash
+dotnet add package Semi.Avalonia --version 11.0.7
+```
+
+在样式中引用 Semi 主题：
+
+```xaml
+<Application.Styles>
+    <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
+</Application.Styles>
+```
+
+这样就可以了。
+
+ColorPicker， DataGrid 和 TreeDataGrid 的样式单独分发，如果需要请安装并引用。
+
+```bash
+dotnet add package Semi.Avalonia.ColorPicker --version 11.0.7
+dotnet add package Semi.Avalonia.DataGrid --version 11.0.7
+dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.7
+```
+
+```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" />
+</Application.Styles>
+```
+
+## 示例
+
+您可以从 Semi Avalonia 的 release 页下载并试用 Semi Avalonia 的展示应用。
+
+<https://github.com/irihitech/Semi.Avalonia/releases>
+
+## 版本兼容性
+
+| Semi Design Version | Avalonia Version |
+|:--------------------|:-----------------|
+| 11.0.7              | >=11.0.7           |
+| 11.0.1              | <=11.0.6         |
+
+## 代办事项
+
+* FocusAdorner
+
+## 致谢
+
+[Semi Design](https://semi.design/)
+
+[Avalonia](https://github.com/AvaloniaUI/Avalonia)
+
+[FluentAvalonia](https://github.com/amwx/FluentAvalonia)
+
+[Material Design Icons](https://pictogrammers.com/library/mdi/)
+
+[CommunityToolKit](https://github.com/CommunityToolkit/dotnet)
+
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
    <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.7</AvaloniaVersion>
+    <AvaloniaVersion>11.1.0-beta1</AvaloniaVersion>
  </PropertyGroup>
 </Project>
--- a/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
+++ b/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0-android</TargetFramework>
+        <TargetFramework>net7.0-android</TargetFramework>
        <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
        <ApplicationId>com.irihitech.Semi.Avalonia</ApplicationId>
        <ApplicationVersion>1</ApplicationVersion>
@@ -15,11 +15,11 @@
    <Import Project="../Directory.Build.props" />

    <ItemGroup>
-        <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
+      <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
    </ItemGroup>

    <ItemGroup>
-        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
+      <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
    </ItemGroup>
-
+    
 </Project>
--- a/demo/Semi.Avalonia.Demo.Desktop/Roots.xml
+++ b/demo/Semi.Avalonia.Demo.Desktop/Roots.xml
@@ -1,3 +0,0 @@
-<linker>
-    <assembly fullname="Semi.Avalonia.Demo" preserve="All"/>
-</linker>
--- a/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
+++ b/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
        <OutputType>WinExe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
        <Nullable>enable</Nullable>
        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
        <!-- Uncomment below to enable Native AOT compilation-->
@@ -11,17 +11,12 @@
        -->
    </PropertyGroup>

-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsTrimmable>true</IsTrimmable>
-        <PublishTrimmed>true</PublishTrimmed>
-    </PropertyGroup>
-
    <PropertyGroup>
        <ApplicationManifest>app.manifest</ApplicationManifest>
    </PropertyGroup>
-
+    
    <ItemGroup>
-        <TrimmerRootDescriptor Include="Roots.xml" />
+        <RdXmlFile Include="rd.xml" />
    </ItemGroup>

    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo.Desktop/rd.xml
+++ b/demo/Semi.Avalonia.Demo.Desktop/rd.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Directives>
+    <!--
+        This file is part of RdXmlLibrary project.
+        Visit https://github.com/kant2002/rdxmllibrary for latest version.
+        If you have modifications specific to this Nuget package,
+        please contribute back.
+    -->
+    <Application>
+        <Assembly Name="Avalonia.Markup.Xaml" Dynamic="Required All"/>
+        <Assembly Name="Semi.Avalonia" Dynamic="Required All"/>
+        <Assembly Name="Semi.Avalonia.DataGrid" Dynamic="Required All"/>
+        <Assembly Name="Semi.Avalonia.ColorPicker" Dynamic="Required All"/>
+        <Assembly Name="Semi.Avalonia.Demo" Dynamic="Required All"/>
+    </Application>
+</Directives>
--- a/demo/Semi.Avalonia.Demo.Web/AvaloniaAppBuilderExtensions.cs
+++ b/demo/Semi.Avalonia.Demo.Web/AvaloniaAppBuilderExtensions.cs
@@ -1,16 +0,0 @@
-using Avalonia;
-using Avalonia.Media;
-
-namespace Semi.Avalonia.Demo.Web;
-
-public static class AvaloniaAppBuilderExtensions
-{
-    private static string DefaultFontFamily => "avares://Semi.Avalonia.Demo.Web/Assets#Source Han Sans CN";
-
-    public static AppBuilder WithSourceHanSansCNFont(this AppBuilder builder) =>
-        builder.With(new FontManagerOptions
-        {
-            DefaultFamilyName = DefaultFontFamily,
-            FontFallbacks = new[] { new FontFallback { FontFamily = new FontFamily(DefaultFontFamily) } }
-        });
-}
--- a/demo/Semi.Avalonia.Demo.Web/Program.cs
+++ b/demo/Semi.Avalonia.Demo.Web/Program.cs
@@ -10,7 +10,6 @@ namespace Semi.Avalonia.Demo.Web;
 internal sealed partial class Program
 {
    private static Task Main(string[] args) => BuildAvaloniaApp()
-        .WithSourceHanSansCNFont()
        .StartBrowserAppAsync("out");

    public static AppBuilder BuildAvaloniaApp()
--- a/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
+++ b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
@@ -1,18 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk.WebAssembly">
+<Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
        <OutputType>Exe</OutputType>
        <TargetFramework>net8.0-browser</TargetFramework>
+        <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+        <WasmMainJSPath>wwwroot\main.js</WasmMainJSPath>
+        <WasmRuntimeAssetsLocation>./_framework</WasmRuntimeAssetsLocation>
    </PropertyGroup>

    <ItemGroup>
-        <AvaloniaResource Include="Assets\**"/>
+        <WasmExtraFilesToDeploy Include="wwwroot\**"/>
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
    </ItemGroup>

    <ItemGroup>
-        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj"/>
+        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
    </ItemGroup>
 </Project>
--- a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
@@ -70,5 +70,16 @@
                </DataTemplate>
            </AutoCompleteBox.ItemTemplate>
        </AutoCompleteBox>
+        <AutoCompleteBox 
+            InnerLeftContent="https://"
+            InnerRightContent=".com"
+            ItemsSource="{Binding States}"
+            ValueMemberBinding="{ReflectionBinding Name}">
+            <AutoCompleteBox.ItemTemplate>
+                <DataTemplate DataType="local:StateData">
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </AutoCompleteBox.ItemTemplate>
+        </AutoCompleteBox>
    </StackPanel>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
@@ -4,176 +4,114 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
    mc:Ignorable="d">
-    <ScrollViewer>
-        <StackPanel HorizontalAlignment="Left" Spacing="20">
-            <StackPanel.Styles>
-                <Style Selector="SplitButton">
-                    <Setter Property="Flyout">
-                        <MenuFlyout Placement="BottomEdgeAlignedRight">
-                            <MenuItem Header="Submit All" />
-                            <MenuItem Header="Submit Updated" />
-                        </MenuFlyout>
-                    </Setter>
-                </Style>
-                <Style Selector="DropDownButton">
-                    <Setter Property="Flyout">
-                        <MenuFlyout Placement="BottomEdgeAlignedRight">
-                            <MenuItem Header="Submit All" />
-                            <MenuItem Header="Submit Updated" />
-                        </MenuFlyout>
-                    </Setter>
-                </Style>
-                <Style Selector="ToggleSplitButton">
-                    <Setter Property="Flyout">
-                        <MenuFlyout Placement="BottomEdgeAlignedRight">
-                            <MenuItem Header="Submit All" />
-                            <MenuItem Header="Submit Updated" />
-                        </MenuFlyout>
-                    </Setter>
-                </Style>
-            </StackPanel.Styles>
-
-            <TextBlock>Light (Default)</TextBlock>
-            <StackPanel Orientation="Horizontal" Spacing="20">
-                <Button Classes="Primary">Primary</Button>
-                <Button Classes="Secondary">Secondary</Button>
-                <Button Classes="Tertiary">Tertiary</Button>
-                <Button Classes="Success">Success</Button>
-                <Button Classes="Warning">Warning</Button>
-                <Button Classes="Danger">Danger</Button>
-                <Button Classes="Danger" IsEnabled="False">Disabled</Button>
-            </StackPanel>
-            <TextBlock>Solid</TextBlock>
-            <StackPanel Orientation="Horizontal" Spacing="20">
-                <Button Classes="Primary" Theme="{DynamicResource SolidButton}">Primary</Button>
-                <Button Classes="Secondary" Theme="{DynamicResource SolidButton}">Secondary</Button>
-                <Button Classes="Tertiary" Theme="{DynamicResource SolidButton}">Tertiary</Button>
-                <Button Classes="Success" Theme="{DynamicResource SolidButton}">Success</Button>
-                <Button Classes="Warning" Theme="{DynamicResource SolidButton}">Warning</Button>
-                <Button Classes="Danger" Theme="{DynamicResource SolidButton}">Danger</Button>
-                <Button
-                    Classes="Danger"
-                    IsEnabled="False"
-                    Theme="{DynamicResource SolidButton}">
-                    Disabled
-                </Button>
-            </StackPanel>
-            <TextBlock>Outline</TextBlock>
-            <StackPanel Orientation="Horizontal" Spacing="20">
-                <Button Classes="Primary" Theme="{DynamicResource OutlineButton}">Primary</Button>
-                <Button Classes="Secondary" Theme="{DynamicResource OutlineButton}">Secondary</Button>
-                <Button Classes="Tertiary" Theme="{DynamicResource OutlineButton}">Tertiary</Button>
-                <Button Classes="Success" Theme="{DynamicResource OutlineButton}">Success</Button>
-                <Button Classes="Warning" Theme="{DynamicResource OutlineButton}">Warning</Button>
-                <Button Classes="Danger" Theme="{DynamicResource OutlineButton}">Danger</Button>
-                <Button Classes="Danger" Theme="{DynamicResource OutlineButton}" IsEnabled="False">Disabled</Button>
-            </StackPanel>
-            <TextBlock>Borderless</TextBlock>
-            <StackPanel Orientation="Horizontal" Spacing="20">
-                <Button Classes="Primary" Theme="{DynamicResource BorderlessButton}">Primary</Button>
-                <Button Classes="Secondary" Theme="{DynamicResource BorderlessButton}">Secondary</Button>
-                <Button Classes="Tertiary" Theme="{DynamicResource BorderlessButton}">Tertiary</Button>
-                <Button Classes="Success" Theme="{DynamicResource BorderlessButton}">Success</Button>
-                <Button Classes="Warning" Theme="{DynamicResource BorderlessButton}">Warning</Button>
-                <Button Classes="Danger" Theme="{DynamicResource BorderlessButton}">Danger</Button>
-                <Button
-                    Classes="Danger"
-                    IsEnabled="False"
-                    Theme="{DynamicResource BorderlessButton}">
-                    Disabled
-                </Button>
-            </StackPanel>
-            <TextBlock>Disabled</TextBlock>
-            <StackPanel Background="{DynamicResource SemiColorBackground1}" Orientation="Horizontal" Spacing="20">
-                <Button IsEnabled="False">Light</Button>
-                <Button IsEnabled="False" Theme="{DynamicResource SolidButton}">Solid</Button>
-                <Button IsEnabled="False" Theme="{DynamicResource OutlineButton}">Outline</Button>
-                <Button IsEnabled="False" Theme="{DynamicResource BorderlessButton}">Borderless</Button>
-            </StackPanel>
-            <TextBlock>Size Classes</TextBlock>
-            <StackPanel Orientation="Horizontal" Spacing="20">
-                <Button Classes="Primary Small">Small</Button>
-                <Button Classes="Primary">Default</Button>
-                <Button Classes="Primary Large">Large</Button>
-            </StackPanel>
-
-            <TextBlock>DropDownButton</TextBlock>
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <DropDownButton Content="Primary" />
-                <DropDownButton Classes="Secondary" Content="Secondary" />
-                <DropDownButton Classes="Tertiary" Content="Tertiary" />
-                <DropDownButton Classes="Success" Content="Success" />
-                <DropDownButton Classes="Warning" Content="Warning" />
-                <DropDownButton Classes="Danger" Content="Danger" />
-                <DropDownButton
-                    Classes="Danger"
-                    Content="Disabled"
-                    IsEnabled="False" />
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <DropDownButton Content="Default" Classes="Success"/>
-                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success"/>
-                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success"/>
-                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success"/>
-                <DropDownButton Content="Default" Classes="Success" IsEnabled="False"/>
-                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success" IsEnabled="False"/>
-                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success" IsEnabled="False"/>
-                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success" IsEnabled="False"/>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <DropDownButton Classes="Small" Content="Small" />
-                <DropDownButton Content="Default" />
-                <DropDownButton Classes="Large" Content="Large" />
-            </StackPanel>
-
-            <TextBlock>SplitButton</TextBlock>
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <SplitButton Content="Primary" />
-                <SplitButton Classes="Secondary" Content="Secondary" />
-                <SplitButton Classes="Tertiary" Content="Tertiary" />
-                <SplitButton Classes="Success" Content="Success" />
-                <SplitButton Classes="Warning" Content="Warning" />
-                <SplitButton Classes="Danger" Content="Danger" />
-                <SplitButton Classes="Danger" Content="Disabled" IsEnabled="False" />
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <SplitButton Content="Default" Classes="Success" />
-                <SplitButton Content="Solid" Theme="{DynamicResource SolidSplitButton}"  Classes="Success" />
-                <SplitButton Content="Outline" Theme="{DynamicResource OutlineSplitButton}" Classes="Success" />
-                <SplitButton Content="Borderless" Theme="{DynamicResource BorderlessSplitButton}" Classes="Success" />
-                <SplitButton Content="Default" Classes="Success" IsEnabled="False" />
-                <SplitButton Content="Solid" Theme="{DynamicResource SolidSplitButton}" Classes="Success" IsEnabled="False" />
-                <SplitButton Content="Outline" Theme="{DynamicResource OutlineSplitButton}" Classes="Success" IsEnabled="False" />
-                <SplitButton Content="Borderless" Theme="{DynamicResource BorderlessSplitButton}" Classes="Success" IsEnabled="False" />
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <SplitButton Classes="Small" Content="Small" />
-                <SplitButton Content="Default" />
-                <SplitButton Classes="Large" Content="Large" />
-            </StackPanel>
-
-            <TextBlock>ToggleSplitButton</TextBlock>
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <ToggleSplitButton Content="Primary" />
-                <ToggleSplitButton Classes="Secondary" Content="Secondary" />
-                <ToggleSplitButton Classes="Tertiary" Content="Tertiary" />
-                <ToggleSplitButton Classes="Success" Content="Success" />
-                <ToggleSplitButton Classes="Warning" Content="Warning" />
-                <ToggleSplitButton Classes="Danger" Content="Danger" />
-                <ToggleSplitButton Classes="Danger" Content="Disabled" IsEnabled="False" />
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <ToggleSplitButton Content="Default" Classes="Success" />
-                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True"  />
-                <ToggleSplitButton Content="Default" Classes="Success" IsEnabled="False" />
-                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True" IsEnabled="False" />
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <ToggleSplitButton Classes="Small" Content="Small" />
-                <ToggleSplitButton Content="Default" />
-                <ToggleSplitButton Classes="Large" Content="Large" />
-            </StackPanel>
+    <StackPanel HorizontalAlignment="Left" Spacing="20">
+        <TextBlock>Light (Default)</TextBlock>
+        <StackPanel Orientation="Horizontal" Spacing="20">
+            <Button Classes="Primary">Primary</Button>
+            <Button Classes="Secondary">Secondary</Button>
+            <Button Classes="Tertiary">Tertiary</Button>
+            <Button Classes="Success">Success</Button>
+            <Button Classes="Warning">Warning</Button>
+            <Button Classes="Danger">Danger</Button>
+            <Button Classes="Primary" IsEnabled="False">Danger</Button>
        </StackPanel>
-    </ScrollViewer>
-</UserControl>
+        <TextBlock>Solid</TextBlock>
+        <StackPanel Orientation="Horizontal" Spacing="20">
+            <Button Classes="Primary" Theme="{DynamicResource SolidButton}">Primary</Button>
+            <Button Classes="Secondary" Theme="{DynamicResource SolidButton}">Secondary</Button>
+            <Button Classes="Tertiary" Theme="{DynamicResource SolidButton}">Tertiary</Button>
+            <Button Classes="Success" Theme="{DynamicResource SolidButton}">Success</Button>
+            <Button Classes="Warning" Theme="{DynamicResource SolidButton}">Warning</Button>
+            <Button Classes="Danger" Theme="{DynamicResource SolidButton}">Danger</Button>
+            <Button
+                Classes="Primary"
+                IsEnabled="False"
+                Theme="{DynamicResource SolidButton}">
+                Danger
+            </Button>
+        </StackPanel>
+        <TextBlock>Borderless</TextBlock>
+        <StackPanel Orientation="Horizontal" Spacing="20">
+            <Button Classes="Primary" Theme="{DynamicResource BorderlessButton}">Primary</Button>
+            <Button Classes="Secondary" Theme="{DynamicResource BorderlessButton}">Secondary</Button>
+            <Button Classes="Tertiary" Theme="{DynamicResource BorderlessButton}">Tertiary</Button>
+            <Button Classes="Success" Theme="{DynamicResource BorderlessButton}">Success</Button>
+            <Button Classes="Warning" Theme="{DynamicResource BorderlessButton}">Warning</Button>
+            <Button Classes="Danger" Theme="{DynamicResource BorderlessButton}">Danger</Button>
+            <Button
+                Classes="Primary"
+                IsEnabled="False"
+                Theme="{DynamicResource BorderlessButton}">
+                Danger
+            </Button>
+        </StackPanel>
+        <TextBlock>DropDownButton</TextBlock>
+        <StackPanel Orientation="Horizontal" Spacing="8">
+            <DropDownButton Content="Submit">
+                <DropDownButton.Flyout>
+                    <MenuFlyout Placement="BottomEdgeAlignedRight">
+                        <MenuItem Header="Submit All" />
+                        <MenuItem Header="Submit Updated" />
+                    </MenuFlyout>
+                </DropDownButton.Flyout>
+            </DropDownButton>
+            <DropDownButton Content="Submit" Theme="{DynamicResource SolidDropDownButton}">
+                <DropDownButton.Flyout>
+                    <MenuFlyout Placement="BottomEdgeAlignedRight">
+                        <MenuItem Header="Submit All" />
+                        <MenuItem Header="Submit Updated" />
+                    </MenuFlyout>
+                </DropDownButton.Flyout>
+            </DropDownButton>
+            <DropDownButton Content="Submit" Theme="{DynamicResource BorderlessDropDownButton}">
+                <DropDownButton.Flyout>
+                    <MenuFlyout Placement="BottomEdgeAlignedRight">
+                        <MenuItem Header="Submit All" />
+                        <MenuItem Header="Submit Updated" />
+                    </MenuFlyout>
+                </DropDownButton.Flyout>
+            </DropDownButton>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" Spacing="8">
+            <SplitButton Content="Submit">
+                <SplitButton.Flyout>
+                    <MenuFlyout Placement="BottomEdgeAlignedRight">
+                        <MenuItem Header="Submit All" />
+                        <MenuItem Header="Submit Updated" />
+                    </MenuFlyout>
+                </SplitButton.Flyout>
+            </SplitButton>
+            <SplitButton Classes="Secondary" Content="Submit" />
+            <SplitButton Classes="Tertiary" Content="Submit" />
+            <SplitButton Classes="Success" Content="Submit" />
+            <SplitButton Classes="Warning" Content="Submit" />
+            <SplitButton Classes="Danger" Content="Submit" />
+            <SplitButton
+                Classes="Danger"
+                Content="Submit"
+                IsEnabled="False" />
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" Spacing="8">
+            <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="Success" Content="Submit" />
+            <ToggleSplitButton Classes="Warning" Content="Submit" />
+            <ToggleSplitButton Classes="Danger" Content="Submit" />
+            <ToggleSplitButton
+                Classes="Danger"
+                Content="Submit"
+                IsEnabled="False" />
+        </StackPanel>
+    </StackPanel>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml
@@ -29,6 +29,12 @@
                    <colorPicker:SemiColorLightPalette />
                </ColorPicker.Palette>
            </ColorPicker>
+            
+            <ColorPicker ColorSpectrumShape="Box" Theme="{DynamicResource HexColorPicker}">
+                <ColorPicker.Palette>
+                    <colorPicker:SemiColorLightPalette />
+                </ColorPicker.Palette>
+            </ColorPicker>
        </StackPanel>
    </StackPanel>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml
@@ -0,0 +1,43 @@
+<UserControl
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d"
+    x:Class="Semi.Avalonia.Demo.Pages.HyperlinkButtonDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StackPanel HorizontalAlignment="Left" Spacing="20">
+        <StackPanel Orientation="Horizontal">
+            <HyperlinkButton Height="20" NavigateUri="http://www.irihi.tech/">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Text="iRihi Homepage"
+                    TextDecorations="Underline"
+                    VerticalAlignment="Center" />
+            </HyperlinkButton>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <HyperlinkButton Height="20" IsEnabled="False">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Text="Not Enabled"
+                    TextDecorations="Underline"
+                    VerticalAlignment="Center" />
+            </HyperlinkButton>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <HyperlinkButton
+                BorderThickness="1"
+                Classes="WithIcon"
+                Height="20"
+                NavigateUri="http://www.irihi.tech/">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Text="Link with Icon"
+                    TextDecorations="Underline"
+                    VerticalAlignment="Center" />
+            </HyperlinkButton>
+        </StackPanel>
+    </StackPanel>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs
@@ -0,0 +1,14 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class HyperlinkButtonDemo : UserControl
+{
+    public HyperlinkButtonDemo()
+    {
+        InitializeComponent();
+    }
+}
--- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml
@@ -78,8 +78,8 @@
                    <StackPanel Orientation="Horizontal">
                        <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
                            <ListBox Theme="{DynamicResource ButtonRadioGroupListBox}">
-                                <ListBoxItem Classes="Large" IsSelected="True">Large 1</ListBoxItem>
-                                <ListBoxItem Classes="Large">Large 2</ListBoxItem>
+                                <ListBoxItem Classes="Large" IsSelected="True">Small 1</ListBoxItem>
+                                <ListBoxItem Classes="Large">Small 2</ListBoxItem>
                            </ListBox>
                        </Border>
                        <Border
@@ -87,8 +87,8 @@
                            HorizontalAlignment="Left"
                            Theme="{StaticResource RadioButtonGroupBorder}">
                            <ListBox Theme="{DynamicResource ButtonRadioGroupListBox}" IsEnabled="False">
-                                <ListBoxItem Classes="Large" IsSelected="True">Large 1</ListBoxItem>
-                                <ListBoxItem Classes="Large">Large 2</ListBoxItem>
+                                <ListBoxItem Classes="Large" IsSelected="True">Small 1</ListBoxItem>
+                                <ListBoxItem Classes="Large">Small 2</ListBoxItem>
                            </ListBox>
                        </Border>
                    </StackPanel>
--- a/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
@@ -37,5 +37,11 @@
            Classes="Small"
            Maximum="100"
            Minimum="0" />
+        <NumericUpDown
+            Width="200"
+            InnerLeftContent="Price"
+            InnerRightContent="$"
+            Maximum="100"
+            Minimum="0" />
    </StackPanel>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
@@ -155,7 +155,7 @@
                Value="60" />
            <ProgressBar
                Width="200"
-                Classes="Danger"
+                Classes="Error"
                Maximum="100"
                Minimum="0"
                ShowProgressText="True"
--- a/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml
@@ -4,12 +4,24 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
    d:DesignHeight="450"
    d:DesignWidth="800"
+    x:DataType="pages:RefreshContainerDemoViewModel"
+    x:CompileBindings="True"
    mc:Ignorable="d">
-    <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <RefreshContainer Name="container">
-            <TextBlock Text="Content" />
+    <DockPanel HorizontalAlignment="Stretch" VerticalAlignment="Top">
+        <Label DockPanel.Dock="Top">A control that supports pull to refresh</Label>
+        <RefreshContainer Name="Refresh"
+                          DockPanel.Dock="Bottom"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Stretch"
+                          PullDirection="TopToBottom"
+                          RefreshRequested="RefreshContainerPage_RefreshRequested"
+                          Margin="5">
+            <ListBox HorizontalAlignment="Stretch"
+                     VerticalAlignment="Top"
+                     ItemsSource="{Binding Items}" />
        </RefreshContainer>
-    </StackPanel>
+    </DockPanel>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml.cs
@@ -1,14 +1,46 @@
-using Avalonia;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
+using CommunityToolkit.Mvvm.ComponentModel;

 namespace Semi.Avalonia.Demo.Pages;

 public partial class RefreshContainerDemo : UserControl
 {
+    private RefreshContainerDemoViewModel _viewModel;
+
    public RefreshContainerDemo()
    {
        InitializeComponent();
+
+        _viewModel = new RefreshContainerDemoViewModel();
+
+        DataContext = _viewModel;
+    }
+
+    private async void RefreshContainerPage_RefreshRequested(object? sender, RefreshRequestedEventArgs e)
+    {
+        var deferral = e.GetDeferral();
+
+        await _viewModel.AddToTop();
+
+        deferral.Complete();
+    }
+}
+
+public class RefreshContainerDemoViewModel : ObservableObject
+{
+    public ObservableCollection<string> Items { get; }
+
+    public RefreshContainerDemoViewModel()
+    {
+        Items = new ObservableCollection<string>(Enumerable.Range(1, 200).Select(i => $"Item {i}"));
+    }
+
+    public async Task AddToTop()
+    {
+        await Task.Delay(1000);
+        Items.Insert(0, $"Item {200 - Items.Count}");
    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml
@@ -16,7 +16,7 @@
            <RepeatButton Classes="Success">Success</RepeatButton>
            <RepeatButton Classes="Warning">Warning</RepeatButton>
            <RepeatButton Classes="Danger">Danger</RepeatButton>
-            <RepeatButton Classes="Danger" IsEnabled="False">Disabled</RepeatButton>
+            <RepeatButton Classes="Primary" IsEnabled="False">Danger</RepeatButton>
        </StackPanel>
        <TextBlock>Solid</TextBlock>
        <StackPanel Orientation="Horizontal" Spacing="20">
@@ -27,25 +27,10 @@
            <RepeatButton Classes="Warning" Theme="{DynamicResource SolidRepeatButton}">Warning</RepeatButton>
            <RepeatButton Classes="Danger" Theme="{DynamicResource SolidRepeatButton}">Danger</RepeatButton>
            <RepeatButton
-                Classes="Danger"
+                Classes="Primary"
                IsEnabled="False"
                Theme="{DynamicResource SolidRepeatButton}">
-                Disabled
-            </RepeatButton>
-        </StackPanel>
-        <TextBlock>Outline</TextBlock>
-        <StackPanel Orientation="Horizontal" Spacing="20">
-            <RepeatButton Classes="Primary" Theme="{DynamicResource OutlineRepeatButton}">Primary</RepeatButton>
-            <RepeatButton Classes="Secondary" Theme="{DynamicResource OutlineRepeatButton}">Secondary</RepeatButton>
-            <RepeatButton Classes="Tertiary" Theme="{DynamicResource OutlineRepeatButton}">Tertiary</RepeatButton>
-            <RepeatButton Classes="Success" Theme="{DynamicResource OutlineRepeatButton}">Success</RepeatButton>
-            <RepeatButton Classes="Warning" Theme="{DynamicResource OutlineRepeatButton}">Warning</RepeatButton>
-            <RepeatButton Classes="Danger" Theme="{DynamicResource OutlineRepeatButton}">Danger</RepeatButton>
-            <RepeatButton
-                Classes="Danger"
-                IsEnabled="False"
-                Theme="{DynamicResource OutlineRepeatButton}">
-                Disabled
+                Danger
            </RepeatButton>
        </StackPanel>
        <TextBlock>Borderless</TextBlock>
@@ -57,24 +42,11 @@
            <RepeatButton Classes="Warning" Theme="{DynamicResource BorderlessRepeatButton}">Warning</RepeatButton>
            <RepeatButton Classes="Danger" Theme="{DynamicResource BorderlessRepeatButton}">Danger</RepeatButton>
            <RepeatButton
-                Classes="Danger"
+                Classes="Primary"
                IsEnabled="False"
                Theme="{DynamicResource BorderlessRepeatButton}">
-                Disabled
+                Danger
            </RepeatButton>
        </StackPanel>
-        <TextBlock>Disabled</TextBlock>
-        <StackPanel Background="{DynamicResource SemiColorBackground1}" Orientation="Horizontal" Spacing="20">
-            <Button IsEnabled="False">Light</Button>
-            <Button IsEnabled="False" Theme="{DynamicResource SolidButton}">Solid</Button>
-            <Button IsEnabled="False" Theme="{DynamicResource OutlineButton}">Outline</Button>
-            <Button IsEnabled="False" Theme="{DynamicResource BorderlessButton}">Borderless</Button>
-        </StackPanel>
-        <TextBlock>Size Classes</TextBlock>
-        <StackPanel Orientation="Horizontal" Spacing="20">
-            <RepeatButton Classes="Small">Small</RepeatButton>
-            <RepeatButton>Default</RepeatButton>
-            <RepeatButton Classes="Large">Large</RepeatButton>
-        </StackPanel>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
@@ -4,194 +4,147 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
-    d:DesignHeight="1000"
+    d:DesignHeight="450"
    d:DesignWidth="800"
    mc:Ignorable="d">
-    <Design.DataContext>
-        <pages:SplitViewDemoViewModel />
-    </Design.DataContext>
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <StreamGeometry x:Key="NavigationMenuExpandIconGlyph">M5 2H19C20.6569 2 22 3.34315 22 5V19C22 20.6569 20.6569 22 19 22H5C3.34315 22 2 20.6569 2 19V5C2 3.34315 3.34315 2 5 2ZM6 4C5.44772 4 5 4.44772 5 5V19C5 19.5523 5.44772 20 6 20H9C9.55229 20 10 19.5523 10 19V5C10 4.44772 9.55229 4 9 4H6Z</StreamGeometry>
-        </ResourceDictionary>
-    </UserControl.Resources>
    <Border>
        <Grid ColumnDefinitions="*,400">
-            <Border Grid.Column="1" VerticalAlignment="Top" Margin="10 0 0 0">
-                <Grid RowDefinitions="*, *, *, *, *, *" ColumnDefinitions="Auto, *">
-                    <Label
-                        Grid.Row="0" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="IsPaneOpen" />
-                    <ToggleSwitch
-                        Grid.Row="0" Grid.Column="1"
-                        Name="PaneOpenButton"
-                        IsChecked="{Binding #SplitView.IsPaneOpen}" />
+            <StackPanel
+                Grid.Column="1"
+                Orientation="Vertical"
+                Spacing="4">
+                <ToggleButton
+                    Name="PaneOpenButton"
+                    Content="IsPaneOpen"
+                    IsChecked="{Binding IsPaneOpen, ElementName=SplitView}" />

-                    <Label
-                        Grid.Row="1" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="UseLightDismissOverlayMode" />
-                    <ToggleSwitch
-                        Grid.Row="1" Grid.Column="1"
-                        Name="UseLightDismissOverlayModeButton"
-                        IsChecked="{Binding #SplitView.UseLightDismissOverlayMode}" />
+                <ToggleButton
+                    Name="UseLightDismissOverlayModeButton"
+                    Content="UseLightDismissOverlayMode"
+                    IsChecked="{Binding UseLightDismissOverlayMode, ElementName=SplitView}" />

-                    <Label
-                        Grid.Row="2" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="Placement" />
-                    <ToggleSwitch
-                        Grid.Row="2" Grid.Column="1"
-                        OffContent="Left"
-                        OnContent="Right"
-                        IsChecked="{Binding #SplitView.PanePlacement, Mode=OneWayToSource}" />
+                <ToggleSwitch
+                    Content="Placement"
+                    OffContent="Left"
+                    OnContent="Right" />

-                    <Label
-                        Grid.Row="3" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="DisplayMode" />
-                    <ComboBox
-                        Grid.Row="3" Grid.Column="1"
-                        Name="DisplayModeSelector"
-                        HorizontalAlignment="Stretch"
-                        ItemsSource="{Binding DisplayModes}"
-                        SelectedIndex="{Binding #SplitView.DisplayMode}" />
+                <TextBlock Text="DisplayMode" />
+                <ComboBox
+                    Name="DisplayModeSelector"
+                    Width="170"
+                    Margin="10"
+                    SelectedIndex="{Binding DisplayMode}">
+                    <ComboBoxItem>Inline</ComboBoxItem>
+                    <ComboBoxItem>CompactInline</ComboBoxItem>
+                    <ComboBoxItem>Overlay</ComboBoxItem>
+                    <ComboBoxItem>CompactOverlay</ComboBoxItem>
+                </ComboBox>

-                    <Label
-                        Grid.Row="4" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="{Binding #CompactPaneLengthSlider.Value, StringFormat='{}CompactPaneLength: {0}'}" />
-                    <Slider
-                        Grid.Row="4" Grid.Column="1"
-                        Name="CompactPaneLengthSlider"
-                        Maximum="128"
-                        Minimum="0"
-                        TickFrequency="1"
-                        IsSnapToTickEnabled="True"
-                        Value="{Binding #SplitView.CompactPaneLength}" />
+                <TextBlock Text="PaneBackground" />
+                <ComboBox
+                    Name="PaneBackgroundSelector"
+                    Width="170"
+                    Margin="10"
+                    SelectedIndex="0">
+                    <ComboBoxItem Tag="White">White</ComboBoxItem>
+                    <ComboBoxItem Tag="Red">Red</ComboBoxItem>
+                    <ComboBoxItem Tag="Blue">Blue</ComboBoxItem>
+                    <ComboBoxItem Tag="Green">Green</ComboBoxItem>
+                </ComboBox>

-                    <Label
-                        Grid.Row="5" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="{Binding #OpenPaneLengthSlider.Value,StringFormat='{}OpenPaneLength: {0}'}" />
-                    <Slider
-                        Grid.Row="5" Grid.Column="1"
-                        Name="OpenPaneLengthSlider"
-                        Maximum="500"
-                        Minimum="128"
-                        TickFrequency="1"
-                        IsSnapToTickEnabled="True"
-                        Value="{Binding #SplitView.OpenPaneLength}" />
-                </Grid>
-            </Border>
-            <Border
-                Grid.Column="0"
-                BorderBrush="{DynamicResource SemiGrey1}"
-                BorderThickness="1">
+                <TextBlock Text="{Binding Value, ElementName=OpenPaneLengthSlider, StringFormat='{}OpenPaneLength: {0}'}" />
+                <Slider
+                    Name="OpenPaneLengthSlider"
+                    Width="150"
+                    Maximum="500"
+                    Minimum="128"
+                    Value="256" />
+
+                <TextBlock Text="{Binding Value, ElementName=CompactPaneLengthSlider, StringFormat='{}CompactPaneLength: {0}'}" />
+                <Slider
+                    Name="CompactPaneLengthSlider"
+                    Width="150"
+                    Maximum="128"
+                    Minimum="24"
+                    Value="48" />
+            </StackPanel>
+            <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}" BorderThickness="1">
+                <!--  {Binding SelectedItem.Tag, ElementName=PaneBackgroundSelector}  -->
                <SplitView
                    Name="SplitView"
+                    CompactPaneLength="{Binding Value, ElementName=CompactPaneLengthSlider}"
                    DisplayMode="CompactOverlay"
-                    CompactPaneLength="48"
-                    OpenPaneLength="256">
-                    <SplitView.Background>
-                        <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
-                            <GradientStop Color="#6b4c1b" Offset="0" />
-                            <GradientStop Color="#291e10" Offset="1" />
-                        </LinearGradientBrush>
-                    </SplitView.Background>
+                    OpenPaneLength="{Binding Value, ElementName=OpenPaneLengthSlider}"
+                    PaneBackground="{Binding SelectedItem.Tag, ElementName=PaneBackgroundSelector}"
+                    PanePlacement="{Binding PanePlacement}">
                    <SplitView.Pane>
-                        <Grid RowDefinitions="Auto,*,Auto">
+                        <Grid RowDefinitions="Auto,Auto,*,Auto">
                            <TextBlock
-                                Grid.Row="0"
                                Name="PaneHeader"
-                                Margin="8,12"
+                                Margin="5,12,0,0"
                                FontWeight="Bold"
-                                Text="Playlist" />
-                            <ListBox
-                                Grid.Row="1"
-                                ItemsSource="{Binding Songs}" />
-                            <ToggleSwitch
+                                Text="PANE CONTENT" />
+                            <ComboBox Grid.Row="1" Width="150">
+                                <ComboBoxItem Content="Item1" />
+                                <ComboBoxItem Content="Item2" />
+                                <ComboBoxItem Content="Item3" />
+                            </ComboBox>
+                            <ListBoxItem
                                Grid.Row="2"
-                                Theme="{DynamicResource ButtonToggleSwitch}"
-                                IsChecked="{Binding #SplitView.IsPaneOpen}">
-                                <ToggleSwitch.OnContent>
-                                    <PathIcon
-                                        Width="16"
-                                        Height="16"
-                                        Data="{StaticResource NavigationMenuExpandIconGlyph}" />
-                                </ToggleSwitch.OnContent>
-                                <ToggleSwitch.OffContent>
-                                    <PathIcon
-                                        Width="16"
-                                        Height="16"
-                                        Data="{StaticResource NavigationMenuExpandIconGlyph}" />
-                                </ToggleSwitch.OffContent>
-                            </ToggleSwitch>
+                                Margin="0,10"
+                                VerticalAlignment="Top">
+                                <StackPanel Orientation="Horizontal">
+                                    <!--  Path glyph from materialdesignicons.com  -->
+                                    <Border Width="48">
+                                        <Viewbox
+                                            Width="24"
+                                            Height="24"
+                                            HorizontalAlignment="Left">
+                                            <Canvas Width="24" Height="24">
+                                                <Path Data="M16 17V19H2V17S2 13 9 13 16 17 16 17M12.5 7.5A3.5 3.5 0 1 0 9 11A3.5 3.5 0 0 0 12.5 7.5M15.94 13A5.32 5.32 0 0 1 18 17V19H22V17S22 13.37 15.94 13M15 4A3.39 3.39 0 0 0 13.07 4.59A5 5 0 0 1 13.07 10.41A3.39 3.39 0 0 0 15 11A3.5 3.5 0 0 0 15 4Z" Fill="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+                                            </Canvas>
+                                        </Viewbox>
+                                    </Border>
+                                    <TextBlock VerticalAlignment="Center" Text="People" />
+                                </StackPanel>
+                            </ListBoxItem>
+                            <TextBlock
+                                Grid.Row="3"
+                                Margin="60,12"
+                                Text="Item at bottom" />
                        </Grid>
                    </SplitView.Pane>

-                    <Panel>
-                        <Panel.Styles>
-                            <Style Selector="Image#AlbumCover">
-                                <Style.Animations>
-                                    <Animation IterationCount="Infinite" Duration="0:0:40">
-                                        <KeyFrame Cue="0%">
-                                            <Setter Property="RotateTransform.Angle" Value="0" />
-                                        </KeyFrame>
-                                        <KeyFrame Cue="100%">
-                                            <Setter Property="RotateTransform.Angle" Value="360" />
-                                        </KeyFrame>
-                                    </Animation>
-                                </Style.Animations>
+                    <Grid>
+                        <Grid.Styles>
+                            <Style Selector="TextBlock">
+                                <Setter Property="FontSize" Value="14" />
+                                <Setter Property="FontWeight" Value="700" />
                            </Style>
-                        </Panel.Styles>
-                        <Image
-                            Source="/Assets/WORLD.png"
-                            Name="AlbumCover"
-                            Width="200"
-                            Height="200" />
-                        <Arc
-                            Width="290"
-                            Height="290"
-                            StartAngle="0"
-                            SweepAngle="360"
-                            StrokeJoin="Round"
-                            StrokeLineCap="Round"
-                            StrokeThickness="45">
-                            <Arc.Stroke>
-                                <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,0%">
-                                    <GradientStop Color="#010101" Offset="0" />
-                                    <GradientStop Color="#363636" Offset="0.5" />
-                                    <GradientStop Color="#010101" Offset="1" />
-                                </LinearGradientBrush>
-                            </Arc.Stroke>
-                        </Arc>
-                        <Arc
-                            Width="294"
-                            Height="294"
-                            StartAngle="0"
-                            SweepAngle="360"
-                            StrokeJoin="Round"
-                            StrokeLineCap="Round"
-                            StrokeThickness="4"
-                            Stroke="Black" />
-                        <Arc
-                            Width="310"
-                            Height="310"
-                            StartAngle="0"
-                            SweepAngle="360"
-                            StrokeJoin="Round"
-                            StrokeLineCap="Round"
-                            StrokeThickness="10"
-                            Stroke="#C6CACD"
-                            Opacity="0.1" />
-                    </Panel>
+                        </Grid.Styles>
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Text="SplitViewContent" />
+                        <TextBlock Text="SplitViewContent" TextAlignment="Left" />
+                        <TextBlock
+                            HorizontalAlignment="Right"
+                            Text="SplitViewContent"
+                            TextAlignment="Left" />
+                        <TextBlock
+                            VerticalAlignment="Bottom"
+                            Text="SplitViewContent"
+                            TextAlignment="Left" />
+                        <TextBlock
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Bottom"
+                            Text="SplitViewContent"
+                            TextAlignment="Left" />
+                    </Grid>

                </SplitView>
            </Border>

        </Grid>
    </Border>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs
@@ -1,7 +1,6 @@
-using System.Collections.ObjectModel;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using CommunityToolkit.Mvvm.ComponentModel;

 namespace Semi.Avalonia.Demo.Pages;

@@ -10,35 +9,10 @@ public partial class SplitViewDemo : UserControl
    public SplitViewDemo()
    {
        InitializeComponent();
-        this.DataContext = new SplitViewDemoViewModel();
    }

    private void InitializeComponent()
    {
        AvaloniaXamlLoader.Load(this);
    }
-}
-
-public class SplitViewDemoViewModel : ObservableObject
-{
-    public ObservableCollection<string> Songs { get; set; } =
-    [
-        "320万年前",
-        "隐德来希",
-        "孔明",
-        "锦鲤卟噜噜",
-        "指鹿为马",
-        "热带季风Remix",
-        "加州梦境",
-        "渐近自由",
-        "世界所有的烂漫",
-    ];
-
-    public ObservableCollection<SplitViewDisplayMode> DisplayModes { get; set; } =
-    [
-        SplitViewDisplayMode.Inline,
-        SplitViewDisplayMode.CompactInline,
-        SplitViewDisplayMode.Overlay,
-        SplitViewDisplayMode.CompactOverlay,
-    ];
 }
--- a/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
@@ -42,7 +42,6 @@
                InnerLeftContent="http://"
                InnerRightContent=".com"
                IsEnabled="False" />
-            <TextBox Width="300" Classes="TextArea" />
        </StackPanel>
    </ScrollViewer>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml
@@ -17,7 +17,7 @@
            <ToggleButton Classes="Success">Success</ToggleButton>
            <ToggleButton Classes="Warning">Warning</ToggleButton>
            <ToggleButton Classes="Danger">Danger</ToggleButton>
-            <ToggleButton Classes="Danger" IsEnabled="False">Disabled</ToggleButton>
+            <ToggleButton Classes="Danger" IsEnabled="False">Danger</ToggleButton>
        </StackPanel>
        <TextBlock Text="Toggle Button Checked State" />
        <StackPanel Orientation="Horizontal" Spacing="20">
@@ -28,71 +28,18 @@
            <ToggleButton Classes="Success" IsChecked="True">Success</ToggleButton>
            <ToggleButton Classes="Warning" IsChecked="True">Warning</ToggleButton>
            <ToggleButton Classes="Danger" IsChecked="True">Danger</ToggleButton>
-            <ToggleButton
-                Classes="Danger"
-                IsChecked="True"
-                IsEnabled="False">
-                Disabled
-            </ToggleButton>
+            <ToggleButton Classes="Danger" IsChecked="True" IsEnabled="False">Danger</ToggleButton>
        </StackPanel>
        <TextBlock Text="Toggle Button Three State" />
        <StackPanel Orientation="Horizontal" Spacing="20">
-            <ToggleButton IsChecked="{x:Null}" IsThreeState="True">Default</ToggleButton>
-            <ToggleButton
-                Classes="Primary"
-                IsChecked="{x:Null}"
-                IsThreeState="True">
-                Primary
-            </ToggleButton>
-            <ToggleButton
-                Classes="Secondary"
-                IsChecked="{x:Null}"
-                IsThreeState="True">
-                Secondary
-            </ToggleButton>
-            <ToggleButton
-                Classes="Tertiary"
-                IsChecked="{x:Null}"
-                IsThreeState="True">
-                Tertiary
-            </ToggleButton>
-            <ToggleButton
-                Classes="Success"
-                IsChecked="{x:Null}"
-                IsThreeState="True">
-                Success
-            </ToggleButton>
-            <ToggleButton
-                Classes="Warning"
-                IsChecked="{x:Null}"
-                IsThreeState="True">
-                Warning
-            </ToggleButton>
-            <ToggleButton
-                Classes="Danger"
-                IsChecked="{x:Null}"
-                IsThreeState="True">
-                Danger
-            </ToggleButton>
-            <ToggleButton
-                Classes="Danger"
-                IsChecked="{x:Null}"
-                IsEnabled="False"
-                IsThreeState="True">
-                Disabled
-            </ToggleButton>
-        </StackPanel>
-        <TextBlock Text="Toggle Button Disabled State" />
-        <StackPanel Background="{DynamicResource SemiColorBackground1}" Orientation="Horizontal" Spacing="20">
-            <ToggleButton IsThreeState="True" IsEnabled="False">Default</ToggleButton>
-            <ToggleButton IsThreeState="True" IsEnabled="False" IsChecked="True">Checked</ToggleButton>
-            <ToggleButton IsThreeState="True" IsEnabled="False" IsChecked="{x:Null}">Indeterminate</ToggleButton>
-        </StackPanel>
-        <TextBlock Text="Toggle Button Size" />
-        <StackPanel Orientation="Horizontal" Spacing="20">
-            <ToggleButton Classes="Small" IsThreeState="True">Small</ToggleButton>
-            <ToggleButton IsThreeState="True">Default</ToggleButton>
-            <ToggleButton Classes="Large" IsThreeState="True">Large</ToggleButton>
+            <ToggleButton IsThreeState="True" IsChecked="{x:Null}">Default</ToggleButton>
+            <ToggleButton Classes="Primary" IsThreeState="True" IsChecked="{x:Null}">Primary</ToggleButton>
+            <ToggleButton Classes="Secondary" IsThreeState="True" IsChecked="{x:Null}">Secondary</ToggleButton>
+            <ToggleButton Classes="Tertiary" IsThreeState="True" IsChecked="{x:Null}">Tertiary</ToggleButton>
+            <ToggleButton Classes="Success" IsThreeState="True" IsChecked="{x:Null}">Success</ToggleButton>
+            <ToggleButton Classes="Warning" IsThreeState="True" IsChecked="{x:Null}">Warning</ToggleButton>
+            <ToggleButton Classes="Danger" IsThreeState="True" IsChecked="{x:Null}">Danger</ToggleButton>
+            <ToggleButton Classes="Danger" IsThreeState="True" IsChecked="{x:Null}" IsEnabled="False">Danger</ToggleButton>
        </StackPanel>
    </StackPanel>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml
@@ -7,7 +7,7 @@
    d:DesignHeight="450"
    d:DesignWidth="800"
    mc:Ignorable="d">
-    <StackPanel Spacing="8" Margin="20">
+    <StackPanel Spacing="20">
        <ToggleSwitch
            Content="Content"
            OffContent="OffContent"
@@ -24,19 +24,11 @@
            IsEnabled="False"
            OffContent="OffContent"
            OnContent="OnContent" />
-        <StackPanel Orientation="Horizontal">
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Small" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Small" IsChecked="True"/>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" IsChecked="True" />
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Large" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Large" IsChecked="True"/>
-        </StackPanel>
-
+        <ToggleSwitch
+            Theme="{DynamicResource SimpleToggleSwitch}"
+            Content="Content"
+            OffContent="OffContent"
+            OnContent="OnContent" />
        <ToggleSwitch Theme="{DynamicResource ButtonToggleSwitch}">
            <ToggleSwitch.OnContent>
                <PathIcon
--- a/demo/Semi.Avalonia.Demo/Roots.xml
+++ b/demo/Semi.Avalonia.Demo/Roots.xml
@@ -0,0 +1,5 @@
+<linker>
+  <!-- Can be removed if CompiledBinding and no reflection are used -->
+  <assembly fullname="Semi.Avalonia.Demo" preserve="All" />
+  <assembly fullname="Avalonia.Themes.Fluent" preserve="All" />
+</linker>
--- a/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
+++ b/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
@@ -4,9 +4,10 @@
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
    </PropertyGroup>
-
+    
    <ItemGroup>
        <AvaloniaResource Include="Assets\**" />
+        <TrimmerRootDescriptor Include="Roots.xml" />
    </ItemGroup>

    <ItemGroup>
@@ -18,8 +19,8 @@
    </ItemGroup>

    <ItemGroup>
-        <ProjectReference Include="..\..\src\Semi.Avalonia.ColorPicker\Semi.Avalonia.ColorPicker.csproj" />
-        <ProjectReference Include="..\..\src\Semi.Avalonia.DataGrid\Semi.Avalonia.DataGrid.csproj" />
-        <ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.csproj" />
+      <ProjectReference Include="..\..\src\Semi.Avalonia.ColorPicker\Semi.Avalonia.ColorPicker.csproj" />
+      <ProjectReference Include="..\..\src\Semi.Avalonia.DataGrid\Semi.Avalonia.DataGrid.csproj" />
+      <ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.csproj" />
    </ItemGroup>
 </Project>
--- a/demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs
@@ -121,7 +121,7 @@ public class Song
        new("指鹿为马", "熊猫堂ProducePandas", 3, 12, "W.O.R.L.D.", 74, 2063175272),
        new("热带季风Remix", "熊猫堂ProducePandas", 3, 22, "W.O.R.L.D.", 23, 2063173319),
        new("加州梦境", "熊猫堂ProducePandas", 2, 56, "W.O.R.L.D.", 1662, 2063173324),
-        new("渐近自由", "熊猫堂ProducePandas", 4, 19, "W.O.R.L.D.", 124, 2063173321),
+        new("渐进自由", "熊猫堂ProducePandas", 4, 19, "W.O.R.L.D.", 124, 2063173321),
        new("世界所有的烂漫", "熊猫堂ProducePandas", 3, 30, "W.O.R.L.D.", 335, 2053388775),
    };
 }
--- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
@@ -47,8 +47,8 @@ public class PaletteDemoViewModel: ObservableObject

    public PaletteDemoViewModel()
    {
-        _lightResourceDictionary  = new Light.Palette();
-        _darkResourceDictionary = new Dark.Palette();
+        _lightResourceDictionary = AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Themes/Light/Palette.axaml")) as ResourceDictionary;
+        _darkResourceDictionary = AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Themes/Dark/Palette.axaml")) as ResourceDictionary;
        WeakReferenceMessenger.Default.Register<PaletteDemoViewModel, ColorItemViewModel>(this, OnClickColorItem);
    }

@@ -251,7 +251,7 @@ public static class ColorTokens
    {
        new ("SemiColorPrimary", "Primary"),
        new ("SemiColorPrimaryPointerover", "Primary Pointerover"),
-        new ("SemiColorPrimaryActive", "Primary Active"),
+        new ("SemiColorPrimaryPressed", "Primary Pressed"),
        new ("SemiColorPrimaryDisabled", "Primary Disabled"),
        new ("SemiColorPrimaryLight", "Primary Light"),
        new ("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"),
@@ -262,7 +262,7 @@ public static class ColorTokens
    {
        new ("SemiColorSecondary", "Secondary"),
        new ("SemiColorSecondaryPointerover", "Secondary Pointerover"),
-        new ("SemiColorSecondaryActive", "Secondary Active"),
+        new ("SemiColorSecondaryPressed", "Secondary Pressed"),
        new ("SemiColorSecondaryDisabled", "Secondary Disabled"),
        new ("SemiColorSecondaryLight", "Secondary Light"),
        new ("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"),
@@ -273,7 +273,7 @@ public static class ColorTokens
    {
        new ("SemiColorTertiary", "Tertiary"),
        new ("SemiColorTertiaryPointerover", "Tertiary Pointerover"),
-        new ("SemiColorTertiaryActive", "Tertiary Active"),
+        new ("SemiColorTertiaryPressed", "Tertiary Pressed"),
        new ("SemiColorTertiaryLight", "Tertiary Light"),
        new ("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"),
        new ("SemiColorTertiaryLightActive", "Tertiary Light Active"),
@@ -283,7 +283,7 @@ public static class ColorTokens
    {
        new ("SemiColorInformation", "Information"),
        new ("SemiColorInformationPointerover", "Information Pointerover"),
-        new ("SemiColorInformationActive", "Information Active"),
+        new ("SemiColorInformationPressed", "Information Pressed"),
        new ("SemiColorInformationDisabled", "Information Disabled"),
        new ("SemiColorInformationLight", "Information Light"),
        new ("SemiColorInformationLightPointerover", "Information Light Pointerover"),
@@ -294,7 +294,7 @@ public static class ColorTokens
    {
        new ("SemiColorSuccess", "Success"),
        new ("SemiColorSuccessPointerover", "Success Pointerover"),
-        new ("SemiColorSuccessActive", "Success Active"),
+        new ("SemiColorSuccessPressed", "Success Pressed"),
        new ("SemiColorSuccessDisabled", "Success Disabled"),
        new ("SemiColorSuccessLight", "Success Light"),
        new ("SemiColorSuccessLightPointerover", "Success Light Pointerover"),
@@ -305,7 +305,7 @@ public static class ColorTokens
    {
        new ("SemiColorWarning", "Warning"),
        new ("SemiColorWarningPointerover", "Warning Pointerover"),
-        new ("SemiColorWarningActive", "Warning Active"),
+        new ("SemiColorWarningPressed", "Warning Pressed"),
        new ("SemiColorWarningLight", "Warning Light"),
        new ("SemiColorWarningLightPointerover", "Warning Light Pointerover"),
        new ("SemiColorWarningLightActive", "Warning Light Active"),
@@ -315,7 +315,7 @@ public static class ColorTokens
    {
        new ("SemiColorDanger", "Danger"),
        new ("SemiColorDangerPointerover", "Danger Pointerover"),
-        new ("SemiColorDangerActive", "Danger Active"),
+        new ("SemiColorDangerPressed", "Danger Pressed"),
        new ("SemiColorDangerLight", "Danger Light"),
        new ("SemiColorDangerLightPointerover", "Danger Light Pointerover"),
        new ("SemiColorDangerLightActive", "Danger Light Active"),
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
@@ -1,13 +1,13 @@
 <UserControl
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d"
    x:Class="Semi.Avalonia.Demo.Views.MainView"
    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:pages="using:Semi.Avalonia.Demo.Pages"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <UserControl.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
@@ -21,52 +21,52 @@
            Margin="8"
            Padding="12,4"
            Theme="{DynamicResource CardBorder}">
-            <Grid VerticalAlignment="Center" ColumnDefinitions="*, Auto">
+            <Grid ColumnDefinitions="*, Auto" VerticalAlignment="Center">
                <StackPanel Grid.Column="0" Orientation="Horizontal">
                    <TextBlock
-                        VerticalAlignment="Center"
                        Classes="H6"
                        Text="Semi Avalonia"
-                        Theme="{DynamicResource TitleTextBlock}" />
+                        Theme="{DynamicResource TitleTextBlock}"
+                        VerticalAlignment="Center" />
                    <TextBlock
                        Margin="8,0"
-                        VerticalAlignment="Center"
-                        Text="/" />
+                        Text="/"
+                        VerticalAlignment="Center" />
                    <TextBlock
-                        Margin="8,0"
-                        VerticalAlignment="Center"
                        Classes="Secondary"
-                        Text="{Binding #tab.SelectedItem.Header}" />
+                        Margin="8,0"
+                        Text="{Binding #tab.SelectedItem.Header}"
+                        VerticalAlignment="Center" />
                </StackPanel>
                <ToggleSwitch
                    Grid.Column="1"
-                    Padding="4"
                    IsCheckedChanged="ToggleButton_OnIsCheckedChanged"
+                    Padding="4"
                    Theme="{DynamicResource ButtonToggleSwitch}">
                    <ToggleSwitch.OnContent>
                        <PathIcon
-                            Width="16"
-                            Height="16"
                            Data="M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17 15C17.476 15 17.9408 14.9525 18.3901 14.862C17.296 17.3011 14.8464 19 12 19C8.13401 19 5 15.866 5 12C5 8.60996 7.40983 5.78277 10.6099 5.13803C10.218 6.01173 10 6.98041 10 8C10 11.866 13.134 15 17 15Z"
-                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}"
+                            Height="16"
+                            Width="16" />
                    </ToggleSwitch.OnContent>
                    <ToggleSwitch.OffContent>
                        <PathIcon
-                            Width="16"
-                            Height="16"
                            Data="M3.55 19.09L4.96 20.5L6.76 18.71L5.34 17.29M12 6C8.69 6 6 8.69 6 12S8.69 18 12 18 18 15.31 18 12C18 8.68 15.31 6 12 6M20 13H23V11H20M17.24 18.71L19.04 20.5L20.45 19.09L18.66 17.29M20.45 5L19.04 3.6L17.24 5.39L18.66 6.81M13 1H11V4H13M6.76 5.39L4.96 3.6L3.55 5L5.34 6.81L6.76 5.39M1 13H4V11H1M13 20H11V23H13"
-                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}"
+                            Height="16"
+                            Width="16" />
                    </ToggleSwitch.OffContent>
                </ToggleSwitch>
            </Grid>

        </Border>
        <TabControl
-            Name="tab"
            Grid.Row="1"
-            Margin="8"
-            Padding="20,0,0,0"
            HorizontalAlignment="Stretch"
+            Margin="8"
+            Name="tab"
+            Padding="20,0,0,0"
            TabStripPlacement="Left"
            Theme="{DynamicResource NavigationTab}">
            <TabItem Header="Overview">
@@ -126,6 +126,9 @@
            <TabItem Header="HeaderedContentControl">
                <pages:HeaderedContentControlDemo />
            </TabItem>
+            <TabItem Header="HyperlinkButton">
+                <pages:HyperlinkButtonDemo />
+            </TabItem>
            <TabItem Header="Label">
                <pages:LabelDemo />
            </TabItem>
@@ -145,7 +148,7 @@
                <pages:NumericUpDownDemo />
            </TabItem>
            <TabItem Header="PathIcon">
-                <pages:PathIconDemo/>
+                <pages:PathIconDemo />
            </TabItem>
            <TabItem Header="ProgressBar">
                <pages:ProgressBarDemo />
--- a/demo/global.json
+++ b/demo/global.json
@@ -1,5 +1,5 @@
 {
    "sdk": {
-        "version": "8.0"
+        "version": "7.0"
    }
 }
--- a/docs/demo.jpg
+++ b/docs/demo.jpg
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "8.0.0",
+    "version": "7.0.0",
    "rollForward": "latestMajor",
    "allowPrerelease": true
  }
--- a/src/Package.props
+++ b/src/Package.props
@@ -1,19 +1,14 @@
 <Project>
    <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
        <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
-        <Version>11.0.7.6</Version>
-        <Authors>IRIHI Technology Co., Ltd.</Authors>
+        <LangVersion>11</LangVersion>
+        <Version>11.1.0-beta1</Version>
+        <Authors>IRIHI Technology</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>irihi.png</PackageIcon>
        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <AvaloniaVersion>11.0.7</AvaloniaVersion>
+        <AvaloniaVersion>11.1.0-beta1</AvaloniaVersion>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
    </PropertyGroup>
-
-    <ItemGroup>
-        <None Include="irihi.png" Pack="true" PackagePath=""/>
-    </ItemGroup>
 </Project>
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
@@ -17,10 +17,33 @@
    <converters:ToBrushConverter x:Key="ToBrushConverter" />

    <ControlTheme x:Key="{x:Type ColorPicker}" TargetType="ColorPicker">
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="CornerRadius" Value="3" />
        <Setter Property="Height" Value="32" />
        <Setter Property="Width" Value="64" />
        <Setter Property="MinWidth" Value="64" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Content">
+            <Template>
+                <Panel>
+                    <Border
+                        Margin="1,1,0,1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
+                        CornerRadius="{TemplateBinding CornerRadius,
+                                                       Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                    <Border
+                        Margin="1,1,0,1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Background="{TemplateBinding HsvColor,
+                                                     Converter={StaticResource ToBrushConverter}}"
+                        CornerRadius="{TemplateBinding CornerRadius,
+                                                       Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                </Panel>
+            </Template>
+        </Setter>
        <Setter Property="Palette">
            <controls:FluentColorPalette />
        </Setter>
@@ -33,6 +56,8 @@
                    HorizontalContentAlignment="Stretch"
                    VerticalContentAlignment="Stretch"
                    ClipToBounds="True"
+                    Content="{TemplateBinding Content}"
+                    ContentTemplate="{TemplateBinding ContentTemplate}"
                    CornerRadius="{TemplateBinding CornerRadius}"
                    UseLayoutRounding="False">
                    <DropDownButton.Styles>
@@ -40,26 +65,6 @@
                            <Setter Property="Padding" Value="0" />
                        </Style>
                    </DropDownButton.Styles>
-                    <DropDownButton.Content>
-                        <!--  Preview color  -->
-                        <Panel>
-                            <Border
-                                Margin="1,1,0,1"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
-                                CornerRadius="{TemplateBinding CornerRadius,
-                                                               Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-                            <Border
-                                Margin="1,1,0,1"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Background="{TemplateBinding HsvColor,
-                                                             Converter={StaticResource ToBrushConverter}}"
-                                CornerRadius="{TemplateBinding CornerRadius,
-                                                               Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-                        </Panel>
-                    </DropDownButton.Content>
                    <DropDownButton.Flyout>
                        <Flyout FlyoutPresenterClasses="nopadding" Placement="{DynamicResource ColorPickerFlyoutPlacement}">

@@ -471,4 +476,42 @@
        </Setter>
    </ControlTheme>

+    <ControlTheme
+        x:Key="HexColorPicker"
+        BasedOn="{StaticResource {x:Type ColorPicker}}"
+        TargetType="ColorPicker">
+        <Setter Property="Width" Value="200" />
+        <Setter Property="Content">
+            <Template>
+                <Grid ColumnDefinitions="Auto, *">
+                    <Border
+                        Grid.Column="0"
+                        Width="{Binding $self.Bounds.Height}"
+                        Margin="1,1,0,1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
+                        CornerRadius="{TemplateBinding CornerRadius}" />
+                    <Border
+                        Grid.Column="0"
+                        Width="{Binding $self.Bounds.Height}"
+                        Margin="1,1,0,1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Background="{TemplateBinding HsvColor,
+                                                     Converter={StaticResource ToBrushConverter}}"
+                        CornerRadius="{TemplateBinding CornerRadius}" />
+                    <TextBlock
+                        Grid.Column="1"
+                        Margin="8,0,0,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontWeight="Regular"
+                        Foreground="{DynamicResource TextBlockDefaultForeground}"
+                        Text="{Binding $parent[ColorPicker].Color}" />
+                </Grid>
+            </Template>
+        </Setter>
+    </ControlTheme>
+
 </ResourceDictionary>
--- a/src/Semi.Avalonia.ColorPicker/Index.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Index.axaml
@@ -2,8 +2,8 @@
    <Styles.Resources>
        <ResourceDictionary>
            <ResourceDictionary.ThemeDictionaries>
-                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia.ColorPicker/Light.axaml" />
-                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia.ColorPicker/Dark.axaml" />
+                <MergeResourceInclude x:Key="Default" Source="avares://Semi.Avalonia.ColorPicker/Light.axaml" />
+                <MergeResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia.ColorPicker/Dark.axaml" />
            </ResourceDictionary.ThemeDictionaries>
            <ResourceDictionary.MergedDictionaries>
                <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml" />
--- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
+++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
@@ -7,10 +7,6 @@
        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
    </PropertyGroup>

-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
-    </PropertyGroup>
-
    <ItemGroup>
        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
--- a/src/Semi.Avalonia.ColorPicker/irihi.png
+++ b/src/Semi.Avalonia.ColorPicker/irihi.png
--- a/src/Semi.Avalonia.DataGrid/Dark.axaml
+++ b/src/Semi.Avalonia.DataGrid/Dark.axaml
@@ -9,7 +9,6 @@

    <SolidColorBrush x:Key="DataGridColumnHeaderForeground" Opacity="0.6" Color="#F9F9F9" />
    <SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="Transparent" />
-
    <SolidColorBrush x:Key="DataGridColumnHeaderPointeroverBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackground" Opacity="0.20" Color="White" />

--- a/src/Semi.Avalonia.DataGrid/DataGrid.axaml
+++ b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
@@ -292,7 +292,7 @@
                            Name="BackgroundBorder"
                            Grid.RowSpan="2"
                            Grid.ColumnSpan="2"
-                            Margin="{DynamicResource DataGridRowMargin}"
+                            Margin="2"
                            Background="{DynamicResource DataGridRowBackground}"
                            CornerRadius="3" />
                        <Rectangle
--- a/src/Semi.Avalonia.DataGrid/Index.axaml
+++ b/src/Semi.Avalonia.DataGrid/Index.axaml
@@ -2,8 +2,8 @@
    <Styles.Resources>
        <ResourceDictionary>
            <ResourceDictionary.ThemeDictionaries>
-                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia.DataGrid/Light.axaml" />
-                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia.DataGrid/Dark.axaml" />
+                <MergeResourceInclude x:Key="Default" Source="avares://Semi.Avalonia.DataGrid/Light.axaml" />
+                <MergeResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia.DataGrid/Dark.axaml" />
            </ResourceDictionary.ThemeDictionaries>
            <ResourceDictionary.MergedDictionaries>
                <ResourceInclude Source="avares://Semi.Avalonia.DataGrid/DataGrid.axaml" />
--- a/src/Semi.Avalonia.DataGrid/Light.axaml
+++ b/src/Semi.Avalonia.DataGrid/Light.axaml
@@ -18,9 +18,8 @@
    <SolidColorBrush x:Key="DataGridDetailsPresenterBackground" Color="Transparent" />

    <SolidColorBrush x:Key="DataGridRowPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Color="#CBE7FE" />
-
+    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Opacity="0.2" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Opacity="0.3" Color="#CBE7FE" />
    <SolidColorBrush x:Key="DataGridRowGroupHeaderExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
    <SolidColorBrush x:Key="DataGridRowGroupHeaderBackground" Opacity="0.05" Color="#2E3238" />

--- a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
+++ b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <Import Project="../Package.props"/>
-
+    
    <PropertyGroup>
        <Title>Semi.Avalonia.DataGrid</Title>
        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
    </PropertyGroup>

-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
-    </PropertyGroup>
-
    <ItemGroup>
        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)"/>
--- a/src/Semi.Avalonia.DataGrid/Shared.axaml
+++ b/src/Semi.Avalonia.DataGrid/Shared.axaml
@@ -12,7 +12,6 @@
    <StreamGeometry x:Key="DataGridColumnHeaderDescendingGlyph">M17.549 15.659L12.753 21.139C12.6591 21.2464 12.5434 21.3325 12.4135 21.3915C12.2836 21.4505 12.1427 21.481 12 21.481C11.8574 21.481 11.7164 21.4505 11.5865 21.3915C11.4566 21.3325 11.3409 21.2464 11.247 21.139L6.45101 15.659C5.88501 15.011 6.34501 14 7.20401 14H16.796C17.656 14 18.115 15.012 17.549 15.659Z</StreamGeometry>

    <Thickness x:Key="DataGridRowHeaderMargin">8 0</Thickness>
-    <Thickness x:Key="DataGridRowMargin">2</Thickness>

    <StreamGeometry x:Key="DataGridRowGroupHeaderExpandIconGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</StreamGeometry>

--- a/src/Semi.Avalonia.DataGrid/irihi.png
+++ b/src/Semi.Avalonia.DataGrid/irihi.png
--- a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
+++ b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
@@ -3,24 +3,17 @@
    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
        <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
-        <Version>11.0.10</Version>
-        <Authors>IRIHI Technology Co., Ltd.</Authors>
+        <LangVersion>11</LangVersion>
+        <Version>11.0.1</Version>
+        <Authors>IRIHI Technology</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
-        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>irihi.png</PackageIcon>
        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <AvaloniaVersion>11.0.10</AvaloniaVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
+        <AvaloniaVersion>11.0.0</AvaloniaVersion>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
    </PropertyGroup>

    <ItemGroup>
        <PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="$(AvaloniaVersion)"/>
-        <None Include="irihi.png" Pack="true" PackagePath=""/>
    </ItemGroup>

 </Project>
--- a/src/Semi.Avalonia.TreeDataGrid/Shared.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Shared.axaml
@@ -5,5 +5,4 @@
    </StreamGeometry>
    <StreamGeometry x:Key="TreeDataGridSortIconAscendingPath">M6.45096 8.34102L11.247 2.86102C11.3408 2.75361 11.4566 2.66753 11.5865 2.60854C11.7163 2.54956 11.8573 2.51904 12 2.51904C12.1426 2.51904 12.2836 2.54956 12.4135 2.60854C12.5433 2.66753 12.6591 2.75361 12.753 2.86102L17.549 8.34102C18.115 8.98802 17.655 10 16.796 10H7.20396C6.34396 10 5.88496 8.98802 6.45096 8.34102Z</StreamGeometry>
    <StreamGeometry x:Key="TreeDataGridItemCollapsedChevronPathData">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>
-    <Thickness x:Key="TreeDataGridRowMargin">2</Thickness>
 </ResourceDictionary>
--- a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
@@ -149,7 +149,7 @@
                <Panel>
                    <Border
                        Name="RowBorder"
-                        Margin="{DynamicResource TreeDataGridRowMargin}"
+                        Margin="2"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
                        Background="{TemplateBinding Background}"
@@ -183,7 +183,8 @@
                    <CheckBox
                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                        VerticalAlignment="Center"
-                        IsChecked="{TemplateBinding Value, Mode=TwoWay}"
+                        IsChecked="{TemplateBinding Value,
+                                                    Mode=TwoWay}"
                        IsEnabled="{Binding !IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
                        IsThreeState="{TemplateBinding IsThreeState}"
                        Theme="{DynamicResource SimpleCheckBox}" />
@@ -238,7 +239,8 @@
                            DockPanel.Dock="Left">
                            <ToggleButton
                                Focusable="False"
-                                IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"
+                                IsChecked="{TemplateBinding IsExpanded,
+                                                            Mode=TwoWay}"
                                IsVisible="{TemplateBinding ShowExpander}"
                                Theme="{StaticResource TreeDataGridExpandCollapseChevron}" />
                        </Border>
@@ -285,7 +287,8 @@
                        <TextBox
                            Name="PART_Edit"
                            Classes="Small"
-                            Text="{TemplateBinding Value, Mode=TwoWay}" />
+                            Text="{TemplateBinding Value,
+                                                   Mode=TwoWay}" />
                    </Border>
                </ControlTemplate>
            </Setter>
--- a/src/Semi.Avalonia.TreeDataGrid/irihi.png
+++ b/src/Semi.Avalonia.TreeDataGrid/irihi.png
--- a/src/Semi.Avalonia/Controls/AdornerLayer.axaml
+++ b/src/Semi.Avalonia/Controls/AdornerLayer.axaml
@@ -1,16 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:ClassModifier="internal">
-    <ControlTheme x:Key="{x:Type AdornerLayer}" TargetType="AdornerLayer">
-        <Setter Property="DefaultFocusAdorner">
-            <FocusAdornerTemplate>
-                <Rectangle
-                    Margin="{DynamicResource AdornerLayerMargin}"
-                    Stroke="{DynamicResource AdornerLayerBackground}"
-                    StrokeDashArray="1,2"
-                    StrokeThickness="{DynamicResource AdornerLayerThickness}" />
-            </FocusAdornerTemplate>
-        </Setter>
-    </ControlTheme>
-</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
@@ -19,6 +19,8 @@
                            VerticalAlignment="Center"
                            DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                            Theme="{DynamicResource NonErrorTextBox}"
+                            InnerLeftContent="{TemplateBinding InnerLeftContent}"
+                            InnerRightContent="{TemplateBinding InnerRightContent}"
                            Watermark="{TemplateBinding Watermark}" />
                        <Popup
                            Name="PART_Popup"
--- a/src/Semi.Avalonia/Controls/Button.axaml
+++ b/src/Semi.Avalonia/Controls/Button.axaml
@@ -2,9 +2,9 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    x:CompileBindings="True">
-    <!--  Button Theme Key: Light, Solid, Outline, Borderless; Default is Light  -->
-    <!--  Button Default Classes: Primary, Secondary, Tertiary, Success, Warning, Danger; Default is Primary  -->
-    <!--  State: default, pointerover, pressed, disabled  -->
+    <!--  Button Theme Key: Solid Light Border Borderless; Default is Light  -->
+    <!--  Button Default Classes: Primary Secondary, Tertiary, Warning, Danger; Default is Primary  -->
+    <!--  State： default pointerover pressed disabled  -->

    <!--  Button Light  -->
    <ControlTheme x:Key="{x:Type Button}" TargetType="Button">
@@ -76,6 +76,7 @@

        <Style Selector="^:disabled">
            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
        </Style>

@@ -185,37 +186,7 @@

        <Style Selector="^:disabled">
            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme
-        x:Key="OutlineButton"
-        BasedOn="{StaticResource {x:Type Button}}"
-        TargetType="Button">
-        <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-        <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-        </Style>
-        <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-        </Style>
-        <Style Selector="^.Success">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
-        </Style>
-        <Style Selector="^.Warning">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
-        </Style>
-        <Style Selector="^.Danger">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
-        </Style>
-        <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
        </Style>
    </ControlTheme>
--- a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
@@ -41,6 +41,7 @@
        <Setter Property="ButtonSpinner.BorderBrush" Value="{DynamicResource ButtonSpinnerRepeatButtonBorderBrush}" />
        <Setter Property="ButtonSpinner.BorderThickness" Value="0" />
        <Setter Property="ButtonSpinner.MinWidth" Value="300" />
+        <!--  Add Resource  -->
        <Setter Property="ButtonSpinner.Template">
            <ControlTemplate TargetType="ButtonSpinner">
                <Grid ColumnDefinitions="Auto, *, Auto">
@@ -48,7 +49,8 @@
                        Grid.Column="1"
                        BorderBrush="{TemplateBinding BorderBrush}"
                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        UseLayoutRounding="False">
                        <ContentPresenter
                            Name="PART_ContentPresenter"
                            Padding="{TemplateBinding Padding}"
--- a/src/Semi.Avalonia/Controls/Calendar.axaml
+++ b/src/Semi.Avalonia/Controls/Calendar.axaml
@@ -31,7 +31,6 @@
    </ControlTheme>

    <ControlTheme x:Key="{x:Type CalendarItem}" TargetType="CalendarItem">
-        <Setter Property="CalendarItem.MinWidth" Value="{DynamicResource CalendarMinWidth}" />
        <Setter Property="CalendarItem.MinHeight" Value="{DynamicResource CalendarMinHeight}" />
        <Setter Property="CalendarItem.DayTitleTemplate">
            <Template>
@@ -54,7 +53,7 @@
                    BorderThickness="{TemplateBinding BorderThickness}"
                    CornerRadius="{TemplateBinding CornerRadius}">
                    <Grid
-                        MinWidth="{TemplateBinding MinWidth}"
+                        MinWidth="{DynamicResource CalendarMinWidth}"
                        MinHeight="{TemplateBinding MinHeight}"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
--- a/src/Semi.Avalonia/Controls/CheckBox.axaml
+++ b/src/Semi.Avalonia/Controls/CheckBox.axaml
@@ -123,8 +123,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
@@ -166,8 +166,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
@@ -275,8 +275,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
@@ -315,8 +315,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
@@ -457,8 +457,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
@@ -512,8 +512,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -61,7 +61,6 @@
                            Margin="{TemplateBinding Padding}"
                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            TextTrimming="CharacterEllipsis"
                            Foreground="{TemplateBinding Foreground}"
                            IsVisible="{TemplateBinding SelectionBoxItem,
                                                        Converter={x:Static ObjectConverters.IsNull}}"
--- a/src/Semi.Avalonia/Controls/ContentControl.axaml
+++ b/src/Semi.Avalonia/Controls/ContentControl.axaml
@@ -1,22 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True">
-    <ControlTheme x:Key="{x:Type ContentControl}" TargetType="ContentControl">
-        <Setter Property="Template">
-            <ControlTemplate TargetType="ContentControl">
-                <ContentPresenter
-                    Name="PART_ContentPresenter"
-                    Padding="{TemplateBinding Padding}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
-</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/DropDownButton.axaml
+++ b/src/Semi.Avalonia/Controls/DropDownButton.axaml
@@ -88,6 +88,7 @@

        <Style Selector="^:disabled">
            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
        </Style>

@@ -234,37 +235,7 @@

        <Style Selector="^:disabled">
            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme
-        x:Key="OutlineDropDownButton"
-        BasedOn="{StaticResource {x:Type DropDownButton}}"
-        TargetType="DropDownButton">
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-        <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-        </Style>
-        <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-        </Style>
-        <Style Selector="^.Success">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
-        </Style>
-        <Style Selector="^.Warning">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
-        </Style>
-        <Style Selector="^.Danger">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
-        </Style>
-        <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
        </Style>
    </ControlTheme>
--- a/src/Semi.Avalonia/Controls/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Controls/HyperlinkButton.axaml
@@ -0,0 +1,118 @@
+<ResourceDictionary
+    x:CompileBindings="True"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme TargetType="HyperlinkButton" x:Key="{x:Type HyperlinkButton}">
+        <Setter Property="Padding" Value="0,0,0,0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="{DynamicResource HyperlinkButtonFontSize}" />
+        <Setter Property="MinHeight" Value="32" />
+        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}" />
+        <Setter Property="Background" Value="{DynamicResource HyperlinkButtonDefaultBackground}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="HyperlinkButton">
+                <Grid ColumnDefinitions="Auto,*" x:Name="RootGrid">
+                    <Grid
+                        Grid.Column="0"
+                        IsVisible="False"
+                        Margin="0,0,8,0"
+                        VerticalAlignment="Center"
+                        x:Name="IconGrid">
+                        <Border
+                            Background="{DynamicResource HyperlinkButtonDefaultBackground}"
+                            Height="{DynamicResource HyperlinkButtonIconHeight}"
+                            Opacity="0"
+                            UseLayoutRounding="False"
+                            Width="{DynamicResource HyperlinkButtonIconWidth}"
+                            x:Name="BackgroundRectangle" />
+                        <PathIcon
+                            Data="{DynamicResource HyperlinkButtonLinkGlyph}"
+                            Foreground="{DynamicResource HyperlinkButtonForeground}"
+                            Height="{DynamicResource HyperlinkButtonLinkGlyphHeight}"
+                            Name="LinkGlyph"
+                            VerticalAlignment="Center"
+                            Width="{DynamicResource HyperlinkButtonLinkGlyphWidth}" />
+                    </Grid>
+                    <ContentPresenter
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        Cursor="{TemplateBinding Cursor}"
+                        Grid.Column="1"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        Padding="0,0,0,0"
+                        RecognizesAccessKey="True"
+                        VerticalAlignment="Center"
+                        x:Name="ContentPresenter" />
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pointerover">
+            <Style Selector="^ /template/ PathIcon#LinkGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
+            </Style>
+        </Style>
+
+        <!--  Unvisited Pressed State  -->
+        <Style Selector="^:pressed">
+            <Setter Property="RenderTransform" Value="scale(0.98)" />
+        </Style>
+
+        <!--  Unvisited Disabled state  -->
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ PathIcon#LinkGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:visited">
+            <Style Selector="^ /template/ PathIcon#LinkGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
+            </Style>
+
+            <!--  Visited Pointerover State  -->
+            <Style Selector="^:pointerover">
+                <Style Selector="^ /template/ PathIcon#LinkGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
+                </Style>
+                <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
+                </Style>
+            </Style>
+
+            <!--  Visited Pressed State  -->
+            <Style Selector="^:pressed">
+                <Setter Property="RenderTransform" Value="scale(0.98)" />
+            </Style>
+
+            <!--  Visited Disabled State  -->
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ PathIcon#LinkGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
+                </Style>
+                <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
+                </Style>
+            </Style>
+        </Style>
+
+        <Style Selector="^.WithIcon">
+            <Style Selector="^ /template/ Grid#IconGrid">
+                <Setter Property="IsVisible" Value="True" />
+            </Style>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
@@ -131,13 +131,13 @@
                                    <ColumnDefinition Width="200" SharedSizeGroup="Size" />
                                </Grid.ColumnDefinitions>
                                <GridSplitter Grid.Column="1" Width="1" />
-                                <TextBlock Grid.Column="2" Text="{DynamicResource STRING_CHOOSER_NAME_COLUMN}" />
+                                <TextBlock Grid.Column="2" Text="Name" />
                                <GridSplitter Grid.Column="3" Width="1" />
-                                <TextBlock Grid.Column="4" Text="{DynamicResource STRING_CHOOSER_DATEMODIFIED_COLUMN}" />
+                                <TextBlock Grid.Column="4" Text="Date Modified" />
                                <GridSplitter Grid.Column="5" Width="1" />
-                                <TextBlock Grid.Column="6" Text="{DynamicResource STRING_CHOOSER_TYPE_COLUMN}" />
+                                <TextBlock Grid.Column="6" Text="Type" />
                                <GridSplitter Grid.Column="7" Width="1" />
-                                <TextBlock Grid.Column="8" Text="{DynamicResource STRING_CHOOSER_SIZE_COLUMN}" />
+                                <TextBlock Grid.Column="8" Text="Size" />
                            </Grid>
                            <ListBox
                                Name="PART_Files"
--- a/src/Semi.Avalonia/Controls/Menu.axaml
+++ b/src/Semi.Avalonia/Controls/Menu.axaml
@@ -147,7 +147,6 @@
                                HorizontalAlignment="Stretch"
                                VerticalAlignment="Center"
                                Content="{TemplateBinding Header}"
-                                ContentTemplate="{TemplateBinding HeaderTemplate}"
                                RecognizesAccessKey="True" />
                            <TextBlock
                                x:Name="PART_InputGestureText"
@@ -268,7 +267,6 @@
                            HorizontalAlignment="Stretch"
                            VerticalAlignment="Center"
                            Content="{TemplateBinding Header}"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
                            RecognizesAccessKey="True" />
                        <Popup
                            Name="PART_Popup"
--- a/src/Semi.Avalonia/Controls/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
@@ -35,6 +35,8 @@
                            Text="{TemplateBinding Text}"
                            TextWrapping="NoWrap"
                            Theme="{DynamicResource NonErrorTextBox}"
+                            InnerLeftContent="{TemplateBinding InnerLeftContent}"
+                            InnerRightContent="{TemplateBinding InnerRightContent}"
                            Watermark="{TemplateBinding Watermark}" />
                    </ButtonSpinner>
                </DataValidationErrors>
--- a/src/Semi.Avalonia/Controls/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Controls/ProgressBar.axaml
@@ -185,10 +185,6 @@
        <Style Selector="^.Warning">
            <Setter Property="Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
        </Style>
-        <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarDangerForeground}" />
-        </Style>
-        <!-- Error style is obsolete, use Danger instead -->
        <Style Selector="^.Error">
            <Setter Property="Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
        </Style>
@@ -415,10 +411,6 @@
        <Style Selector="^.Warning">
            <Setter Property="Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
        </Style>
-        <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarDangerForeground}" />
-        </Style>
-        <!-- Error style is obsolete, use Danger instead -->
        <Style Selector="^.Error">
            <Setter Property="Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
        </Style>
--- a/src/Semi.Avalonia/Controls/RefreshContainer.axaml
+++ b/src/Semi.Avalonia/Controls/RefreshContainer.axaml
@@ -28,21 +28,27 @@
        <Setter Property="IsTabStop" Value="False" />
        <Setter Property="IsHitTestVisible" Value="False" />
        <Setter Property="Height" Value="100" />
-        <Setter Property="Background" Value="{DynamicResource RefreshContainerIconBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource RefreshContainerIconForeground}" />
+        <Setter Property="Background" Value="{DynamicResource RefreshVisualizerIconBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource RefreshVisualizerIconForeground}" />
+        <Setter Property="Content">
+            <Template>
+                <Arc
+                    Name="PART_Icon"
+                    Width="{DynamicResource RefreshVisualizerIconSize}"
+                    Height="{DynamicResource RefreshVisualizerIconSize}"
+                    StartAngle="0"
+                    Stroke="{DynamicResource RefreshVisualizerIconForeground}"
+                    StrokeThickness="3"
+                    StrokeLineCap="Round"
+                    SweepAngle="270" />
+            </Template>
+        </Setter>
        <Setter Property="Template">
            <ControlTemplate>
-                <Grid
-                    Name="PART_Root"
-                    MinHeight="80"
-                    Background="{TemplateBinding Background}">
-                    <Grid.Styles>
-                        <Style Selector="PathIcon#PART_Icon">
-                            <Setter Property="Data" Value="{DynamicResource RefreshContainerIconGlyph}" />
-                        </Style>
-                    </Grid.Styles>
-                </Grid>
+                <Grid Name="PART_Root"
+                      MinHeight="80"
+                      Background="{TemplateBinding Background}" />
            </ControlTemplate>
        </Setter>
    </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/RepeatButton.axaml
+++ b/src/Semi.Avalonia/Controls/RepeatButton.axaml
@@ -71,6 +71,7 @@

        <Style Selector="^:disabled">
            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
        </Style>

@@ -171,37 +172,7 @@

        <Style Selector="^:disabled">
            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme
-        x:Key="OutlineRepeatButton"
-        BasedOn="{StaticResource {x:Type RepeatButton}}"
-        TargetType="RepeatButton">
-        <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-        <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-        </Style>
-        <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-        </Style>
-        <Style Selector="^.Success">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
-        </Style>
-        <Style Selector="^.Warning">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
-        </Style>
-        <Style Selector="^.Danger">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
-        </Style>
-        <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
        </Style>
    </ControlTheme>
--- a/src/Semi.Avalonia/Controls/SplitButton.axaml
+++ b/src/Semi.Avalonia/Controls/SplitButton.axaml
@@ -124,12 +124,9 @@
            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
        </Style>
        <Style Selector="^:disabled /template/ Button">
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
        </Style>
-        <!-- only for ToggleSplitButton -->
-        <Style Selector="^:checked:disabled /template/ Button">
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
-        </Style>
    </ControlTheme>

    <ControlTheme
@@ -209,37 +206,7 @@
        </Style>

        <Style Selector="^:disabled /template/ Button">
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme
-        x:Key="OutlineSplitButton"
-        BasedOn="{StaticResource {x:Type SplitButton}}"
-        TargetType="SplitButton">
-        <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-        <Style Selector="^ /template/ Button">
-            <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
-            </Style>
-            <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
-            </Style>
-        </Style>
-        <Style Selector="^.Success /template/ Button">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
-        </Style>
-        <Style Selector="^.Warning /template/ Button">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
-        </Style>
-        <Style Selector="^.Danger /template/ Button">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
-        </Style>
-        <Style Selector="^:disabled /template/ Button">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
        </Style>
    </ControlTheme>
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -240,13 +240,6 @@
                </Style>
            </Style>
        </Style>
-        
-        <Style Selector="^.TextArea">
-            <Setter Property="AcceptsReturn" Value="True"></Setter>
-            <Setter Property="VerticalContentAlignment" Value="Top"></Setter>
-            <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxTextAreaContentPadding}"></Setter>
-            <Setter Property="MinHeight" Value="{DynamicResource TextBoxTextAreaHeight}"></Setter>
-        </Style>
    </ControlTheme>

    <ControlTheme x:Key="NonErrorTextBox" TargetType="TextBox">
@@ -276,7 +269,7 @@
                        BorderBrush="{TemplateBinding BorderBrush}"
                        BorderThickness="{TemplateBinding BorderThickness}"
                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *">
+                        <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
                            <ContentPresenter
                                Grid.Column="0"
                                Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
@@ -320,6 +313,13 @@
                                        TextWrapping="{TemplateBinding TextWrapping}" />
                                </Panel>
                            </ScrollViewer>
+                            <ContentPresenter
+                                Grid.Column="2"
+                                Padding="{DynamicResource TextBoxInnerRightContentPadding}"
+                                VerticalAlignment="Center"
+                                Content="{TemplateBinding InnerRightContent}"
+                                Foreground="{DynamicResource TextBoxInnerForeground}"
+                                IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
                        </Grid>
                    </Border>
                </DataValidationErrors>
--- a/src/Semi.Avalonia/Controls/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleButton.axaml
@@ -67,7 +67,6 @@

        <Style Selector="^:disabled">
            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ToggleButtonDefaultBackground}" />
        </Style>

        <Style Selector="^.Primary">
@@ -154,7 +153,6 @@
            </Style>
            <Style Selector="^:disabled">
                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonCheckedDisabledBackground}" />
            </Style>
        </Style>

@@ -244,12 +242,12 @@
            </Style>
            <Style Selector="^:disabled">
                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonIndeterminateDisabledBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonDefaultBackground}" />
            </Style>
        </Style>

        <Style Selector="^:disabled">
            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultDisabledForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ToggleButtonDefaultDisabledBackground}" />
        </Style>

        <Style Selector="^.Large">
--- a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
@@ -36,7 +36,8 @@
                        VerticalAlignment="Top"
                        Content="{TemplateBinding Content}"
                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        IsVisible="{TemplateBinding Content, Converter={x:Static ObjectConverters.IsNotNull}}"
+                        IsVisible="{TemplateBinding Content,
+                                                    Converter={x:Static ObjectConverters.IsNotNull}}"
                        RecognizesAccessKey="True" />
                    <Grid
                        Grid.Row="1"
@@ -47,34 +48,38 @@
                            Grid.ColumnSpan="2"
                            TemplatedControl.IsTemplateFocusTarget="True" />
                        <Border
-                            x:Name="SwitchBackgroundBorder"
+                            Name="SwitchBackgroundBorder"
                            Grid.Column="0"
-                            Width="{DynamicResource ToggleSwitchDefaultWidth}"
-                            Height="{DynamicResource ToggleSwitchDefaultHeight}"
+                            Width="40"
+                            Height="20"
                            CornerRadius="100">
                            <Border.Transitions>
                                <Transitions>
                                    <BrushTransition Property="Background" Duration="0:0:0.2" />
                                </Transitions>
                            </Border.Transitions>
-                            <Canvas
-                                x:Name="PART_SwitchKnob"
-                                Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
-                                Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
-                                HorizontalAlignment="Left">
-                                <Grid
-                                    x:Name="PART_MovingKnobs"
-                                    Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
-                                    Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
-                                    Margin="{DynamicResource ToggleSwitchIndicatorDefaultMargin}">
-                                    <Border
-                                        x:Name="SwitchKnobIndicator"
-                                        Background="White"
-                                        BoxShadow="0 0 1 1 #222E3238"
-                                        CornerRadius="100" />
-                                </Grid>
-                            </Canvas>
                        </Border>
+                        <Canvas
+                            x:Name="PART_SwitchKnob"
+                            Grid.Column="0"
+                            Width="20"
+                            Height="20"
+                            HorizontalAlignment="Left">
+                            <Grid
+                                x:Name="PART_MovingKnobs"
+                                Width="20"
+                                Height="20">
+                                <Border
+                                    x:Name="SwitchKnobIndicator"
+                                    Width="14"
+                                    Height="14"
+                                    Background="White"
+                                    BorderBrush="{DynamicResource ToggleSwitchIndicatorBorderBrush}"
+                                    BorderThickness="0.5"
+                                    BoxShadow="0 0 1 1 #222E3238"
+                                    CornerRadius="100" />
+                            </Grid>
+                        </Canvas>

                        <ContentPresenter
                            x:Name="PART_OnContentPresenter"
@@ -149,36 +154,6 @@
                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerCheckedDisabledBackground}" />
            </Style>
        </Style>
-        <Style Selector="^.Small">
-            <Style Selector="^ /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Width" Value="{DynamicResource ToggleSwitchSmallWidth}" />
-                <Setter Property="Height" Value="{DynamicResource ToggleSwitchSmallHeight}" />
-            </Style>
-            <Style Selector="^ /template/ Canvas#PART_SwitchKnob">
-                <Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" />
-                <Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" />
-            </Style>
-            <Style Selector="^ /template/ Grid#PART_MovingKnobs">
-                <Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" />
-                <Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" />
-                <Setter Property="Margin" Value="{DynamicResource ToggleSwitchIndicatorSmallMargin}"/>
-            </Style>
-        </Style>
-        <Style Selector="^.Large">
-            <Style Selector="^ /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Width" Value="{DynamicResource ToggleSwitchLargeWidth}" />
-                <Setter Property="Height" Value="{DynamicResource ToggleSwitchLargeHeight}" />
-            </Style>
-            <Style Selector="^ /template/ Canvas#PART_SwitchKnob">
-                <Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" />
-                <Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" />
-            </Style>
-            <Style Selector="^ /template/ Grid#PART_MovingKnobs">
-                <Setter Property="Width" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" />
-                <Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" />
-                <Setter Property="Margin" Value="{DynamicResource ToggleSwitchIndicatorLargeMargin}"/>
-            </Style>
-        </Style>
    </ControlTheme>

    <ControlTheme
@@ -230,40 +205,49 @@
                <Grid
                    Background="{TemplateBinding Background}"
                    Cursor="Hand"
-                    ColumnDefinitions="Auto, *">
+                    RowDefinitions="*">
                    <Grid
-                        Grid.Column="0"
-                        Grid.ColumnSpan="2"
-                        TemplatedControl.IsTemplateFocusTarget="True" />
-                    <Border
-                        x:Name="SwitchBackgroundBorder"
-                        Grid.Column="0"
-                        Width="{DynamicResource ToggleSwitchDefaultWidth}"
-                        Height="{DynamicResource ToggleSwitchDefaultHeight}"
-                        CornerRadius="100">
-                        <Border.Transitions>
-                            <Transitions>
-                                <BrushTransition Property="Background" Duration="0:0:0.2" />
-                            </Transitions>
-                        </Border.Transitions>
+                        Grid.Row="0"
+                        Background="Transparent"
+                        ColumnDefinitions="Auto, *">
+                        <Grid
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            TemplatedControl.IsTemplateFocusTarget="True" />
+                        <Border
+                            Name="SwitchBackgroundBorder"
+                            Grid.Column="0"
+                            Width="40"
+                            Height="20"
+                            CornerRadius="100">
+                            <Border.Transitions>
+                                <Transitions>
+                                    <BrushTransition Property="Background" Duration="0:0:0.2" />
+                                </Transitions>
+                            </Border.Transitions>
+                        </Border>
                        <Canvas
                            x:Name="PART_SwitchKnob"
-                            Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
-                            Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
+                            Grid.Column="0"
+                            Width="20"
+                            Height="20"
                            HorizontalAlignment="Left">
                            <Grid
                                x:Name="PART_MovingKnobs"
-                                Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
-                                Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
-                                Margin="{DynamicResource ToggleSwitchIndicatorDefaultMargin}">
+                                Width="20"
+                                Height="20">
                                <Border
                                    x:Name="SwitchKnobIndicator"
+                                    Width="14"
+                                    Height="14"
                                    Background="White"
+                                    BorderBrush="{DynamicResource ToggleSwitchIndicatorBorderBrush}"
+                                    BorderThickness="0.5"
                                    BoxShadow="0 0 1 1 #222E3238"
                                    CornerRadius="100" />
                            </Grid>
                        </Canvas>
-                    </Border>
+                    </Grid>
                </Grid>
            </ControlTemplate>
        </Setter>
--- a/src/Semi.Avalonia/Controls/UserControl.axaml
+++ b/src/Semi.Avalonia/Controls/UserControl.axaml
@@ -1,23 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True">
-    <!--  Add Resources Here  -->
-    <ControlTheme x:Key="{x:Type UserControl}" TargetType="UserControl">
-        <Setter Property="Template">
-            <ControlTemplate TargetType="UserControl">
-                <ContentPresenter
-                    Name="PART_ContentPresenter"
-                    Padding="{TemplateBinding Padding}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
-</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/_index.axaml
+++ b/src/Semi.Avalonia/Controls/_index.axaml
@@ -1,9 +1,8 @@
 <ResourceDictionary
+    x:CompileBindings="True"
    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Controls/AdornerLayer.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/AutoCompleteBox.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Border.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Button.axaml" />
@@ -14,7 +13,6 @@
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Carousel.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/CheckBox.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/ComboBox.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Controls/ContentControl.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/ContextMenu.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/DataValidationErrors.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/DatePicker.axaml" />
@@ -25,6 +23,7 @@
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/FlyoutPresenter.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/GridSplitter.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/HeaderedContentControl.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/HyperlinkButton.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/ItemsControl.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Label.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/ListBox.axaml" />
@@ -57,7 +56,6 @@
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Tooltip.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/TransitioningContentControl.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/TreeView.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Controls/UserControl.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Window.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/WindowNotificationManager.axaml" />
    </ResourceDictionary.MergedDictionaries>
--- a/src/Semi.Avalonia/Locale/en-us.axaml
+++ b/src/Semi.Avalonia/Locale/en-us.axaml
@@ -1,17 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    x:Class="Semi.Avalonia.Locale.en_us"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- TextBox/SelectableTextBox flyout -->
-    <x:String x:Key="STRING_MENU_CUT">Cut</x:String>
-    <x:String x:Key="STRING_MENU_COPY">Copy</x:String>
-    <x:String x:Key="STRING_MENU_PASTE">Paste</x:String>
-    <!-- ManagedFileChooser -->
    <x:String x:Key="STRING_CHOOSER_FILE_NAME">File name</x:String>
    <x:String x:Key="STRING_CHOOSER_SHOW_HIDDEN_FILES">Show hidden flies</x:String>
    <x:String x:Key="STRING_CHOOSER_DIALOG_OK">OK</x:String>
    <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">Cancel</x:String>
-    <x:String x:Key="STRING_CHOOSER_NAME_COLUMN">Name</x:String>
-    <x:String x:Key="STRING_CHOOSER_DATEMODIFIED_COLUMN">Date Modified</x:String>
-    <x:String x:Key="STRING_CHOOSER_TYPE_COLUMN">Type</x:String>
-    <x:String x:Key="STRING_CHOOSER_SIZE_COLUMN">Size</x:String>
+    <x:String x:Key="STRING_MENU_CUT">Cut</x:String>
+    <x:String x:Key="STRING_MENU_COPY">Copy</x:String>
+    <x:String x:Key="STRING_MENU_PASTE">Paste</x:String>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Locale/en-us.axaml.cs
+++ b/src/Semi.Avalonia/Locale/en-us.axaml.cs
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Locale;
-
-public class en_us: ResourceDictionary
-{
-    
-}
--- a/src/Semi.Avalonia/Locale/zh-cn.axaml
+++ b/src/Semi.Avalonia/Locale/zh-cn.axaml
@@ -1,17 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    x:Class="Semi.Avalonia.Locale.zh_cn"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- TextBox/SelectableTextBox flyout -->
-    <x:String x:Key="STRING_MENU_CUT">剪切</x:String>
-    <x:String x:Key="STRING_MENU_COPY">复制</x:String>
-    <x:String x:Key="STRING_MENU_PASTE">粘贴</x:String>
-    <!-- ManagedFileChooser -->
    <x:String x:Key="STRING_CHOOSER_FILE_NAME">文件名</x:String>
    <x:String x:Key="STRING_CHOOSER_SHOW_HIDDEN_FILES">显示隐藏文件</x:String>
    <x:String x:Key="STRING_CHOOSER_DIALOG_OK">确认</x:String>
    <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">取消</x:String>
-    <x:String x:Key="STRING_CHOOSER_NAME_COLUMN">名称</x:String>
-    <x:String x:Key="STRING_CHOOSER_DATEMODIFIED_COLUMN">修改日期</x:String>
-    <x:String x:Key="STRING_CHOOSER_TYPE_COLUMN">类型</x:String>
-    <x:String x:Key="STRING_CHOOSER_SIZE_COLUMN">大小</x:String>
+    <x:String x:Key="STRING_MENU_CUT">剪切</x:String>
+    <x:String x:Key="STRING_MENU_COPY">复制</x:String>
+    <x:String x:Key="STRING_MENU_PASTE">粘贴</x:String>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Locale/zh-cn.axaml.cs
+++ b/src/Semi.Avalonia/Locale/zh-cn.axaml.cs
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Locale;
-
-public class zh_cn: ResourceDictionary
-{
-    
-}
--- a/src/Semi.Avalonia/Semi.Avalonia.csproj
+++ b/src/Semi.Avalonia/Semi.Avalonia.csproj
@@ -4,11 +4,7 @@

    <PropertyGroup>
        <Title>Semi.Avalonia</Title>
-        <PackageReleaseNotes>Update to 11.0.7.5</PackageReleaseNotes>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
+        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
    </PropertyGroup>

    <ItemGroup>
--- a/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml
@@ -1,3 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AdornerLayerBackground" Color="White" />
-</ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml
@@ -2,7 +2,7 @@
    <!--  Light  -->
    <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="#54A9FF" />
    <SolidColorBrush x:Key="ButtonDefaultSecondaryForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonDefaultTertiaryForeground" Opacity="0.8" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ButtonDefaultTertiaryForeground" Color="#888D92" />
    <SolidColorBrush x:Key="ButtonDefaultSuccessForeground" Color="#5DC264" />
    <SolidColorBrush x:Key="ButtonDefaultWarningForeground" Color="#FFAE43" />
    <SolidColorBrush x:Key="ButtonDefaultDangerForeground" Color="#FC725A" />
@@ -11,6 +11,7 @@
    <SolidColorBrush x:Key="ButtonDefaultBackground" Opacity="0.12" Color="White" />
    <SolidColorBrush x:Key="ButtonDefaultPointeroverBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="ButtonDefaultPressedBackground" Opacity="0.20" Color="White" />
+    <SolidColorBrush x:Key="ButtonDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />

    <SolidColorBrush x:Key="ButtonDefaultBorderBrush" Color="Transparent" />
    <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Color="Transparent" />
@@ -68,20 +69,8 @@
    <SolidColorBrush x:Key="ButtonSolidDangerBorderBrush" Color="#FC725A" />
    <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBorderBrush" Color="#FD9983" />
    <SolidColorBrush x:Key="ButtonSolidDangerPressedBorderBrush" Color="#FDBEAC" />
-
-    <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="#2E3238" />
    <!--  end Solid  -->
-
-    <!--  Outline -->
-    <SolidColorBrush x:Key="ButtonOutlineBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ButtonOutlineBorderBrush" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="ButtonOutlinePointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ButtonOutlinePressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ButtonOutlineSuccessBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="ButtonOutlineWarningBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ButtonOutlineDangerBorderBrush" Color="#FC725A" />
-    <!--  end Outline  -->
-
+    
    <SolidColorBrush x:Key="ButtonInputInnerForeground" Color="#888D92" />
    <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="#A7ABB0" />
    <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="#C6CACD" />
--- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
@@ -9,7 +9,7 @@
    <SolidColorBrush x:Key="CheckBoxDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
    <SolidColorBrush x:Key="CheckBoxPointeroverBackground" Opacity="0.12" Color="White" />
    <SolidColorBrush x:Key="CheckBoxPointeroverBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CheckBoxPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="CheckBoxPressedBackground" Color="#A9D7FF" />
    <SolidColorBrush x:Key="CheckBoxPressedBorderBrush" Color="#A9D7FF" />

    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBackground" Color="#54A9FF" />
--- a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush Color="#F9F9F9" x:Key="HyperlinkButtonForeground" />
+    <SolidColorBrush Color="Transparent" x:Key="HyperlinkButtonDefaultBackground" />
+    <SolidColorBrush Color="#54A9FF" x:Key="HyperlinkButtonOverForeground" />
+    <SolidColorBrush
+        Color="#F9F9F9"
+        Opacity="0.35"
+        x:Key="HyperlinkButtonDisabledForeground" />
+
+    <SolidColorBrush Color="#681DA8" x:Key="HyperlinkButtonVisitedForeground" />
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Palette.axaml
@@ -1,4 +1,4 @@
-<ResourceDictionary x:Class="Semi.Avalonia.Dark.Palette" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <!--  Color Resources  -->
    <Color x:Key="SemiRed0Color">#6C090B</Color>
    <Color x:Key="SemiRed1Color">#901110</Color>
@@ -160,11 +160,6 @@
    <Color x:Key="SemiGrey7Color">#C6CACD</Color>
    <Color x:Key="SemiGrey8Color">#E6E8EA</Color>
    <Color x:Key="SemiGrey9Color">#F9F9F9</Color>
-    <Color x:Key="SemiBackground0Color">#16161A</Color>
-    <Color x:Key="SemiBackground1Color">#232429</Color>
-    <Color x:Key="SemiBackground2Color">#35363C</Color>
-    <Color x:Key="SemiBackground3Color">#43444A</Color>
-    <Color x:Key="SemiBackground4Color">#4F5159</Color>

    <SolidColorBrush x:Key="SemiRed0" Color="{StaticResource SemiRed0Color}" />
    <SolidColorBrush x:Key="SemiRed1" Color="{StaticResource SemiRed1Color}" />
@@ -331,7 +326,6 @@
    <SolidColorBrush x:Key="SemiColorPrimary" Color="{StaticResource SemiBlue5Color}" />
    <SolidColorBrush x:Key="SemiColorPrimaryPointerover" Color="{StaticResource SemiBlue6Color}" />
    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="{StaticResource SemiBlue7Color}" />
-    <SolidColorBrush x:Key="SemiColorPrimaryActive" Color="{StaticResource SemiBlue7Color}" />
    <SolidColorBrush x:Key="SemiColorPrimaryDisabled" Color="{StaticResource SemiBlue2Color}" />
    <SolidColorBrush x:Key="SemiColorPrimaryLight" Opacity="0.2" Color="{StaticResource SemiBlue5Color}" />
    <SolidColorBrush x:Key="SemiColorPrimaryLightPointerover" Opacity="0.3" Color="{StaticResource SemiBlue5Color}" />
@@ -340,16 +334,15 @@
    <SolidColorBrush x:Key="SemiColorSecondary" Color="{StaticResource SemiLightBlue5Color}" />
    <SolidColorBrush x:Key="SemiColorSecondaryPointerover" Color="{StaticResource SemiLightBlue6Color}" />
    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
-    <SolidColorBrush x:Key="SemiColorSecondaryActive" Color="{StaticResource SemiLightBlue7Color}" />
    <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="{StaticResource SemiLightBlue2Color}" />
    <SolidColorBrush x:Key="SemiColorSecondaryLight" Opacity="0.2" Color="{StaticResource SemiLightBlue5Color}" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Opacity="0.3" Color="{StaticResource SemiLightBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Opacity="0.3"
+                     Color="{StaticResource SemiLightBlue5Color}" />
    <SolidColorBrush x:Key="SemiColorSecondaryLightActive" Opacity="0.4" Color="{StaticResource SemiLightBlue5Color}" />
    <!--  Tertiary  -->
    <SolidColorBrush x:Key="SemiColorTertiary" Color="{StaticResource SemiGrey5Color}" />
    <SolidColorBrush x:Key="SemiColorTertiaryPointerover" Color="{StaticResource SemiGrey6Color}" />
    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="{StaticResource SemiGrey7Color}" />
-    <SolidColorBrush x:Key="SemiColorTertiaryActive" Color="{StaticResource SemiGrey7Color}" />
    <SolidColorBrush x:Key="SemiColorTertiaryLight" Opacity="0.2" Color="{StaticResource SemiGrey5Color}" />
    <SolidColorBrush x:Key="SemiColorTertiaryLightPointerover" Opacity="0.3" Color="{StaticResource SemiGrey5Color}" />
    <SolidColorBrush x:Key="SemiColorTertiaryLightActive" Opacity="0.4" Color="{StaticResource SemiGrey5Color}" />
@@ -357,7 +350,6 @@
    <SolidColorBrush x:Key="SemiColorInformation" Color="{StaticResource SemiBlue5Color}" />
    <SolidColorBrush x:Key="SemiColorInformationPointerover" Color="{StaticResource SemiBlue6Color}" />
    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="{StaticResource SemiBlue7Color}" />
-    <SolidColorBrush x:Key="SemiColorInformationActive" Color="{StaticResource SemiBlue7Color}" />
    <SolidColorBrush x:Key="SemiColorInformationDisabled" Color="{StaticResource SemiBlue2Color}" />
    <SolidColorBrush x:Key="SemiColorInformationLight" Opacity="0.2" Color="{StaticResource SemiBlue5Color}" />
    <SolidColorBrush x:Key="SemiColorInformationLightPointerover" Opacity="0.3" Color="{StaticResource SemiBlue5Color}" />
@@ -366,7 +358,6 @@
    <SolidColorBrush x:Key="SemiColorSuccess" Color="{StaticResource SemiGreen5Color}" />
    <SolidColorBrush x:Key="SemiColorSuccessPointerover" Color="{StaticResource SemiGreen6Color}" />
    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="{StaticResource SemiGreen7Color}" />
-    <SolidColorBrush x:Key="SemiColorSuccessActive" Color="{StaticResource SemiGreen7Color}" />
    <SolidColorBrush x:Key="SemiColorSuccessDisabled" Color="{StaticResource SemiGreen2Color}" />
    <SolidColorBrush x:Key="SemiColorSuccessLight" Opacity="0.2" Color="{StaticResource SemiGreen5Color}" />
    <SolidColorBrush x:Key="SemiColorSuccessLightPointerover" Opacity="0.3" Color="{StaticResource SemiGreen5Color}" />
@@ -375,7 +366,6 @@
    <SolidColorBrush x:Key="SemiColorWarning" Color="{StaticResource SemiOrange5Color}" />
    <SolidColorBrush x:Key="SemiColorWarningPointerover" Color="{StaticResource SemiOrange6Color}" />
    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="{StaticResource SemiOrange7Color}" />
-    <SolidColorBrush x:Key="SemiColorWarningActive" Color="{StaticResource SemiOrange7Color}" />
    <SolidColorBrush x:Key="SemiColorWarningLight" Opacity="0.2" Color="{StaticResource SemiOrange5Color}" />
    <SolidColorBrush x:Key="SemiColorWarningLightPointerover" Opacity="0.3" Color="{StaticResource SemiOrange5Color}" />
    <SolidColorBrush x:Key="SemiColorWarningLightActive" Opacity="0.4" Color="{StaticResource SemiOrange5Color}" />
@@ -383,7 +373,6 @@
    <SolidColorBrush x:Key="SemiColorDanger" Color="{StaticResource SemiRed5Color}" />
    <SolidColorBrush x:Key="SemiColorDangerPointerover" Color="{StaticResource SemiRed6Color}" />
    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="{StaticResource SemiRed7Color}" />
-    <SolidColorBrush x:Key="SemiColorDangerActive" Color="{StaticResource SemiRed7Color}" />
    <SolidColorBrush x:Key="SemiColorDangerLight" Opacity="0.2" Color="{StaticResource SemiRed5Color}" />
    <SolidColorBrush x:Key="SemiColorDangerLightPointerover" Opacity="0.3" Color="{StaticResource SemiRed5Color}" />
    <SolidColorBrush x:Key="SemiColorDangerLightActive" Opacity="0.4" Color="{StaticResource SemiRed5Color}" />
@@ -401,11 +390,11 @@
    <SolidColorBrush x:Key="SemiColorLinkVisited" Color="{StaticResource SemiBlue5Color}" />

    <!--  Background  -->
-    <SolidColorBrush x:Key="SemiColorBackground0" Color="{StaticResource SemiBackground0Color}" />
-    <SolidColorBrush x:Key="SemiColorBackground1" Color="{StaticResource SemiBackground1Color}" />
-    <SolidColorBrush x:Key="SemiColorBackground2" Color="{StaticResource SemiBackground2Color}" />
-    <SolidColorBrush x:Key="SemiColorBackground3" Color="{StaticResource SemiBackground3Color}" />
-    <SolidColorBrush x:Key="SemiColorBackground4" Color="{StaticResource SemiBackground4Color}" />
+    <SolidColorBrush x:Key="SemiColorBackground0" Color="#FF16161A" />
+    <SolidColorBrush x:Key="SemiColorBackground1" Color="#FF232429" />
+    <SolidColorBrush x:Key="SemiColorBackground2" Color="#FF35363C" />
+    <SolidColorBrush x:Key="SemiColorBackground3" Color="#FF43444A" />
+    <SolidColorBrush x:Key="SemiColorBackground4" Color="#FF4F5159" />

    <!--  Fill  -->
    <SolidColorBrush x:Key="SemiColorFill0" Opacity="0.12" Color="White" />
@@ -419,6 +408,6 @@
    <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
    <SolidColorBrush x:Key="SemiColorDisabledBorder" Color="{StaticResource SemiGrey1Color}" />
    <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="{StaticResource SemiGrey1Color}" />
-
    <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.04" Color="{StaticResource SemiGrey8Color}" />
+
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs
+++ b/src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs
@@ -1,9 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Semi.Avalonia.Dark;
-
-public class Palette: ResourceDictionary
-{
-
-}
--- a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
@@ -9,7 +9,5 @@
    <SolidColorBrush x:Key="ProgressBarTertiaryForeground" Color="#888D92" />
    <SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#5DC264" />
    <SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ProgressBarDangerForeground" Color="#FC725A" />
-    <!-- Error style is obsolete, use Danger instead -->
    <SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#FC725A" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="RefreshContainerIconForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RefreshContainerIconBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="RefreshVisualizerIconForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="RefreshVisualizerIconBackground" Color="Transparent" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
@@ -7,10 +7,10 @@
    <SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FFAE43" />
    <SolidColorBrush x:Key="TextBlockDangerForeground" Color="#FC725A" />
    <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBlockMarkBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBlockCodeBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.08" Color="White" />
+    <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBlockMarkBackground" Color="#053170" />
+    <SolidColorBrush x:Key="TextBlockCodeBackground" Opacity="0.1" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.2" Color="#E6E8EA" />

    <SolidColorBrush x:Key="TextBlockSelectionBackground" Opacity="0.2" Color="#54A9FF" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
@@ -2,6 +2,7 @@
    <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Opacity="0.12" Color="White" />
    <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.20" Color="White" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBorderBrush" Color="Transparent" />
    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Opacity="0.35" Color="#F9F9F9" />

@@ -9,7 +10,7 @@

    <SolidColorBrush x:Key="ToggleButtonDefaultPrimaryForeground" Color="#54A9FF" />
    <SolidColorBrush x:Key="ToggleButtonDefaultSecondaryForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultTertiaryForeground" Opacity="0.8" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultTertiaryForeground" Color="#888D92" />
    <SolidColorBrush x:Key="ToggleButtonDefaultSuccessForeground" Color="#5DC264" />
    <SolidColorBrush x:Key="ToggleButtonDefaultWarningForeground" Color="#FFAE43" />
    <SolidColorBrush x:Key="ToggleButtonDefaultDangerForeground" Color="#FC725A" />
@@ -36,7 +37,6 @@
    <SolidColorBrush x:Key="ToggleButtonDangerCheckedPressedBackground" Color="#FDBEAC" />

    <SolidColorBrush x:Key="ToggleButtonCheckedForeground" Color="White" />
-    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledBackground" Color="#2E3238" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBackground" Color="#053170" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBackground" Color="#003761" />
--- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
@@ -4,10 +4,12 @@
    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Opacity="0.20" Color="White" />
    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="Transparent" />

-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Opacity="0.16" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Opacity="0.09" Color="#F9F9F9" />

-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="#5DC264" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="#5FB346" />
    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointeroverBackground" Color="#7FD184" />
    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPressedBackground" Color="#A6E1A8" />
    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="#277731" />
+
+    <SolidColorBrush x:Key="ToggleSwitchIndicatorBorderBrush" Opacity="0.09" Color="#F9F9F9" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/_index.axaml
@@ -2,7 +2,6 @@
    <ResourceDictionary.MergedDictionaries>
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Palette.axaml" />
        <!--  Controls  -->
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/AdornerLayer.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Border.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Button.axaml" />
@@ -21,6 +20,7 @@
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Flyout.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/GridSplitter.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Label.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ListBox.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml" />
--- a/src/Semi.Avalonia/Themes/DarkTheme.axaml
+++ b/src/Semi.Avalonia/Themes/DarkTheme.axaml
@@ -8,7 +8,4 @@
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </Styles.Resources>
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
-    </Style>
 </Styles>
--- a/src/Semi.Avalonia/Themes/Index.axaml
+++ b/src/Semi.Avalonia/Themes/Index.axaml
@@ -2,8 +2,8 @@
    <Styles.Resources>
        <ResourceDictionary>
            <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" />
+                <MergeResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
+                <MergeResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
            </ResourceDictionary.ThemeDictionaries>
            <ResourceDictionary.MergedDictionaries>
                <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
@@ -13,7 +13,4 @@
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </Styles.Resources>
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
-    </Style>
 </Styles>
--- a/src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml
+++ b/src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml
@@ -1,3 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AdornerLayerBackground" Color="#1C1F23" />
-</ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Button.axaml
@@ -2,7 +2,7 @@
    <!--  Light  -->
    <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="#0077FA" />
    <SolidColorBrush x:Key="ButtonDefaultSecondaryForeground" Color="#0095EE" />
-    <SolidColorBrush x:Key="ButtonDefaultTertiaryForeground" Opacity="0.8" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ButtonDefaultTertiaryForeground" Color="#6B7075" />
    <SolidColorBrush x:Key="ButtonDefaultSuccessForeground" Color="#3BB346" />
    <SolidColorBrush x:Key="ButtonDefaultWarningForeground" Color="#FC8800" />
    <SolidColorBrush x:Key="ButtonDefaultDangerForeground" Color="#F93920" />
@@ -11,6 +11,7 @@
    <SolidColorBrush x:Key="ButtonDefaultBackground" Opacity="0.05" Color="#2E3238" />
    <SolidColorBrush x:Key="ButtonDefaultPointeroverBackground" Opacity="0.09" Color="#2E3238" />
    <SolidColorBrush x:Key="ButtonDefaultPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <SolidColorBrush x:Key="ButtonDefaultDisabledBackground" Color="#E6E8EA" />

    <SolidColorBrush x:Key="ButtonDefaultBorderBrush" Color="Transparent" />
    <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Color="Transparent" />
@@ -68,20 +69,8 @@
    <SolidColorBrush x:Key="ButtonSolidDangerBorderBrush" Color="#F93920" />
    <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBorderBrush" Color="#D52515" />
    <SolidColorBrush x:Key="ButtonSolidDangerPressedBorderBrush" Color="#B2140C" />
-
-    <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="#E6E8EA" />
    <!--  end Solid  -->
-
-    <!--  Outline -->
-    <SolidColorBrush x:Key="ButtonOutlineBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ButtonOutlineBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ButtonOutlinePointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonOutlinePressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonOutlineSuccessBorderBrush" Color="#3BB346" />
-    <SolidColorBrush x:Key="ButtonOutlineWarningBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="ButtonOutlineDangerBorderBrush" Color="#F93920" />
-    <!--  end Outline  -->
-
+    
    <SolidColorBrush x:Key="ButtonInputInnerForeground" Color="#6B7075" />
    <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="#555B61" />
    <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="#41464C" />
--- a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
@@ -11,7 +11,7 @@
    <SolidColorBrush x:Key="CheckBoxDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
    <SolidColorBrush x:Key="CheckBoxPointeroverBackground" Opacity="0.05" Color="#2E3238" />
    <SolidColorBrush x:Key="CheckBoxPointeroverBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="CheckBoxPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="CheckBoxPressedBackground" Color="#004FB3" />
    <SolidColorBrush x:Key="CheckBoxPressedBorderBrush" Color="#004FB3" />

    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBackground" Color="#0077FA" />
--- a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush Color="#1C1F23" x:Key="HyperlinkButtonForeground" />
+    <SolidColorBrush Color="Transparent" x:Key="HyperlinkButtonDefaultBackground" />
+    <SolidColorBrush Color="#0077FA" x:Key="HyperlinkButtonOverForeground" />
+    <SolidColorBrush
+        Color="#1C1F23"
+        Opacity="0.35"
+        x:Key="HyperlinkButtonDisabledForeground" />
+
+    <SolidColorBrush Color="#681DA8" x:Key="HyperlinkButtonVisitedForeground" />
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml
@@ -1,4 +1,4 @@
-<ResourceDictionary x:Class="Semi.Avalonia.Light.Palette" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <!--  Color Resources  -->
    <Color x:Key="SemiRed0Color">#FEF2ED</Color>
    <Color x:Key="SemiRed1Color">#FEDDD2</Color>
@@ -160,11 +160,6 @@
    <Color x:Key="SemiGrey7Color">#41464C</Color>
    <Color x:Key="SemiGrey8Color">#2E3238</Color>
    <Color x:Key="SemiGrey9Color">#1C1F23</Color>
-    <Color x:Key="SemiBackground0Color">White</Color>
-    <Color x:Key="SemiBackground1Color">White</Color>
-    <Color x:Key="SemiBackground2Color">White</Color>
-    <Color x:Key="SemiBackground3Color">White</Color>
-    <Color x:Key="SemiBackground4Color">White</Color>

    <SolidColorBrush x:Key="SemiRed0" Color="{StaticResource SemiRed0Color}" />
    <SolidColorBrush x:Key="SemiRed1" Color="{StaticResource SemiRed1Color}" />
@@ -331,7 +326,6 @@
    <SolidColorBrush x:Key="SemiColorPrimary" Color="{StaticResource SemiBlue5Color}" />
    <SolidColorBrush x:Key="SemiColorPrimaryPointerover" Color="{StaticResource SemiBlue6Color}" />
    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="{StaticResource SemiBlue7Color}" />
-    <SolidColorBrush x:Key="SemiColorPrimaryActive" Color="{StaticResource SemiBlue7Color}" />
    <SolidColorBrush x:Key="SemiColorPrimaryDisabled" Color="{StaticResource SemiBlue2Color}" />
    <SolidColorBrush x:Key="SemiColorPrimaryLight" Color="{StaticResource SemiBlue0Color}" />
    <SolidColorBrush x:Key="SemiColorPrimaryLightPointerover" Color="{StaticResource SemiBlue1Color}" />
@@ -340,7 +334,6 @@
    <SolidColorBrush x:Key="SemiColorSecondary" Color="{StaticResource SemiLightBlue5Color}" />
    <SolidColorBrush x:Key="SemiColorSecondaryPointerover" Color="{StaticResource SemiLightBlue6Color}" />
    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
-    <SolidColorBrush x:Key="SemiColorSecondaryActive" Color="{StaticResource SemiLightBlue7Color}" />
    <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="{StaticResource SemiLightBlue2Color}" />
    <SolidColorBrush x:Key="SemiColorSecondaryLight" Color="{StaticResource SemiLightBlue0Color}" />
    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Color="{StaticResource SemiLightBlue1Color}" />
@@ -349,7 +342,6 @@
    <SolidColorBrush x:Key="SemiColorTertiary" Color="{StaticResource SemiGrey5Color}" />
    <SolidColorBrush x:Key="SemiColorTertiaryPointerover" Color="{StaticResource SemiGrey6Color}" />
    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="{StaticResource SemiGrey7Color}" />
-    <SolidColorBrush x:Key="SemiColorTertiaryActive" Color="{StaticResource SemiGrey7Color}" />
    <SolidColorBrush x:Key="SemiColorTertiaryLight" Color="{StaticResource SemiGrey0Color}" />
    <SolidColorBrush x:Key="SemiColorTertiaryLightPointerover" Color="{StaticResource SemiGrey1Color}" />
    <SolidColorBrush x:Key="SemiColorTertiaryLightActive" Color="{StaticResource SemiGrey2Color}" />
@@ -357,7 +349,6 @@
    <SolidColorBrush x:Key="SemiColorInformation" Color="{StaticResource SemiBlue5Color}" />
    <SolidColorBrush x:Key="SemiColorInformationPointerover" Color="{StaticResource SemiBlue6Color}" />
    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="{StaticResource SemiBlue7Color}" />
-    <SolidColorBrush x:Key="SemiColorInformationActive" Color="{StaticResource SemiBlue7Color}" />
    <SolidColorBrush x:Key="SemiColorInformationDisabled" Color="{StaticResource SemiBlue2Color}" />
    <SolidColorBrush x:Key="SemiColorInformationLight" Color="{StaticResource SemiBlue0Color}" />
    <SolidColorBrush x:Key="SemiColorInformationLightPointerover" Color="{StaticResource SemiBlue1Color}" />
@@ -366,7 +357,6 @@
    <SolidColorBrush x:Key="SemiColorSuccess" Color="{StaticResource SemiGreen5Color}" />
    <SolidColorBrush x:Key="SemiColorSuccessPointerover" Color="{StaticResource SemiGreen6Color}" />
    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="{StaticResource SemiGreen7Color}" />
-    <SolidColorBrush x:Key="SemiColorSuccessActive" Color="{StaticResource SemiGreen7Color}" />
    <SolidColorBrush x:Key="SemiColorSuccessDisabled" Color="{StaticResource SemiGreen2Color}" />
    <SolidColorBrush x:Key="SemiColorSuccessLight" Color="{StaticResource SemiGreen0Color}" />
    <SolidColorBrush x:Key="SemiColorSuccessLightPointerover" Color="{StaticResource SemiGreen1Color}" />
@@ -375,7 +365,6 @@
    <SolidColorBrush x:Key="SemiColorWarning" Color="{StaticResource SemiOrange5Color}" />
    <SolidColorBrush x:Key="SemiColorWarningPointerover" Color="{StaticResource SemiOrange6Color}" />
    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="{StaticResource SemiOrange7Color}" />
-    <SolidColorBrush x:Key="SemiColorWarningActive" Color="{StaticResource SemiOrange7Color}" />
    <SolidColorBrush x:Key="SemiColorWarningLight" Color="{StaticResource SemiOrange0Color}" />
    <SolidColorBrush x:Key="SemiColorWarningLightPointerover" Color="{StaticResource SemiOrange1Color}" />
    <SolidColorBrush x:Key="SemiColorWarningLightActive" Color="{StaticResource SemiOrange2Color}" />
@@ -383,7 +372,6 @@
    <SolidColorBrush x:Key="SemiColorDanger" Color="{StaticResource SemiRed5Color}" />
    <SolidColorBrush x:Key="SemiColorDangerPointerover" Color="{StaticResource SemiRed6Color}" />
    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="{StaticResource SemiRed7Color}" />
-    <SolidColorBrush x:Key="SemiColorDangerActive" Color="{StaticResource SemiRed7Color}" />
    <SolidColorBrush x:Key="SemiColorDangerLight" Color="{StaticResource SemiRed0Color}" />
    <SolidColorBrush x:Key="SemiColorDangerLightPointerover" Color="{StaticResource SemiRed1Color}" />
    <SolidColorBrush x:Key="SemiColorDangerLightActive" Color="{StaticResource SemiRed2Color}" />
@@ -401,11 +389,11 @@
    <SolidColorBrush x:Key="SemiColorLinkVisited" Color="{StaticResource SemiBlue5Color}" />

    <!--  Background  -->
-    <SolidColorBrush x:Key="SemiColorBackground0" Color="{StaticResource SemiBackground0Color}" />
-    <SolidColorBrush x:Key="SemiColorBackground1" Color="{StaticResource SemiBackground1Color}" />
-    <SolidColorBrush x:Key="SemiColorBackground2" Color="{StaticResource SemiBackground2Color}" />
-    <SolidColorBrush x:Key="SemiColorBackground3" Color="{StaticResource SemiBackground3Color}" />
-    <SolidColorBrush x:Key="SemiColorBackground4" Color="{StaticResource SemiBackground4Color}" />
+    <SolidColorBrush x:Key="SemiColorBackground0" Color="White" />
+    <SolidColorBrush x:Key="SemiColorBackground1" Color="White" />
+    <SolidColorBrush x:Key="SemiColorBackground2" Color="White" />
+    <SolidColorBrush x:Key="SemiColorBackground3" Color="White" />
+    <SolidColorBrush x:Key="SemiColorBackground4" Color="White" />

    <!--  Fill  -->
    <SolidColorBrush x:Key="SemiColorFill0" Opacity="0.05" Color="{StaticResource SemiGrey8Color}" />
@@ -419,6 +407,5 @@
    <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
    <SolidColorBrush x:Key="SemiColorDisabledBorder" Color="{StaticResource SemiGrey1Color}" />
    <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="{StaticResource SemiGrey1Color}" />
-    <!-- Official Opacity=0.04 -->
    <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.02" Color="{StaticResource SemiGrey8Color}" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml.cs
+++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml.cs
@@ -1,9 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Semi.Avalonia.Light;
-
-public class Palette: ResourceDictionary
-{
-
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
rabbitism	3b3fbd1265	misc: Update package version.	2024-03-16 18:33:09 +08:00
Dong Bin	8b4a670be8	Merge pull request #315 from irihitech/rc/313-content-control-template Remove default implementation of ContentControl and UserControl	2024-03-15 23:14:09 +08:00
rabbitism	dad406e995	feat: remove usercontrol inheritance style.	2024-03-15 23:07:04 +08:00
Dong Bin	13e9364477	Merge pull request #317 from irihitech/rc/299-DataGridRow-background Fix DataGridRow background opacity in light theme.	2024-03-15 20:55:00 +08:00
Dong Bin	3018f17e6d	Merge pull request #318 from irihitech/rc/306-notification-position Add TopCenter and BottomCenter position	2024-03-15 18:10:39 +08:00
Zhang Dian	627aa65e1f	feat: add TopCenter and BottomCenter position.	2024-03-15 16:40:54 +08:00
Zhang Dian	b83525092c	fix: fix DataGridRow background opacity in light theme.	2024-03-15 16:19:25 +08:00
Zhang Dian	dd3c4bdbae	feat: remove default implementation of ContentControl and UserControl.	2024-03-15 15:35:39 +08:00
Zhang Dian	17fe50d40b	Merge pull request #314 from irihitech/doc Add Chinese readme.	2024-03-14 16:19:10 +08:00
rabbitism	27c4794c6c	fix typo.	2024-03-14 16:06:09 +08:00
rabbitism	a678a0f39d	doc: add ursa to readme.	2024-03-14 16:03:51 +08:00
rabbitism	33c56f87f8	doc: add Chinese doc.	2024-03-14 15:59:27 +08:00
Dong Bin	ffb1b9c0e8	Merge pull request #312 from irihitech/browser Update the latest template of Browser project	2024-03-13 16:17:36 +08:00
Zhang Dian	ef272815ea	fix: update the latest template of Browser project.	2024-03-12 17:16:23 +08:00
Dong Bin	d967583228	Merge pull request #311 from irihitech/rc/256-colorpicker Reapply "ColorPicker new theme."	2024-03-12 17:03:52 +08:00
rabbitism	ef36239161	feat: make text looks like text.	2024-03-12 17:03:07 +08:00
Zhang Dian	bb3966c36c	Reapply "ColorPicker new theme." This reverts commit `a521efd39a`.	2024-03-12 16:47:35 +08:00
Dong Bin	4b7674d7e2	Merge pull request #310 from irihitech/action/config Reset github action branches.	2024-03-12 16:21:36 +08:00
Zhang Dian	166490195f	misc: reset branches.	2024-03-12 15:34:41 +08:00
Zhang Dian	3d267139fe	Merge pull request #309 from irihitech/rc/11.1 Upgrade Avalonia dependency to 11.1.0-beta1	2024-03-12 15:00:28 +08:00
Zhang Dian	ede0f9f3db	misc: delete useless config.	2024-03-12 14:58:51 +08:00
rabbitism	f140a331d7	feat: upgrade dependency to 11.1.0-beta1.	2024-03-12 12:07:07 +08:00
rabbitism	ca8f8d6c15	fix: fix watermark in ime mode. (cherry picked from commit `38cbc6da94`)	2024-03-08 10:37:41 +08:00
Dong Bin	3fce633195	Merge pull request #304 from irihitech/dev/thom/hyperlinkBtn adding hyperlink button into semi	2024-03-06 19:39:20 +08:00
rabbitism	30a7466fc9	fix: fix color in dark mode.	2024-03-06 19:36:12 +08:00
qile.wang	7fa99ed910	fix	2024-03-06 19:25:59 +08:00
qile.wang	801fea8269	fix template	2024-03-06 19:21:48 +08:00
Zhang Dian	fb0b4a08ac	feat: change all PathGeometry to StreamGeometry. (cherry picked from commit `5f72ed4a49`)	2024-03-01 22:10:38 +08:00
qile.wang	8dee3ec364	change to StreamGeometry	2024-03-01 21:00:17 +08:00
qile.wang	0ddcb39302	fix var names and comp	2024-03-01 20:53:55 +08:00
Dong Bin	833ccadb58	Merge pull request #303 from irihitech/rc/297-refresh-container Implement RefreshContainer	2024-02-29 12:52:03 +08:00
Zhang Dian	d33f38ea70	misc: delete useless PathGeometry.	2024-02-29 12:16:53 +08:00
qile.wang	386a3d297c	roughly comp	2024-02-28 15:51:30 +08:00
qile.wang	d19cc9d7b9	push changes	2024-02-28 15:21:48 +08:00
Zhang Dian	30081a1717	fix: icon shaking.	2024-02-28 14:47:56 +08:00
Zhang Dian	0d68df3711	misc: rename resources.	2024-02-24 18:11:28 +08:00
Zhang Dian	157d22a8f9	feat: implement RefreshContainer.	2024-02-24 16:49:31 +08:00
Dong Bin	4efc6bf4ec	Merge pull request #302 from irihitech/rc/298-inner-content Add InnerContent to AutoCompleteBox and NumericUpDown	2024-02-23 20:08:55 +08:00
Zhang Dian	3a83c67c6c	feat: add InnerContent to AutoCompleteBox and NumericUpDown.	2024-02-23 17:56:27 +08:00