Merge branch 'main' into release

11.0 release

.github/workflows/Pack.yml

@@ -2,16 +2,16 @@ name: Pack
 
 on:
   push:
-    branches: [ "action/pack" ]
+    branches: [ "release" ]
   pull_request:
-    branches: [ "action/pack" ]
+    branches: [ "release" ]
 
 jobs:
   nuget_desktop:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3
 
       - name: Nuget Semi.Avalonia
         run: dotnet pack ./src/Semi.Avalonia -o ./nugets
@@ -28,8 +28,8 @@ jobs:
       - name: Desktop
         run: dotnet publish ./demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true --self-contained true
 
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.3.1
+      - name: Upload
+        uses: actions/upload-artifact@v3.1.2
         with:
           name: nuget_desktop
           path: |
@@ -40,7 +40,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3
 
       - name: CD Android
         run: cd ./demo/Semi.Avalonia.Demo.Android
@@ -49,10 +49,10 @@ 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
+        uses: actions/upload-artifact@v3.1.2
         with:
           name: android
           path: ./**/publish/*Signed.apk

.github/workflows/deploy.yml

@@ -1,44 +1,50 @@
 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
+    PROJECT_PATH: demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
+    OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Debug/net7.0/browser-wasm/AppBundle
 on:
   push:
-    branches: [ "action/deploy" ]
+    branches: [ "deploy" ]
   pull_request:
-    branches: [ "action/deploy" ]
+    branches: [ "deploy" ]
 
 jobs:
   deploy-to-github-pages:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v2
 
-      - name: Setup .NET 8
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 8.0.x
+    - name: Setup .NET Core SDK
+      uses: actions/setup-dotnet@v1.9.0
 
-      - name: Install wasm-tools
-        run: dotnet workload install wasm-tools
+    - name: Install wasm-tools
+      run: dotnet workload install wasm-tools wasm-experimental
 
-      - name: Publish .NET Project
-        run: dotnet publish $PROJECT_PATH -c Release --nologo
+    - name: Install DotNetCompress
+      run: dotnet tool install --global DotNetCompress --version 2.0.0 --no-cache
 
-      - name: Change base-tag in index.html
-        run: sed -i 's/<base href="\/" \/>/<base href="\/Semi.Avalonia\/" \/>/g' $OUTPUT_PATH/index.html
+    - name: Publish .NET Project
+      run: dotnet publish $PROJECT_PATH -c Debug -o debug --nologo
 
-      - name: copy index.html to 404.html
-        run: cp $OUTPUT_PATH/index.html $OUTPUT_PATH/404.html
+    - name: Change base-tag in index.html
+      run: sed -i 's/<base href="\/" \/>/<base href="\/Semi.Avalonia\/" \/>/g' $OUTPUT_PATH/index.html
 
-      - name: Add .nojekyll file
-        run: touch $OUTPUT_PATH/.nojekyll
+    - name: copy index.html to 404.html
+      run: cp $OUTPUT_PATH/index.html $OUTPUT_PATH/404.html
 
-      - name: Commit wwwroot to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.5.0
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: ${{ env.OUTPUT_PATH }}
+    - 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
+
+    - name: Commit wwwroot to GitHub Pages
+      uses: JamesIves/github-pages-deploy-action@4.1.7
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        BRANCH: gh-pages
+        FOLDER: ${{ env.OUTPUT_PATH }}

.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>

README.md

@@ -9,7 +9,7 @@ Avalonia Theme inspired by Semi Design
 
 ## Installation
 ```bash
-dotnet add package Semi.Avalonia
+dotnet add package Semi.Avalonia --version 11.0.1
 ```
 Include Semi Design Styles in application:
 
@@ -23,9 +23,9 @@ 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.1
+dotnet add package Semi.Avalonia.DataGrid --version 11.0.1
+dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.1
 ```
 ```xaml
 <Application.Styles>
@@ -44,8 +44,7 @@ https://github.com/irihitech/Semi.Avalonia/releases
 
 | Semi Design Version | Avalonia Version |
 |:--------------------|:-----------------|
-| 11.0.7              | 11.0.7           |
-| 11.0.1              | <=11.0.6         |
+| 11.0.x              | 11.0.x           |
 
 ## TODO
 * FocusAdorner

demo/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.7</AvaloniaVersion>
+    <AvaloniaVersion>11.0.0</AvaloniaVersion>
   </PropertyGroup>
 </Project>

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>

demo/Semi.Avalonia.Demo.Desktop/Roots.xml

@@ -1,3 +0,0 @@
-<linker>
-    <assembly fullname="Semi.Avalonia.Demo" preserve="All"/>
-</linker>

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>

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>

demo/Semi.Avalonia.Demo.Drm/Program.cs

@@ -1,53 +1,59 @@
-using System;
-using System.Globalization;
+using Avalonia;
+using Avalonia.Dialogs;
+using Avalonia.Media;
+using System;
 using System.Linq;
 using System.Threading;
-using Avalonia;
 
-namespace Semi.Avalonia.Demo.Drm;
-
-class Program
+namespace Semi.Avalonia.Demo.Drm
 {
-    // Initialization code. Don't use any Avalonia, third-party APIs or any
-    // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
-    // yet and stuff might break.
-    [STAThread]
-    public static int Main(string[] args)
+    internal class Program
     {
-        var builder = BuildAvaloniaApp();
-
-        double GetScaling()
+        // Initialization code. Don't use any Avalonia, third-party APIs or any
+        // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
+        // yet and stuff might break.
+        [STAThread]
+        public static void Main(string[] args)
         {
-            var idx = Array.IndexOf(args, "--scaling");
-            if (idx != 0 && args.Length > idx + 1 &&
-                double.TryParse(args[idx + 1], NumberStyles.Any, CultureInfo.InvariantCulture, out var scaling))
-                return scaling;
-            return 1;
+            var builder = BuildAvaloniaApp();
+            builder.With(new FontManagerOptions
+            {
+                FontFallbacks = new[]
+                {
+                new FontFallback
+                {
+                    FontFamily = new FontFamily("Microsoft YaHei")
+                }
+            }
+            });
+            if (args.Contains("--drm"))
+            {
+                SilenceConsole();
+                builder.StartLinuxDrm(args: args, card: "/dev/dri/card0", scaling: 1);
+            }
+            else
+            {
+                builder.StartWithClassicDesktopLifetime(args);
+            }
         }
 
-        if (args.Contains("--drm"))
+        // Avalonia configuration, don't remove; also used by visual designer.
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .UseManagedSystemDialogs()
+                .UsePlatformDetect()
+                .With(new Win32PlatformOptions())
+                .LogToTrace();
+
+        private static void SilenceConsole()
         {
-            SilenceConsole();
-            return builder.StartLinuxDrm(args: args, card: "/dev/dri/card1", scaling: GetScaling());
-        }
-
-        return builder.StartWithClassicDesktopLifetime(args);
-    }
-
-    // Avalonia configuration, don't remove; also used by visual designer.
-    public static AppBuilder BuildAvaloniaApp()
-        => AppBuilder.Configure<App>()
-            .UsePlatformDetect()
-            .LogToTrace();
-
-    private static void SilenceConsole()
-    {
-        new Thread(() =>
+            new Thread(() =>
             {
                 Console.CursorVisible = false;
                 while (true)
                     Console.ReadKey(true);
             })
             { IsBackground = true }.Start();
+        }
     }
 }

demo/Semi.Avalonia.Demo.Drm/使用方法.md

@@ -1,23 +1,18 @@
 # DRM启动步骤
 
-(Ubuntu18.04Server版本 虚拟机测试OK)  
-(Orange Pi Zero2 Ubuntu20.04-arm64 测试OK)
+(Ubuntu18.04Server版本 虚拟机测试OK)
 
 Avalonia官方参考文档：https://docs.avaloniaui.net/docs/next/guides/platforms/rpi/running-on-raspbian-lite-via-drm
 
-1.Linux端运行命令  
-```
-sudo apt update  
-sudo apt upgrade  
-sudo reboot  
-sudo apt - get install libgbm1 libgl1 - mesa - dri libegl1 - mesa libinput10
-```
+1.Linux端运行命令
+ sudo apt update
+ sudo apt upgrade
+ sudo reboot
+ sudo apt - get install libgbm1 libgl1 - mesa - dri libegl1 - mesa libinput10
 
-2.安装测试工具测试(出现一个彩色立方体说明环境安装完成)  
-```
-sudo apt-get install kmscube
-sudo kmscube
-```
+2.安装测试工具测试(出现一个彩色立方体说明环境安装完成)
+ sudo apt-get install kmscube
+ sudo kmscube
 
 3.安装.net运行时(参考网址：https://learn.microsoft.com/zh-cn/dotnet/core/install/linux?WT.mc_id=dotnet-35129-website)
 
@@ -36,7 +31,7 @@ sudo kmscube
 >Unhandled exception. Avalonia.Markup.Xaml.XamlLoadException: No precompiled XAML found for avares://Semi.Avalonia/Themes/Light/Light.axaml (baseUri: avares://Semi.Avalonia/Themes/Index.axaml), make sure to specify x:Class and include your XAML file as AvaloniaResource
 
  解决方法：
->如果使用Semi发布文件不要裁剪，如果裁剪会报错
+    如果使用Semi发布文件不要裁剪，如果裁剪会报错
          
 
 2. 报错内容
@@ -46,32 +41,11 @@ sudo kmscube
     at SkiaSharp.SKImageInfo..cctor()
 
 解决方法：
->Linux命令行安装一下 apt-get install -y libfontconfig1  
-参考网址：https://github.com/mono/SkiaSharp/issues/509
+    Linux命令行安装一下 apt-get install -y libfontconfig1
+    参考网址：https://github.com/mono/SkiaSharp/issues/509
 
 3. 报错内容
 >Permission denied
 
-解决方法：  
->sudo chmod +x ./Semi.Avalonia.Demo.Drm
-
-4. 报错内容
->Unhandled exception. System.ComponentModel.Win32Exception (95): drmModeGetResources failed
-at Avalonia.LinuxFramebuffer.Output.DrmResources..ctor(Int32 fd, Boolean connectorsForceProbe) in /_/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs:line 91
-at Avalonia.LinuxFramebuffer.Output.DrmCard.GetResources(Boolean connectorsForceProbe) in /_/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs:line 171
-at Avalonia.LinuxFramebuffer.Output.DrmOutput..ctor(String path, Boolean connectorsForceProbe, DrmOutputOptions options) in /_/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs:line 60
-at LinuxFramebufferPlatformExtensions.StartLinuxDrm(AppBuilder builder, String[] args, String card, Double scaling, IInputBackend inputBackend) in /_/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs:line 166
-at Semi.Avalonia.Demo.Drm.Program.Main(String[] args)
-
 解决方法：
->`program.cs`的显卡路径错误，可能不是`dev/dri/card1`，看在`dev/dri`目录下有无其他的显卡如`card0`。
-
-5. 报错内容
->Unhandled exception. System.ComponentModel.Win32Exception (2): Couldn't open /dev/dri/card1
-at Avalonia.LinuxFramebuffer.Output.DrmCard..ctor(String ) in /_/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs:line 167
-at Avalonia.LinuxFramebuffer.Output.DrmOutput..ctor(String , Boolean , DrmOutputOptions ) in /_/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs:line 58
-at LinuxFramebufferPlatformExtensions.StartLinuxDrm(AppBuilder, String[], String , Double , IInputBackend ) in /_/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs:line 166
-at Semi.Avalonia.Demo.Drm.Program.Main(String[])
-
-解决办法：
->找不到显卡路径`dev/dri/card1`，可能是显卡挂载到别的文件夹下了，待解决。
+    sudo chmod +x ./Semi.Avalonia.Demo.Drm

demo/Semi.Avalonia.Demo.Web/AppBundle/index.html

@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <base href="/" />
     <link rel="modulepreload" href="./main.js" />
-    <link rel="modulepreload" href="./_framework/dotnet.js" />
-    <link rel="modulepreload" href="./_framework/avalonia.js" />
+    <link rel="modulepreload" href="./dotnet.js" />
+    <link rel="modulepreload" href="./avalonia.js" />
     <link rel="stylesheet" href="./app.css" />
 </head>
 

demo/Semi.Avalonia.Demo.Web/AppBundle/main.js

@@ -1,4 +1,4 @@
-import { dotnet } from './_framework/dotnet.js'
+import { dotnet } from './dotnet.js'
 
 const is_browser = typeof window != "undefined";
 if (!is_browser) throw new Error(`Expected to be running in a browser`);
@@ -10,4 +10,4 @@ const dotnetRuntime = await dotnet
 
 const config = dotnetRuntime.getConfig();
 
-await dotnetRuntime.runMain(config.mainAssemblyName, [window.location.search]);
+await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [window.location.search]);

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) } }
-        });
-}

demo/Semi.Avalonia.Demo.Web/Program.cs

@@ -7,10 +7,9 @@ using Avalonia.Browser;
 
 namespace Semi.Avalonia.Demo.Web;
 
-internal sealed partial class Program
+internal partial class Program
 {
-    private static Task Main(string[] args) => BuildAvaloniaApp()
-        .WithSourceHanSansCNFont()
+    private static async Task Main(string[] args) => await BuildAvaloniaApp()
         .StartBrowserAppAsync("out");
 
     public static AppBuilder BuildAvaloniaApp()

demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj

@@ -1,18 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk.WebAssembly">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
+        <TargetFramework>net7.0</TargetFramework>
+        <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+        <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0-browser</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-        <AvaloniaResource Include="Assets\**"/>
+        <WasmExtraFilesToDeploy Include="AppBundle\**" />
     </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>

demo/Semi.Avalonia.Demo/App.axaml

@@ -1,13 +1,9 @@
 <Application
     x:Class="Semi.Avalonia.Demo.App"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:semi="https://irihi.tech/semi">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Styles>
-        <!-- You can still reference in old way. 
         <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
-         -->
-        <semi:SemiTheme Locale="zh-CN"/>
         <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
         <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
     </Application.Styles>

demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml

@@ -5,7 +5,7 @@
     xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels"
     x:CompileBindings="True"
     x:DataType="viewModels:ColorItemViewModel">
-    <StreamGeometry x:Key="CopyIcon">M5 7C3.89543 7 3 7.89543 3 9V19C3 20.1046 3.89543 21 5 21H15C16.1046 21 17 20.1046 17 19V9C17 7.89543 16.1046 7 15 7H5Z,M7 4C7 2.89543 7.89543 2 9 2H20C21.1046 2 22 2.89543 22 4V15C22 16.1046 21.1046 17 20 17H19V8C19 6 18 5 16 5H7V4Z</StreamGeometry>
+    <PathGeometry x:Key="CopyIcon">M5 7C3.89543 7 3 7.89543 3 9V19C3 20.1046 3.89543 21 5 21H15C16.1046 21 17 20.1046 17 19V9C17 7.89543 16.1046 7 15 7H5Z,M7 4C7 2.89543 7.89543 2 9 2H20C21.1046 2 22 2.89543 22 4V15C22 16.1046 21.1046 17 20 17H19V8C19 6 18 5 16 5H7V4Z</PathGeometry>
     <ControlTheme x:Key="{x:Type controls:ColorDetailControl}" TargetType="controls:ColorDetailControl">
         <!--  Add Resources Here  -->
         <Setter Property="controls:ColorDetailControl.Template">

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>

demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml

@@ -9,7 +9,6 @@
     mc:Ignorable="d">
     <StackPanel HorizontalAlignment="Left" Spacing="20">
         <CalendarDatePicker />
-        <CalendarDatePicker Classes="ClearButton" Width="200" />
         <CalendarDatePicker Width="500" />
         <CalendarDatePicker Classes="Large" />
         <CalendarDatePicker Classes="Small" />

demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml

@@ -52,22 +52,5 @@
                 <TextBlock Text="Text 4" />
             </Border>
         </Carousel>
-        <Carousel Classes="Columnar Left" Theme="{DynamicResource FullCarousel}">
-            <Carousel.PageTransition>
-                <PageSlide Orientation="Horizontal" Duration="0.25" />
-            </Carousel.PageTransition>
-            <Border Background="#EAF5FF">
-                <TextBlock Text="Text 1" />
-            </Border>
-            <Border Background="#F9F9F9">
-                <TextBlock Text="Text 2" />
-            </Border>
-            <Border Background="#FFF8EA">
-                <TextBlock Text="Text 3" />
-            </Border>
-            <Border Background="#FEF2ED">
-                <TextBlock Text="Text 4" />
-            </Border>
-        </Carousel>
     </StackPanel>
 </UserControl>

demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml

@@ -15,13 +15,6 @@
             <ComboBoxItem>Mr. 17</ComboBoxItem>
             <ComboBoxItem>Cass</ComboBoxItem>
         </ComboBox>
-        <ComboBox Width="150" Classes="ClearButton">
-            <ComboBoxItem>Ding</ComboBoxItem>
-            <ComboBoxItem>Otter</ComboBoxItem>
-            <ComboBoxItem>Husky</ComboBoxItem>
-            <ComboBoxItem>Mr. 17</ComboBoxItem>
-            <ComboBoxItem>Cass</ComboBoxItem>
-        </ComboBox>
         <ComboBox Width="150" PlaceholderText="Please Select">
             <ComboBoxItem>Ding</ComboBoxItem>
             <ComboBoxItem>Otter</ComboBoxItem>

demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml

@@ -13,48 +13,43 @@
     mc:Ignorable="d">
     <TabControl>
         <TabItem Header="DataGrid">
-           <Grid RowDefinitions="Auto, *">
-               <ToggleSwitch Grid.Row="0" Content="Disable" Name="DisableToggle"></ToggleSwitch>
-               <DataGrid Grid.Row="1"
-                         Margin="8"
-                         CanUserReorderColumns="True"
-                         CanUserResizeColumns="True"
-                         CanUserSortColumns="True"
-                         HeadersVisibility="All"
-                         IsReadOnly="True"
-                         IsEnabled="{Binding #DisableToggle.IsChecked}"
-                         ItemsSource="{Binding GridData1}">
-                   <DataGrid.Columns>
-                       <DataGridTextColumn
-                           Width="6*"
-                           x:DataType="vm:Song"
-                           Binding="{Binding Title}"
-                           Header="Title" />
-                       <DataGridTextColumn
-                           Width="6*"
-                           x:DataType="vm:Song"
-                           Binding="{Binding Artist}"
-                           Header="Artist" />
-                       <DataGridTextColumn
-                           Width="6*"
-                           x:DataType="vm:Song"
-                           Binding="{Binding Album}"
-                           Header="Album" />
-                       <DataGridTemplateColumn Header="Duration" SortMemberPath="Duration">
-                           <DataGridTemplateColumn.CellTemplate>
-                               <DataTemplate>
-                                   <TextBlock
-                                       Margin="8,0,0,0"
-                                       VerticalAlignment="Center"
-                                       Text="{Binding Duration}" />
-                               </DataTemplate>
-                           </DataGridTemplateColumn.CellTemplate>
-                       </DataGridTemplateColumn>
-                   </DataGrid.Columns>
+            <DataGrid
+                Margin="8"
+                CanUserReorderColumns="True"
+                CanUserResizeColumns="True"
+                CanUserSortColumns="True"
+                HeadersVisibility="All"
+                IsReadOnly="True"
+                ItemsSource="{Binding GridData1}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn
+                        Width="6*"
+                        x:DataType="vm:Song"
+                        Binding="{Binding Title}"
+                        Header="Title" />
+                    <DataGridTextColumn
+                        Width="6*"
+                        x:DataType="vm:Song"
+                        Binding="{Binding Artist}"
+                        Header="Artist" />
+                    <DataGridTextColumn
+                        Width="6*"
+                        x:DataType="vm:Song"
+                        Binding="{Binding Album}"
+                        Header="Album" />
+                    <DataGridTemplateColumn Header="Duration" SortMemberPath="Duration">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock
+                                    Margin="8,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Text="{Binding Duration}" />
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                </DataGrid.Columns>
 
-               </DataGrid>
-               
-           </Grid>
+            </DataGrid>
         </TabItem>
         <TabItem Header="Grouping">
             <DataGrid
@@ -167,7 +162,6 @@
                     Grid.Row="2"
                     Margin="12,0,12,12"
                     HorizontalAlignment="Right"
-                    Command="{Binding AddCommand}"
                     Content="Add" />
             </Grid>
         </TabItem>

demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml

@@ -9,7 +9,6 @@
     mc:Ignorable="d">
     <StackPanel Spacing="20">
         <DatePicker />
-        <DatePicker Classes="ClearButton" />
         <DatePicker DayFormat="d (ddd)" YearVisible="False" />
         <DatePicker IsEnabled="False" />
         <DatePicker Classes="Large" />

demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml

@@ -6,32 +6,7 @@
              x:Class="Semi.Avalonia.Demo.Pages.HeaderedContentControlDemo">
     <ScrollViewer>
         <StackPanel HorizontalAlignment="Left" Spacing="20">
-            <TextBlock>Default Theme</TextBlock>
-            <WrapPanel ItemWidth="400">
-                <HeaderedContentControl
-                    Header="This is the text header!"
-                    BorderBrush="Gray"
-                    BorderThickness="1"
-                    CornerRadius="4">
-                    <TextBlock Text="Some content" />
-                </HeaderedContentControl>
-                <HeaderedContentControl Header="This is the image header!">
-                    <Image Source="/Assets/WORLD.png" />
-                </HeaderedContentControl>
-                <HeaderedContentControl>
-                    <HeaderedContentControl.Header>
-                        <Image Source="/Assets/WORLD.png" />
-                    </HeaderedContentControl.Header>
-                    <TextBlock Text="This is the content. But the header can also be non textual" />
-                </HeaderedContentControl>
-            </WrapPanel>
-            <TextBlock>GroupBox Theme</TextBlock>
-            <HeaderedContentControl
-                HorizontalAlignment="Left"
-                Theme="{DynamicResource GroupBox}"
-                Header="Semi Design"
-                Width="400"
-                Height="200">
+            <HeaderedContentControl Theme="{DynamicResource GroupBox}" Header="Semi Design" Width="400" Height="200">
                 <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。</TextBlock>
             </HeaderedContentControl>
         </StackPanel>

demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml

@@ -38,9 +38,9 @@
                             <TextBlock Grid.Row="3" Grid.Column="0">Secondary</TextBlock>
                             <TextBlock Grid.Row="4" Grid.Column="0">Tertiary</TextBlock>
                             <TextBlock Grid.Row="5" Grid.Column="0">Quaternary</TextBlock>
-                            <TextBlock Grid.Row="6" Grid.Column="0">Success</TextBlock>
-                            <TextBlock Grid.Row="7" Grid.Column="0">Warning</TextBlock>
-                            <TextBlock Grid.Row="8" Grid.Column="0">Danger</TextBlock>
+                            <TextBlock Grid.Row="6" Grid.Column="0">Warning</TextBlock>
+                            <TextBlock Grid.Row="7" Grid.Column="0">Danger</TextBlock>
+                            <TextBlock Grid.Row="8" Grid.Column="0">Success</TextBlock>
                             <TextBlock Grid.Row="9" Grid.Column="0">Mark</TextBlock>
                             <TextBlock Grid.Row="10" Grid.Column="0">Code</TextBlock>
                             <Label Grid.Row="2" Grid.Column="1">Text</Label>
@@ -65,21 +65,21 @@
                             <Label
                                 Grid.Row="6"
                                 Grid.Column="1"
-                                Classes="Success">
-                                Success
-                            </Label>
-                            <Label
-                                Grid.Row="7"
-                                Grid.Column="1"
                                 Classes="Warning">
                                 Warning
                             </Label>
                             <Label
-                                Grid.Row="8"
+                                Grid.Row="7"
                                 Grid.Column="1"
                                 Classes="Danger">
                                 Danger
                             </Label>
+                            <Label
+                                Grid.Row="8"
+                                Grid.Column="1"
+                                Classes="Success">
+                                Success
+                            </Label>
                             <Label
                                 Grid.Row="9"
                                 Grid.Column="1"

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>

demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml

@@ -8,7 +8,6 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <Button Click="InfoButton_OnClick" Content="Default" />
         <Button Click="InfoButton_OnClick" Content="Information" />
         <Button Click="InfoButton_OnClick" Content="Success" />
         <Button Click="InfoButton_OnClick" Content="Warning" />

demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml.cs

@@ -2,14 +2,17 @@ using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
+using Avalonia.Controls.Presenters;
 using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
+using Semi.Avalonia.Demo.Views;
 
 namespace Semi.Avalonia.Demo.Pages;
 
 public partial class NotificationDemo : UserControl
 {
     private WindowNotificationManager? _manager;
-
     public NotificationDemo()
     {
         InitializeComponent();
@@ -19,16 +22,14 @@ public partial class NotificationDemo : UserControl
     {
         base.OnAttachedToVisualTree(e);
         var topLevel = TopLevel.GetTopLevel(this);
-        _manager = new WindowNotificationManager(topLevel) { MaxItems = 3 };
+        _manager = new WindowNotificationManager(topLevel){ MaxItems = 3};
     }
 
     private void InfoButton_OnClick(object? sender, RoutedEventArgs e)
     {
-        if (sender is Button b && b.Content is string s)
+        if (sender is Button b && b.Content is string s && Enum.TryParse<NotificationType>(s, out NotificationType t))
         {
-            _manager?.Show(Enum.TryParse<NotificationType>(s, out NotificationType t)
-                ? new Notification(t.ToString(), "This is message", t)
-                : new Notification(s, "This is message"));
+            _manager?.Show(new Notification(t.ToString(), "This is message", t));
         }
     }
 }

demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs

@@ -13,7 +13,7 @@ public partial class Overview : UserControl
         InitializeComponent();
     }
 
-    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.0.7";
+    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.0.1";
 
     public string MainStyle { get; set; } = """
 <Application.Styles>
@@ -21,7 +21,7 @@ public partial class Overview : UserControl
 </Application.Styles>
 """;
 
-    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.0.7";
+    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.0.1";
 
     public string ColorPickerStyle { get; set; } = """
 <Application.Styles>
@@ -29,7 +29,7 @@ public partial class Overview : UserControl
 </Application.Styles>
 """;
 
-    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.0.7";
+    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.0.1";
 
     public string DataGridStyle { get; set; } = """
 <Application.Styles>
@@ -37,7 +37,7 @@ public partial class Overview : UserControl
 </Application.Styles>
 """;
 
-    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.7";
+    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.1";
 
     public string TreeDataGridStyle { get; set; } = """
 <Application.Styles>

demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml

@@ -1,22 +0,0 @@
-<UserControl
-    x:Class="Semi.Avalonia.Demo.Pages.PathIconDemo"
-    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"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <StackPanel HorizontalAlignment="Left" >
-        <TextBlock Text="Size"></TextBlock>
-        <Slider Name="width" Minimum="0" Maximum="100" Value="20" Width="300"></Slider>
-        <ToggleSwitch Name="active" Content="Active"></ToggleSwitch>
-        <PathIcon
-            Classes.Active="{Binding ElementName=active, Path=IsChecked}"
-            BorderBrush="{DynamicResource SemiRed6}"
-            Width="{Binding #width.Value}"
-            Height="{Binding #width.Value}"
-            Data="M12 3L2 12H5V20H19V12H22L12 3M13 18H11V16H13V18M13 14H11V8H13V14Z"
-            Foreground="{DynamicResource SemiBlue6}" />
-    </StackPanel>
-</UserControl>

demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml.cs

@@ -1,13 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class PathIconDemo : UserControl
-{
-    public PathIconDemo()
-    {
-        InitializeComponent();
-    }
-}

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"

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>

demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml

@@ -31,9 +31,9 @@
                     <SelectableTextBlock Grid.Row="3" Grid.Column="0">Secondary</SelectableTextBlock>
                     <SelectableTextBlock Grid.Row="4" Grid.Column="0">Tertiary</SelectableTextBlock>
                     <SelectableTextBlock Grid.Row="5" Grid.Column="0">Quaternary</SelectableTextBlock>
-                    <SelectableTextBlock Grid.Row="6" Grid.Column="0">Success</SelectableTextBlock>
-                    <SelectableTextBlock Grid.Row="7" Grid.Column="0">Warning</SelectableTextBlock>
-                    <SelectableTextBlock Grid.Row="8" Grid.Column="0">Danger</SelectableTextBlock>
+                    <SelectableTextBlock Grid.Row="6" Grid.Column="0">Warning</SelectableTextBlock>
+                    <SelectableTextBlock Grid.Row="7" Grid.Column="0">Danger</SelectableTextBlock>
+                    <SelectableTextBlock Grid.Row="8" Grid.Column="0">Success</SelectableTextBlock>
                     <SelectableTextBlock Grid.Row="9" Grid.Column="0">Mark</SelectableTextBlock>
                     <SelectableTextBlock Grid.Row="10" Grid.Column="0">Underline</SelectableTextBlock>
                     <SelectableTextBlock Grid.Row="11" Grid.Column="0">Delete</SelectableTextBlock>
@@ -60,21 +60,21 @@
                     <SelectableTextBlock
                         Grid.Row="6"
                         Grid.Column="1"
-                        Classes="Success">
-                        Success
-                    </SelectableTextBlock>
-                    <SelectableTextBlock
-                        Grid.Row="7"
-                        Grid.Column="1"
                         Classes="Warning">
                         Warning
                     </SelectableTextBlock>
                     <SelectableTextBlock
-                        Grid.Row="8"
+                        Grid.Row="7"
                         Grid.Column="1"
                         Classes="Danger">
                         Danger
                     </SelectableTextBlock>
+                    <SelectableTextBlock
+                        Grid.Row="8"
+                        Grid.Column="1"
+                        Classes="Success">
+                        Success
+                    </SelectableTextBlock>
                     <SelectableTextBlock
                         Grid.Row="9"
                         Grid.Column="1"

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>

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,
-    ];
 }

demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml

@@ -4,92 +4,63 @@
     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:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels;assembly=Semi.Avalonia.Demo"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    x:CompileBindings="True"
-    x:DataType="vm:TabControlDemoViewModel"
     mc:Ignorable="d">
-    <ScrollViewer>
-        <StackPanel Spacing="20">
-            <Border Theme="{StaticResource CardBorder}">
-                <TabControl TabStripPlacement="Top">
-                    <TabItem Content="Hello 1" Header="Tab 1" />
-                    <TabItem Content="Hello 2" Header="Tab 2" />
-                    <TabItem Content="Hello 3" Header="Tab 3" />
-                    <TabItem Content="中文内容" Header="中文中文" />
-                    <TabItem
-                        Content="Hello 4"
-                        Header="Tab 4"
-                        IsEnabled="False" />
-                </TabControl>
-            </Border>
-            <Border Theme="{StaticResource CardBorder}">
-                <TabControl TabStripPlacement="Left">
-                    <TabItem Content="Hello 1" Header="Tab 1" />
-                    <TabItem Content="Hello 2" Header="Tab 2" />
-                    <TabItem Content="Hello 3" Header="Tab 3" />
-                    <TabItem Content="中文内容" Header="中文中文" />
-                    <TabItem
-                        Content="Hello 4"
-                        Header="Tab 4"
-                        IsEnabled="False" />
-                </TabControl>
-            </Border>
-            <Border Theme="{StaticResource CardBorder}">
-                <TabControl TabStripPlacement="Right">
-                    <TabItem Content="Hello 1" Header="Tab 1" />
-                    <TabItem Content="Hello 2" Header="Tab 2" />
-                    <TabItem Content="Hello 3" Header="Tab 3" />
-                    <TabItem Content="中文内容" Header="中文中文" />
-                    <TabItem
-                        Content="Hello 4"
-                        Header="Tab 4"
-                        IsEnabled="False" />
-                </TabControl>
-            </Border>
-            <Border Theme="{StaticResource CardBorder}">
-                <TabControl TabStripPlacement="Bottom">
-                    <TabItem Content="Hello 1" Header="Tab 1" />
-                    <TabItem Content="Hello 2" Header="Tab 2" />
-                    <TabItem Content="Hello 3" Header="Tab 3" />
-                    <TabItem Content="中文内容" Header="中文中文" />
-                    <TabItem
-                        Content="Hello 4"
-                        Header="Tab 4"
-                        IsEnabled="False" />
-                </TabControl>
-            </Border>
-            <Border Theme="{StaticResource CardBorder}">
-                <TabStrip>
-                    <TabStripItem>Tab 1</TabStripItem>
-                    <TabStripItem>Tab 2</TabStripItem>
-                </TabStrip>
-            </Border>
-            <Border Height="300" Theme="{DynamicResource CardBorder}">
-                <TabControl
-                    ItemsSource="{Binding Items}"
-                    TabStripPlacement="Top"
-                    Theme="{DynamicResource ScrollTabControl}" />
-            </Border>
-            <Border Height="300" Theme="{DynamicResource CardBorder}">
-                <TabControl
-                    ItemsSource="{Binding Items}"
-                    TabStripPlacement="Left"
-                    Theme="{DynamicResource ScrollTabControl}" />
-            </Border>
-            <Border Height="300" Theme="{DynamicResource CardBorder}">
-                <TabControl
-                    ItemsSource="{Binding Items}"
-                    TabStripPlacement="Bottom"
-                    Theme="{DynamicResource ScrollTabControl}" />
-            </Border>
-            <Border Height="300" Theme="{DynamicResource CardBorder}">
-                <TabControl
-                    ItemsSource="{Binding Items}"
-                    TabStripPlacement="Right"
-                    Theme="{DynamicResource ScrollTabControl}" />
-            </Border>
-        </StackPanel>
-    </ScrollViewer>
+    <StackPanel Spacing="20">
+        <Border Theme="{StaticResource CardBorder}">
+            <TabControl TabStripPlacement="Top">
+                <TabItem Content="Hello 1" Header="Tab 1" />
+                <TabItem Content="Hello 2" Header="Tab 2" />
+                <TabItem Content="Hello 3" Header="Tab 3" />
+                <TabItem Content="中文内容" Header="中文中文" />
+                <TabItem
+                    Content="Hello 4"
+                    Header="Tab 4"
+                    IsEnabled="False" />
+            </TabControl>
+        </Border>
+        <Border Theme="{StaticResource CardBorder}">
+            <TabControl TabStripPlacement="Left">
+                <TabItem Content="Hello 1" Header="Tab 1" />
+                <TabItem Content="Hello 2" Header="Tab 2" />
+                <TabItem Content="Hello 3" Header="Tab 3" />
+                <TabItem Content="中文内容" Header="中文中文" />
+                <TabItem
+                    Content="Hello 4"
+                    Header="Tab 4"
+                    IsEnabled="False" />
+            </TabControl>
+        </Border>
+        <Border Theme="{StaticResource CardBorder}">
+            <TabControl TabStripPlacement="Right">
+                <TabItem Content="Hello 1" Header="Tab 1" />
+                <TabItem Content="Hello 2" Header="Tab 2" />
+                <TabItem Content="Hello 3" Header="Tab 3" />
+                <TabItem Content="中文内容" Header="中文中文" />
+                <TabItem
+                    Content="Hello 4"
+                    Header="Tab 4"
+                    IsEnabled="False" />
+            </TabControl>
+        </Border>
+        <Border Theme="{StaticResource CardBorder}">
+            <TabControl TabStripPlacement="Bottom">
+                <TabItem Content="Hello 1" Header="Tab 1" />
+                <TabItem Content="Hello 2" Header="Tab 2" />
+                <TabItem Content="Hello 3" Header="Tab 3" />
+                <TabItem Content="中文内容" Header="中文中文" />
+                <TabItem
+                    Content="Hello 4"
+                    Header="Tab 4"
+                    IsEnabled="False" />
+            </TabControl>
+        </Border>
+        <Border Theme="{StaticResource CardBorder}">
+            <TabStrip>
+                <TabStripItem>Tab 1</TabStripItem>
+                <TabStripItem>Tab 2</TabStripItem>
+            </TabStrip>
+        </Border>
+    </StackPanel>
 </UserControl>

demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml.cs

@@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Semi.Avalonia.Demo.ViewModels;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -10,6 +9,5 @@ public partial class TabControlDemo : UserControl
     public TabControlDemo()
     {
         InitializeComponent();
-        this.DataContext = new TabControlDemoViewModel();
     }
 }

demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml

@@ -31,9 +31,9 @@
                     <TextBlock Grid.Row="3" Grid.Column="0">Secondary</TextBlock>
                     <TextBlock Grid.Row="4" Grid.Column="0">Tertiary</TextBlock>
                     <TextBlock Grid.Row="5" Grid.Column="0">Quaternary</TextBlock>
-                    <TextBlock Grid.Row="6" Grid.Column="0">Success</TextBlock>
-                    <TextBlock Grid.Row="7" Grid.Column="0">Warning</TextBlock>
-                    <TextBlock Grid.Row="8" Grid.Column="0">Danger</TextBlock>
+                    <TextBlock Grid.Row="6" Grid.Column="0">Warning</TextBlock>
+                    <TextBlock Grid.Row="7" Grid.Column="0">Danger</TextBlock>
+                    <TextBlock Grid.Row="8" Grid.Column="0">Success</TextBlock>
                     <TextBlock Grid.Row="9" Grid.Column="0">Mark</TextBlock>
                     <TextBlock Grid.Row="10" Grid.Column="0">Underline</TextBlock>
                     <TextBlock Grid.Row="11" Grid.Column="0">Delete</TextBlock>
@@ -60,21 +60,21 @@
                     <TextBlock
                         Grid.Row="6"
                         Grid.Column="1"
-                        Classes="Success">
-                        Success
-                    </TextBlock>
-                    <TextBlock
-                        Grid.Row="7"
-                        Grid.Column="1"
                         Classes="Warning">
                         Warning
                     </TextBlock>
                     <TextBlock
-                        Grid.Row="8"
+                        Grid.Row="7"
                         Grid.Column="1"
                         Classes="Danger">
                         Danger
                     </TextBlock>
+                    <TextBlock
+                        Grid.Row="8"
+                        Grid.Column="1"
+                        Classes="Success">
+                        Success
+                    </TextBlock>
                     <TextBlock
                         Grid.Row="9"
                         Grid.Column="1"

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>

demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml

@@ -9,7 +9,6 @@
     mc:Ignorable="d">
     <StackPanel Spacing="20">
         <TimePicker />
-        <TimePicker Classes="ClearButton" />
         <TimePicker MinuteIncrement="15" />
         <TimePicker ClockIdentifier="24HourClock" />
         <TimePicker ClockIdentifier="12HourClock" IsEnabled="False" />

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>

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

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>

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>

demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml

@@ -36,9 +36,9 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Width" Value="1" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Border.Width" Value="1" />
+            <Setter Property="Border.VerticalAlignment" Value="Stretch" />
+            <Setter Property="Border.HorizontalAlignment" Value="Left" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs

@@ -4,7 +4,6 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Avalonia.Collections;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
 
 namespace Semi.Avalonia.Demo.ViewModels;
 
@@ -15,8 +14,6 @@ public class DataGridDemoViewModel: ObservableObject
     public DataGridCollectionView GridData2 { get; set; }
     
     public ObservableCollection<SongViewModel> GridData3 { get; set; }
-    
-    public RelayCommand AddCommand { get; set; }
 
     public DataGridDemoViewModel()
     {
@@ -31,12 +28,6 @@ public class DataGridDemoViewModel: ObservableObject
             CountOfComment = a.CountOfComment,
             IsSelected = false
         }));
-        AddCommand = new RelayCommand(Add);
-    }
-
-    private void Add()
-    {
-        GridData3.Add(new SongViewModel());
     }
 }
 
@@ -121,7 +112,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),
     };
 }

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"),

demo/Semi.Avalonia.Demo/ViewModels/TabControlDemoViewModel.cs

@@ -1,15 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public class TabControlDemoViewModel: ObservableObject
-{
-    public ObservableCollection<string> Items { get; set; }
-
-    public TabControlDemoViewModel()
-    {
-        Items = new ObservableCollection<string>(Enumerable.Range(1, 200).Select(a => "Tab " + a));
-    }
-}

demo/Semi.Avalonia.Demo/Views/MainView.axaml

@@ -144,9 +144,6 @@
             <TabItem Header="NumericUpDown">
                 <pages:NumericUpDownDemo />
             </TabItem>
-            <TabItem Header="PathIcon">
-                <pages:PathIconDemo/>
-            </TabItem>
             <TabItem Header="ProgressBar">
                 <pages:ProgressBarDemo />
             </TabItem>

demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj

@@ -8,15 +8,14 @@
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     </PropertyGroup>
 
-    <Import Project="../Directory.Build.props" />
-    
+
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia" Version="11.0.0" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
     </ItemGroup>
 

demo/global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0"
+        "version": "7.0"
     }
 }

global.json

@@ -1,7 +0,0 @@
-{
-  "sdk": {
-    "version": "8.0.0",
-    "rollForward": "latestMajor",
-    "allowPrerelease": true
-  }
-}

src/Package.props

@@ -1,19 +1,13 @@
 <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.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.7</AvaloniaVersion>
+        <AvaloniaVersion>11.0.0</AvaloniaVersion>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
-
-    <ItemGroup>
-        <None Include="irihi.png" Pack="true" PackagePath=""/>
-    </ItemGroup>
 </Project>

src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml

@@ -61,7 +61,7 @@
                         </Panel>
                     </DropDownButton.Content>
                     <DropDownButton.Flyout>
-                        <Flyout FlyoutPresenterClasses="nopadding" Placement="{DynamicResource ColorPickerFlyoutPlacement}">
+                        <Flyout FlyoutPresenterClasses="nopadding" Placement="AnchorAndGravity">
 
                             <!--
                                 The following is copy-pasted from the ColorView's control template.
@@ -238,30 +238,30 @@
                                                 </Style>
                                                 <Style Selector="Grid[Tag=Rgba]">
                                                     <Style Selector="^ NumericUpDown#Component1NumericUpDown">
-                                                        <Setter Property="Tag" Value="R" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="R" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component2NumericUpDown">
-                                                        <Setter Property="Tag" Value="G" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="G" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component3NumericUpDown">
-                                                        <Setter Property="Tag" Value="B" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="B" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#AlphaComponentNumericUpDown">
-                                                        <Setter Property="Tag" Value="A" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="A" />
                                                     </Style>
                                                 </Style>
                                                 <Style Selector="Grid[Tag=Hsva]">
                                                     <Style Selector="^ NumericUpDown#Component1NumericUpDown">
-                                                        <Setter Property="Tag" Value="H" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="H" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component2NumericUpDown">
-                                                        <Setter Property="Tag" Value="S" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="S" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component3NumericUpDown">
-                                                        <Setter Property="Tag" Value="V" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="V" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#AlphaComponentNumericUpDown">
-                                                        <Setter Property="Tag" Value="A" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="A" />
                                                     </Style>
                                                 </Style>
                                             </Grid.Styles>

src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml

@@ -54,7 +54,6 @@
                         AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                         HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                         IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                        IsDeferredScrollingEnabled="{TemplateBinding (ScrollViewer.IsDeferredScrollingEnabled)}"
                         VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                         <ItemsPresenter
                             Name="PART_ItemsPresenter"
@@ -138,21 +137,21 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:checked">
-            <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonCheckedBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ColorViewRadioButtonCheckedForeground}" />
+            <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonCheckedBackground}" />
+            <Setter Property="RadioButton.Foreground" Value="{DynamicResource ColorViewRadioButtonCheckedForeground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonCheckedPointeroverBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonCheckedPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonCheckedPressedBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonCheckedPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^:unchecked">
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonPointeroverBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonPressedBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonPressedBackground}" />
             </Style>
         </Style>
     </ControlTheme>
@@ -533,30 +532,30 @@
         </Setter>
         <Style Selector="^[ColorModel=Rgba]">
             <Style Selector="^ /template/ NumericUpDown#Component1NumericUpDown">
-                <Setter Property="Tag" Value="R" />
+                <Setter Property="NumericUpDown.Tag" Value="R" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component2NumericUpDown">
-                <Setter Property="Tag" Value="G" />
+                <Setter Property="NumericUpDown.Tag" Value="G" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component3NumericUpDown">
-                <Setter Property="Tag" Value="B" />
+                <Setter Property="NumericUpDown.Tag" Value="B" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#AlphaComponentNumericUpDown">
-                <Setter Property="Tag" Value="A" />
+                <Setter Property="NumericUpDown.Tag" Value="A" />
             </Style>
         </Style>
         <Style Selector="^[ColorModel=Hsva]">
             <Style Selector="^ /template/ NumericUpDown#Component1NumericUpDown">
-                <Setter Property="Tag" Value="H" />
+                <Setter Property="NumericUpDown.Tag" Value="H" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component2NumericUpDown">
-                <Setter Property="Tag" Value="S" />
+                <Setter Property="NumericUpDown.Tag" Value="S" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component3NumericUpDown">
-                <Setter Property="Tag" Value="V" />
+                <Setter Property="NumericUpDown.Tag" Value="V" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#AlphaComponentNumericUpDown">
-                <Setter Property="Tag" Value="A" />
+                <Setter Property="NumericUpDown.Tag" Value="A" />
             </Style>
         </Style>
     </ControlTheme>

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" />

src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj

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

src/Semi.Avalonia.ColorPicker/Shared.axaml

@@ -6,15 +6,15 @@
     <Thickness x:Key="ColorViewRadioButtonPadding">16 4</Thickness>
     <x:Double x:Key="ColorViewNumericUpDownWidth">70</x:Double>
 
-    <StreamGeometry x:Key="ColorViewSpectrumIconGlyph">
+    <PathGeometry x:Key="ColorViewSpectrumIconGlyph">
         M6.92,19L5,17.08L13.06,9L15,10.94M20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L13.84,6.41L11.91,4.5L10.5,5.91L11.92,7.33L3,16.25V21H7.75L16.67,12.08L18.09,13.5L19.5,12.09L17.58,10.17L20.7,7.05C21.1,6.65 21.1,6 20.71,5.63Z
-    </StreamGeometry>
-    <StreamGeometry x:Key="ColorViewPaletteIconGlyph">
+    </PathGeometry>
+    <PathGeometry x:Key="ColorViewPaletteIconGlyph">
         M17.5,12A1.5,1.5 0 0,1 16,10.5A1.5,1.5 0 0,1 17.5,9A1.5,1.5 0 0,1 19,10.5A1.5,1.5 0 0,1 17.5,12M14.5,8A1.5,1.5 0 0,1 13,6.5A1.5,1.5 0 0,1 14.5,5A1.5,1.5 0 0,1 16,6.5A1.5,1.5 0 0,1 14.5,8M9.5,8A1.5,1.5 0 0,1 8,6.5A1.5,1.5 0 0,1 9.5,5A1.5,1.5 0 0,1 11,6.5A1.5,1.5 0 0,1 9.5,8M6.5,12A1.5,1.5 0 0,1 5,10.5A1.5,1.5 0 0,1 6.5,9A1.5,1.5 0 0,1 8,10.5A1.5,1.5 0 0,1 6.5,12M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A1.5,1.5 0 0,0 13.5,19.5C13.5,19.11 13.35,18.76 13.11,18.5C12.88,18.23 12.73,17.88 12.73,17.5A1.5,1.5 0 0,1 14.23,16H16A5,5 0 0,0 21,11C21,6.58 16.97,3 12,3Z
-    </StreamGeometry>
-    <StreamGeometry x:Key="ColorViewComponentsIconGlyph">
+    </PathGeometry>
+    <PathGeometry x:Key="ColorViewComponentsIconGlyph">
         M4 6.5C5.10457 6.5 6 5.60457 6 4.5C6 3.39543 5.10457 2.5 4 2.5C2.89543 2.5 2 3.39543 2 4.5C2 5.60457 2.89543 6.5 4 6.5ZM9.5 3C8.67157 3 8 3.67157 8 4.5C8 5.32843 8.67157 6 9.5 6H20.5C21.3284 6 22 5.32843 22 4.5C22 3.67157 21.3284 3 20.5 3H9.5ZM8 11.5C8 10.6716 8.67157 10 9.5 10H20.5C21.3284 10 22 10.6716 22 11.5C22 12.3284 21.3284 13 20.5 13H9.5C8.67157 13 8 12.3284 8 11.5ZM8 18.5C8 17.6716 8.67157 17 9.5 17H20.5C21.3284 17 22 17.6716 22 18.5C22 19.3284 21.3284 20 20.5 20H9.5C8.67157 20 8 19.3284 8 18.5ZM6 11.5C6 12.6046 5.10457 13.5 4 13.5C2.89543 13.5 2 12.6046 2 11.5C2 10.3954 2.89543 9.5 4 9.5C5.10457 9.5 6 10.3954 6 11.5ZM4 20.5C5.10457 20.5 6 19.6046 6 18.5C6 17.3954 5.10457 16.5 4 16.5C2.89543 16.5 2 17.3954 2 18.5C2 19.6046 2.89543 20.5 4 20.5Z
-    </StreamGeometry>
+    </PathGeometry>
 
     <x:Double x:Key="ColorSliderWidth">16</x:Double>
     <CornerRadius x:Key="ColorSliderCornerRadius">6</CornerRadius>
@@ -27,6 +27,4 @@
     <CornerRadius x:Key="ColorPreviewerCornerRadius">3</CornerRadius>
 
     <colorPicker:SemiColorDarkPalette x:Key="SemiColorPalette" />
-    
-    <PlacementMode x:Key="ColorPickerFlyoutPlacement">AnchorAndGravity</PlacementMode>
 </ResourceDictionary>

src/Semi.Avalonia.DataGrid/Dark.axaml

@@ -26,5 +26,5 @@
 
     <SolidColorBrush x:Key="DataGridRowGroupHeaderCurrentBorderBrush" Opacity="0.08" Color="White" />
 
-    <SolidColorBrush x:Key="DataGridDisabledBackground" Color="#E6E8EA" Opacity="0.04" />
+    <SolidColorBrush x:Key="DataGridDisabledBackground" Color="#F9F9F9" />
 </ResourceDictionary>

src/Semi.Avalonia.DataGrid/DataGrid.axaml

@@ -19,7 +19,7 @@
             <Setter Property="MinHeight" Value="20" />
         </Style>
         <Style Selector="^:error:focus /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="Border.BorderBrush" Value="Transparent" />
         </Style>
         <Style Selector="^ /template/ DataValidationErrors">
             <Setter Property="Theme" Value="{DynamicResource TooltipDataValidationErrors}" />
@@ -292,7 +292,7 @@
                             Name="BackgroundBorder"
                             Grid.RowSpan="2"
                             Grid.ColumnSpan="2"
-                            Margin="{DynamicResource DataGridRowMargin}"
+                            Margin="2"
                             Background="{DynamicResource DataGridRowBackground}"
                             CornerRadius="3" />
                         <Rectangle
@@ -369,7 +369,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:checked /template/ PathIcon">
-            <Setter Property="RenderTransform" Value="rotate(90deg)" />
+            <Setter Property="PathIcon.RenderTransform" Value="rotate(90deg)" />
         </Style>
     </ControlTheme>
 
@@ -511,13 +511,9 @@
                             Grid.Row="1"
                             Grid.RowSpan="2"
                             Grid.Column="0"
-                            Grid.ColumnSpan="3"
-                            ScrollViewer.IsScrollInertiaEnabled="{TemplateBinding IsScrollInertiaEnabled}">
+                            Grid.ColumnSpan="3">
                             <DataGridRowsPresenter.GestureRecognizers>
-                                <ScrollGestureRecognizer
-                                    CanHorizontallyScroll="True"
-                                    CanVerticallyScroll="True"
-                                    IsScrollInertiaEnabled="{Binding (ScrollViewer.IsScrollInertiaEnabled), ElementName=PART_RowsPresenter}" />
+                                <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
                             </DataGridRowsPresenter.GestureRecognizers>
                         </DataGridRowsPresenter>
                         <Rectangle

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" />

src/Semi.Avalonia.DataGrid/Light.axaml

@@ -26,5 +26,5 @@
 
     <SolidColorBrush x:Key="DataGridRowGroupHeaderCurrentBorderBrush" Opacity="0.08" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="DataGridDisabledBackground" Color="#2E3238" Opacity="0.02" />
+    <SolidColorBrush x:Key="DataGridDisabledBackground" Color="#F9F9F9" />
 </ResourceDictionary>

src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj

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

src/Semi.Avalonia.DataGrid/Shared.axaml

@@ -8,13 +8,12 @@
     <Thickness x:Key="DataGridColumnHeaderPadding">12 0 0 0</Thickness>
     <x:Double x:Key="DataGridColumnHeaderMinHeight">32</x:Double>
 
-    <StreamGeometry x:Key="DataGridColumnHeaderAscendingGlyph">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="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>
+    <PathGeometry x:Key="DataGridColumnHeaderAscendingGlyph">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</PathGeometry>
+    <PathGeometry 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</PathGeometry>
 
     <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>
+    <PathGeometry 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</PathGeometry>
 
     <x:Double x:Key="DataGridRowGroupHeaderVisualStrokeThickness">1</x:Double>
 </ResourceDictionary>

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>

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>

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}" />
@@ -215,7 +216,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:checked /template/ PathIcon#ChevronPath">
-            <Setter Property="RenderTransform" Value="rotate(90deg)" />
+            <Setter Property="PathIcon.RenderTransform" Value="rotate(90deg)" />
         </Style>
     </ControlTheme>
 
@@ -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>

src/Semi.Avalonia/AssemblyInfo.cs

@@ -1,4 +0,0 @@
-using Avalonia.Metadata;
-
-[assembly:XmlnsPrefix("https://irihi.tech/semi", "semi")]
-[assembly:XmlnsDefinition("https://irihi.tech/semi", "Semi.Avalonia")]

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>

src/Semi.Avalonia/Controls/AutoCompleteBox.axaml

@@ -84,10 +84,10 @@
             </Setter>
         </Style>
         <Style Selector="^.Large /template/ TextBox">
-            <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
+            <Setter Property="TextBox.MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
         </Style>
         <Style Selector="^.Small /template/ TextBox">
-            <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxSmallHeight}" />
+            <Setter Property="TextBox.MinHeight" Value="{DynamicResource AutoCompleteBoxSmallHeight}" />
         </Style>
     </ControlTheme>
 

src/Semi.Avalonia/Controls/Border.axaml

@@ -29,10 +29,10 @@
         <Setter Property="Border.BorderThickness" Value="{DynamicResource ThicknessCardBorderThickness}" />
         <Setter Property="Border.Margin" Value="{DynamicResource ThicknessCardMargin}" />
         <Style Selector="^.Shadow">
-            <Setter Property="BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
+            <Setter Property="Border.BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
         </Style>
         <Style Selector="^.Hover:pointerover">
-            <Setter Property="BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
+            <Setter Property="Border.BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
         </Style>
 
     </ControlTheme>

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">
@@ -46,44 +46,45 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
+            <Setter Property="Button.Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
+            <Setter Property="Button.Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
 
@@ -96,127 +97,97 @@
         <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
 
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
         <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="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -227,33 +198,10 @@
         <Setter Property="Button.Background" Value="Transparent" />
         <Setter Property="Button.BorderBrush" Value="Transparent" />
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="Button.BorderBrush" Value="Transparent" />
+            <Setter Property="Button.Background" Value="Transparent" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
     </ControlTheme>
-
-    <ControlTheme x:Key="InnerIconButton" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="Button">
-                <ContentControl Background="Transparent">
-                    <PathIcon
-                        Width="16"
-                        Height="16"
-                        Margin="{TemplateBinding Padding}"
-                        Data="{TemplateBinding Content}"
-                        Foreground="{TemplateBinding Foreground}" />
-                </ContentControl>
-            </ControlTemplate>
-        </Setter>
-        <Style Selector="^:pointerover">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPointeroverForeground}" />
-        </Style>
-        <Style Selector="^:pressed">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPressedForeground}" />
-        </Style>
-    </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/ButtonSpinner.axaml

@@ -34,6 +34,7 @@
 
         <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Background" Value="{DynamicResource ButtonSpinnerRepeatButtonDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSpinnerRepeatButtonDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -41,6 +42,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 +50,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}"
@@ -95,7 +98,7 @@
         </Setter>
         <Style Selector="^[ButtonSpinnerLocation=Left] /template/ Border#ButtonGroup">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="Margin" Value="0 0 4 0" />
+            <Setter Property="Border.Margin" Value="0 0 4 0" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

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"
@@ -171,18 +170,18 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarButtonPointeroverBackground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarButtonPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarButtonPressedBackground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarButtonPressedBackground}" />
         </Style>
 
         <Style Selector="^:selected">
             <Style Selector="^ /template/ ContentControl">
-                <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarButtonSelectedBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarButtonSelectedForeground}" />
-                <Setter Property="FontWeight" Value="{DynamicResource CalendarItemCalendarButtonSelectedFontWeight}" />
+                <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarButtonSelectedBackground}" />
+                <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarButtonSelectedForeground}" />
+                <Setter Property="ContentControl.FontWeight" Value="{DynamicResource CalendarItemCalendarButtonSelectedFontWeight}" />
             </Style>
         </Style>
 
@@ -233,25 +232,25 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonPointeroverBackground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonPressedBackground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonPressedBackground}" />
         </Style>
 
         <Style Selector="^:today /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonTodayBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonTodayForeground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonTodayBackground}" />
+            <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonTodayForeground}" />
         </Style>
 
         <Style Selector="^:selected /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedForeground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedBackground}" />
+            <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedForeground}" />
         </Style>
 
         <Style Selector="^:inactive /template/ ContentControl">
-            <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonInactiveForeground}" />
+            <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonInactiveForeground}" />
         </Style>
 
         <Style Selector="^:blackout /template/ ContentControl">

src/Semi.Avalonia/Controls/CalendarDatePicker.axaml

@@ -3,13 +3,33 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <!--  Add Resources Here  -->
+    <ControlTheme x:Key="CalendarDatePickerButton" TargetType="Button">
+        <Setter Property="Button.Foreground" Value="{DynamicResource CalendarDatePickerIconForeground}" />
+        <Setter Property="Button.Template">
+            <ControlTemplate TargetType="Button">
+                <Grid Margin="{TemplateBinding Padding}" Background="Transparent">
+                    <PathIcon
+                        Width="16"
+                        Height="16"
+                        Data="{DynamicResource CalendarDatePickerIconGlyph}"
+                        Foreground="{TemplateBinding Foreground}" />
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pointerover /template/ PathIcon">
+            <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerIconPointeroverForeground}" />
+        </Style>
+        <Style Selector="^:pressed /template/ PathIcon">
+            <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerIconPointeroverForeground}" />
+        </Style>
+    </ControlTheme>
     <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
         <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThickness}" />
         <Setter Property="CornerRadius" Value="{DynamicResource CalendarDatePickerCornerRadius}" />
-        <Setter Property="IsTodayHighlighted" Value="True" />
+        <Setter Property="CalendarDatePicker.IsTodayHighlighted" Value="True" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
@@ -31,11 +51,10 @@
                             <Grid
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
-                                ColumnDefinitions="*, Auto, Auto">
+                                ColumnDefinitions="*,Auto">
                                 <TextBox
                                     Name="PART_TextBox"
                                     Grid.Column="0"
-                                    Grid.ColumnSpan="2"
                                     MinHeight="{DynamicResource CalendarDatePickerDefaultHeight}"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Center"
@@ -72,24 +91,14 @@
                                     </TextBox.Styles>
                                 </TextBox>
                                 <Button
-                                    Name="ClearButton"
+                                    Name="PART_Button"
                                     Grid.Column="1"
                                     Padding="0,0,8,0"
-                                    Content="{DynamicResource IconButtonClearData}"
-                                    Command="{Binding $parent[CalendarDatePicker].Clear}"
+                                    Cursor="Hand"
                                     Focusable="False"
-                                    IsVisible="False"
-                                    Theme="{DynamicResource InnerIconButton}" />
-                                <Button
-                                    Name="PART_Button"
-                                    Grid.Column="2"
-                                    Padding="0,0,8,0"
-                                    Content="{DynamicResource CalendarDatePickerIconGlyph}"
-                                    Focusable="False"
-                                    Theme="{DynamicResource InnerIconButton}" />
+                                    Theme="{DynamicResource CalendarDatePickerButton}" />
                                 <Popup
                                     Name="PART_Popup"
-                                    Grid.Column="0"
                                     HorizontalOffset="-8"
                                     IsLightDismissEnabled="True"
                                     PlacementTarget="{TemplateBinding}"
@@ -108,8 +117,8 @@
                                             DisplayDateStart="{TemplateBinding DisplayDateStart}"
                                             FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
                                             IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-                                            SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedDate, Mode=TwoWay}">
-                                        </Calendar>
+                                            SelectedDate="{TemplateBinding SelectedDate,
+                                                                           Mode=TwoWay}" />
                                     </Border>
                                 </Popup>
                             </Grid>
@@ -120,21 +129,15 @@
 
             </ControlTemplate>
         </Setter>
-        
-        <Style Selector="^.clearButton, ^.ClearButton">
-            <Style Selector="^:pointerover /template/ Button#ClearButton">
-                <Setter Property="IsVisible" Value="{Binding $parent[CalendarDatePicker].SelectedDate, Converter={x:Static ObjectConverters.IsNotNull}}"></Setter>
-            </Style>
-        </Style>
 
         <Style Selector="^.Large">
             <Style Selector="^ /template/ TextBox#PART_TextBox">
-                <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerInnerLargeHeight}" />
+                <Setter Property="TextBox.MinHeight" Value="{DynamicResource CalendarDatePickerInnerLargeHeight}" />
             </Style>
         </Style>
         <Style Selector="^.Small">
             <Style Selector="^ /template/ TextBox#PART_TextBox">
-                <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerInnerSmallHeight}" />
+                <Setter Property="TextBox.MinHeight" Value="{DynamicResource CalendarDatePickerInnerSmallHeight}" />
             </Style>
         </Style>
 
@@ -185,21 +188,21 @@
 
         <Style Selector="^.Bordered">
             <Style Selector="^ Border#Background">
-                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBorderedDefaultBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedDefaultBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource CalendarDatePickerBorderedDefaultBackground}" />
+                <Setter Property="Border.BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedDefaultBorderBrush}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#Background">
-                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
+                <Setter Property="Border.BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:focus-within /template/ Border#Background">
-                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
+                <Setter Property="Border.BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:disabled">
                 <Style Selector="^ /template/ Border#Background">
                     <Setter Property="Background" Value="{DynamicResource CalendarDatePickerDisabledBackground}" />
-                    <Setter Property="BorderBrush" Value="Transparent" />
+                    <Setter Property="Border.BorderBrush" Value="Transparent" />
                 </Style>
 
                 <Style Selector="^ /template/ Button#PART_Button">
@@ -212,16 +215,16 @@
                     <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
                 </Style>
                 <Style Selector="^:pointerover /template/ Border#Background">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
+                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
                 </Style>
                 <Style Selector="^:pressed /template/ Border#Background">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPressedBorderBrush}" />
+                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
+                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsPressedBorderBrush}" />
                 </Style>
                 <Style Selector="^:focus-within /template/ Border#Background">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
                 </Style>
             </Style>
         </Style>

src/Semi.Avalonia/Controls/Carousel.axaml

@@ -34,8 +34,8 @@
                     <Border Padding="4" Background="Transparent">
                         <Ellipse
                             Name="Container"
-                            Width="{DynamicResource CarouselIndicatorWidth}"
-                            Height="{DynamicResource CarouselIndicatorHeight}"
+                            Width="{DynamicResource CarouselIndicatorSelectedHeight}"
+                            Height="{DynamicResource CarouselIndicatorSelectedHeight}"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Fill="{TemplateBinding Foreground}" />
@@ -61,12 +61,18 @@
         <Setter Property="ListBoxItem.Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Panel Background="Transparent">
-                    <Border Padding="2,0" Background="Transparent">
+                    <Border Padding="4,0" Background="Transparent">
                         <Border
                             Name="Container"
-                            Width="{DynamicResource CarouselIndicatorLineWidth}"
-                            Height="{DynamicResource CarouselIndicatorLineHeight}"
-                            Background="{TemplateBinding Background}">
+                            Width="{DynamicResource CarouselIndicatorSelectedHeight}"
+                            Height="{DynamicResource CarouselIndicatorSelectedHeight}"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="99">
+                            <Border.Transitions>
+                                <Transitions>
+                                    <DoubleTransition Property="Width" Duration="0:0:0.2" />
+                                </Transitions>
+                            </Border.Transitions>
                         </Border>
                     </Border>
                 </Panel>
@@ -80,44 +86,7 @@
         </Style>
         <Style Selector="^:selected /template/ Border#Container">
             <Setter Property="Background" Value="{DynamicResource CarouselIndicatorSelectedForeground}" />
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme x:Key="CarouselIndicatorColumnarListBoxItem" TargetType="ListBoxItem">
-        <Setter Property="ListBoxItem.Cursor" Value="Hand" />
-        <Setter Property="ListBoxItem.Background" Value="{DynamicResource CarouselIndicatorForeground}" />
-        <Setter Property="ListBoxItem.Template">
-            <ControlTemplate TargetType="ListBoxItem">
-                <Panel Background="Transparent">
-                    <Border Padding="2,0" Background="Transparent">
-                        <Border Width="{DynamicResource CarouselIndicatorColumnarWidth}"
-                                Height="{DynamicResource CarouselIndicatorColumnarSelectedHeight}">
-                            <Rectangle
-                                Name="Container"
-                                Width="{DynamicResource CarouselIndicatorColumnarWidth}"
-                                Height="{DynamicResource CarouselIndicatorColumnarHeight}"
-                                VerticalAlignment="Bottom"
-                                Fill="{TemplateBinding Background}">
-                                <Rectangle.Transitions>
-                                    <Transitions>
-                                        <DoubleTransition Property="Height" Duration="0:0:0.2"></DoubleTransition>
-                                    </Transitions>
-                                </Rectangle.Transitions>
-                            </Rectangle>
-                        </Border>
-                    </Border>
-                </Panel>
-            </ControlTemplate>
-        </Setter>
-        <Style Selector="^:pointerover /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPointeroverForeground}" />
-        </Style>
-        <Style Selector="^:pressed /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPressedForeground}" />
-        </Style>
-        <Style Selector="^:selected /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorSelectedForeground}" />
-            <Setter Property="Height" Value="{DynamicResource CarouselIndicatorColumnarSelectedHeight}" />
+            <Setter Property="Width" Value="{DynamicResource CarouselIndicatorLineSelectedWidth}" />
         </Style>
     </ControlTheme>
 
@@ -167,7 +136,7 @@
                         Name="PART_ItemsPresenter2"
                         Grid.Row="1"
                         Grid.Column="1"
-                        MaxHeight="30"
+                        MaxHeight="20"
                         Margin="0,8"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
@@ -209,19 +178,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Line /template/ ListBox#PART_ItemsPresenter2">
-            <Setter Property="ItemContainerTheme" Value="{DynamicResource CarouselIndicatorLineListBoxItem}" />
-        </Style>
-        <Style Selector="^.Columnar /template/ ListBox#PART_ItemsPresenter2">
-            <Setter Property="ItemContainerTheme" Value="{DynamicResource CarouselIndicatorColumnarListBoxItem}" />
-        </Style>
-        <Style Selector="^.Left /template/ ListBox#PART_ItemsPresenter2">
-            <Setter Property="HorizontalAlignment" Value="Left" />
-        </Style>
-        <Style Selector="^.Center /template/ ListBox#PART_ItemsPresenter2">
-            <Setter Property="HorizontalAlignment" Value="Center" />
-        </Style>
-        <Style Selector="^.Right /template/ ListBox#PART_ItemsPresenter2">
-            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="ListBox.ItemContainerTheme" Value="{DynamicResource CarouselIndicatorLineListBoxItem}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

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>

src/Semi.Avalonia/Controls/ComboBox.axaml

@@ -33,7 +33,6 @@
         <Setter Property="MaxDropDownHeight" Value="504" />
         <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
@@ -44,11 +43,11 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="ComboBox">
                 <DataValidationErrors>
-                    <Grid ColumnDefinitions="*, Auto, 32">
+                    <Grid ColumnDefinitions="*,32">
                         <Border
                             x:Name="Background"
                             Grid.Column="0"
-                            Grid.ColumnSpan="3"
+                            Grid.ColumnSpan="2"
                             MinWidth="{DynamicResource ComboBoxThemeMinWidth}"
                             MinHeight="{DynamicResource ComboBoxDefaultHeight}"
                             Background="{TemplateBinding Background}"
@@ -61,7 +60,6 @@
                             Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            TextTrimming="CharacterEllipsis"
                             Foreground="{TemplateBinding Foreground}"
                             IsVisible="{TemplateBinding SelectionBoxItem,
                                                         Converter={x:Static ObjectConverters.IsNull}}"
@@ -75,16 +73,10 @@
                             VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding SelectionBoxItem}"
                             ContentTemplate="{TemplateBinding ItemTemplate}" />
-                        <Button
-                            Name="ClearButton"
-                            Grid.Column="1"
-                            Command="{Binding $parent[ComboBox].Clear}"
-                            Content="{DynamicResource IconButtonClearData}"
-                            IsVisible="False"
-                            Theme="{DynamicResource InnerIconButton}" />
+
                         <Border
                             x:Name="DropDownOverlay"
-                            Grid.Column="2"
+                            Grid.Column="1"
                             Width="30"
                             Margin="0,1,1,1"
                             HorizontalAlignment="Right"
@@ -93,7 +85,7 @@
 
                         <PathIcon
                             x:Name="DropDownGlyph"
-                            Grid.Column="2"
+                            Grid.Column="1"
                             Width="12"
                             Height="12"
                             Margin="0,0,10,0"
@@ -126,10 +118,7 @@
                                 BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
                                 ClipToBounds="True"
                                 CornerRadius="6">
-                                <ScrollViewer
-                                    HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                    IsDeferredScrollingEnabled="{TemplateBinding (ScrollViewer.IsDeferredScrollingEnabled)}"
-                                    VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                                <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                                     <ItemsPresenter
                                         Name="PART_ItemsPresenter"
                                         Margin="{DynamicResource ComboBoxDropdownContentMargin}"
@@ -142,17 +131,11 @@
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^.clearButton, ^.ClearButton">
-            <Style Selector="^:pointerover /template/ Button#ClearButton">
-                <Setter Property="IsVisible" Value="{Binding $parent[ComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}" />
-            </Style>
-        </Style>
-
         <Style Selector="^.Large /template/ Border#Background">
-            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
+            <Setter Property="ComboBox.MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
         </Style>
         <Style Selector="^.Small /template/ Border#Background">
-            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
+            <Setter Property="ComboBox.MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
         </Style>
 
         <!--  Pointerover State  -->
@@ -224,8 +207,8 @@
             </Style>
             <Style Selector="^:disabled">
                 <Style Selector="^ /template/ Border#Background">
-                    <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
+                    <Setter Property="Border.Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
+                    <Setter Property="Border.BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
                 </Style>
                 <Style Selector="^ /template/ ContentControl#ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource ComboBoxDisabledForeground}" />

src/Semi.Avalonia/Controls/DatePicker.axaml

@@ -135,17 +135,11 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="DatePicker">
                 <DataValidationErrors>
-                    <Grid
-                        Name="LayoutRoot"
-                        Margin="{TemplateBinding Padding}"
-                        ColumnDefinitions="*, Auto">
+                    <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}">
                         <Button
                             Name="PART_FlyoutButton"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
                             Width="298"
                             MinWidth="298"
-                            MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Background="{TemplateBinding Background}"
@@ -156,6 +150,7 @@
                             DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                             Foreground="{TemplateBinding Foreground}"
                             IsEnabled="{TemplateBinding IsEnabled}"
+                            MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}"
                             Theme="{StaticResource DateTimePickerFlyoutButton}">
                             <Grid ColumnDefinitions="*, Auto">
                                 <Grid
@@ -215,38 +210,21 @@
                                     Foreground="{DynamicResource DateTimePickerIconForeground}" />
                             </Grid>
                         </Button>
+
                         <Popup
                             Name="PART_Popup"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
                             IsLightDismissEnabled="True"
                             Placement="Bottom"
                             PlacementTarget="{TemplateBinding}"
                             WindowManagerAddShadowHint="False">
                             <DatePickerPresenter Name="PART_PickerPresenter" />
                         </Popup>
-                        <Button
-                            Name="ClearButton"
-                            Grid.Column="1"
-                            Margin="0,0,8,0"
-                            Command="{Binding $parent[DatePicker].Clear}"
-                            Content="{DynamicResource IconButtonClearData}"
-                            IsVisible="False"
-                            Theme="{DynamicResource InnerIconButton}" />
+
                     </Grid>
                 </DataValidationErrors>
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^.clearButton:pointerover, ^.ClearButton:pointerover">
-            <Style Selector="^:not(:hasnodate) /template/ Button#ClearButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-            <Style Selector="^:not(:hasnodate) /template/ PathIcon#PART_Icon">
-                <Setter Property="Opacity" Value="0" />
-            </Style>
-        </Style>
-
         <Style Selector="^:disabled /template/ PathIcon#PART_Icon">
             <Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonDisabledIconForeground}" />
         </Style>

src/Semi.Avalonia/Controls/DropDownButton.axaml

@@ -58,44 +58,45 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
+            <Setter Property="DropDownButton.Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
+            <Setter Property="DropDownButton.Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
 
@@ -154,118 +155,88 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
         <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="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -276,9 +247,9 @@
         <Setter Property="DropDownButton.Background" Value="Transparent" />
         <Setter Property="DropDownButton.BorderBrush" Value="Transparent" />
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="Transparent" />
+            <Setter Property="DropDownButton.Background" Value="Transparent" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/Expander.axaml

@@ -86,29 +86,29 @@
         </Setter>
 
         <Style Selector="^:expanded /template/ PathIcon#PART_PathIcon">
-            <Setter Property="RenderTransform" Value="rotate(180deg)" />
+            <Setter Property="PathIcon.RenderTransform" Value="rotate(180deg)" />
         </Style>
 
         <Style Selector="^:right">
             <Style Selector="^ /template/ LayoutTransformControl#ExpanderHeaderLayoutContainer">
-                <Setter Property="LayoutTransform">
+                <Setter Property="LayoutTransformControl.LayoutTransform">
                     <RotateTransform Angle="-90" />
                 </Setter>
                 <Setter Property="VerticalAlignment" Value="Stretch" />
             </Style>
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="Expander.HorizontalAlignment" Value="Left" />
+            <Setter Property="Expander.VerticalAlignment" Value="Stretch" />
         </Style>
 
         <Style Selector="^:left">
             <Style Selector="^ /template/ LayoutTransformControl#ExpanderHeaderLayoutContainer">
-                <Setter Property="LayoutTransform">
+                <Setter Property="LayoutTransformControl.LayoutTransform">
                     <RotateTransform Angle="90" />
                 </Setter>
                 <Setter Property="VerticalAlignment" Value="Stretch" />
             </Style>
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="Expander.HorizontalAlignment" Value="Stretch" />
+            <Setter Property="Expander.VerticalAlignment" Value="Stretch" />
         </Style>
 
         <Style Selector="^:left /template/ LayoutTransformControl#ExpanderHeaderLayoutContainer">
@@ -125,30 +125,30 @@
         </Style>
 
         <Style Selector="^:left /template/ Border#ExpanderContent">
-            <Setter Property="MinWidth" Value="2" />
-            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderLeftContentBorderThickness}" />
+            <Setter Property="Border.MinWidth" Value="2" />
+            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderLeftContentBorderThickness}" />
         </Style>
         <Style Selector="^:up /template/ Border#ExpanderContent">
-            <Setter Property="MinHeight" Value="2" />
-            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderUpContentBorderThickness}" />
+            <Setter Property="Border.MinHeight" Value="2" />
+            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderUpContentBorderThickness}" />
         </Style>
         <Style Selector="^:right /template/ Border#ExpanderContent">
-            <Setter Property="MinWidth" Value="2" />
-            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderRightContentBorderThickness}" />
+            <Setter Property="Border.MinWidth" Value="2" />
+            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderRightContentBorderThickness}" />
         </Style>
         <Style Selector="^:down /template/ Border#ExpanderContent">
-            <Setter Property="MinHeight" Value="2" />
-            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDownContentBorderThickness}" />
+            <Setter Property="Border.MinHeight" Value="2" />
+            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderDownContentBorderThickness}" />
         </Style>
 
         <Style Selector="^ /template/ ToggleButton#ExpanderHeader:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ExpanderHeaderHoverBackground}" />
+            <Setter Property="ToggleButton.Background" Value="{DynamicResource ExpanderHeaderHoverBackground}" />
         </Style>
         <Style Selector="^ /template/ ToggleButton#ExpanderHeader:pressed">
-            <Setter Property="Background" Value="{DynamicResource ExpanderHeaderPressedBackground}" />
+            <Setter Property="ToggleButton.Background" Value="{DynamicResource ExpanderHeaderPressedBackground}" />
         </Style>
         <Style Selector="^ /template/ ToggleButton#ExpanderHeader:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/HeaderedContentControl.axaml

@@ -2,47 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <ControlTheme x:Key="{x:Type HeaderedContentControl}" TargetType="HeaderedContentControl">
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    Background="{TemplateBinding Background}"
-                    Padding="{TemplateBinding Padding}">
-                    <Grid RowDefinitions="auto *">
-                        <ContentPresenter
-                            Name="PART_HeaderPresenter"
-                            Content="{TemplateBinding Header}"
-                            RecognizesAccessKey="True"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="{TemplateBinding FontWeight}"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontStyle="{TemplateBinding FontStyle}"
-                            Grid.Row="0" />
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            RecognizesAccessKey="True"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="{TemplateBinding FontWeight}"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontStyle="{TemplateBinding FontStyle}"
-                            Grid.Row="1" />
-                    </Grid>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
-
     <ControlTheme x:Key="GroupBox" TargetType="HeaderedContentControl">
         <Setter Property="Background" Value="{DynamicResource HeaderedContentControlDefaultBackground}" />
         <Setter Property="BorderThickness" Value="1" />

src/Semi.Avalonia/Controls/Label.axaml

@@ -100,38 +100,38 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
         </Style>
         <Style Selector="^.Quaternary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
-        </Style>
-        <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
+        </Style>
+        <Style Selector="^.Success">
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
         </Style>
         <Style Selector="^.Mark">
-            <Setter Property="Background" Value="{DynamicResource TextBlockMarkBackground}" />
+            <Setter Property="Label.Background" Value="{DynamicResource TextBlockMarkBackground}" />
         </Style>
         <Style Selector="^.Code">
-            <Setter Property="Background" Value="{DynamicResource TextBlockCodeBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockCodeForeground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource TextBlockCodeBorderBrush}" />
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="Padding" Value="2" />
-            <Setter Property="CornerRadius" Value="{DynamicResource TextBlockCodeCornerRadius}" />
-            <Setter Property="FontFamily" Value="{DynamicResource CodeFontFamily}" />
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockCodeFontSize}" />
+            <Setter Property="Label.Background" Value="{DynamicResource TextBlockCodeBackground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockCodeForeground}" />
+            <Setter Property="Label.BorderBrush" Value="{DynamicResource TextBlockCodeBorderBrush}" />
+            <Setter Property="Label.BorderThickness" Value="1" />
+            <Setter Property="Label.Padding" Value="2" />
+            <Setter Property="Label.CornerRadius" Value="{DynamicResource TextBlockCodeCornerRadius}" />
+            <Setter Property="Label.FontFamily" Value="{DynamicResource CodeFontFamily}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockCodeFontSize}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
         </Style>
     </ControlTheme>
     <ControlTheme
@@ -140,22 +140,22 @@
         TargetType="Label">
         <Setter Property="Label.FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
         <Style Selector="^.H1">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
         </Style>
         <Style Selector="^.H2">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
         </Style>
         <Style Selector="^.H3">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
         </Style>
         <Style Selector="^.H4">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
         </Style>
         <Style Selector="^.H5">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
         </Style>
         <Style Selector="^.H6">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
         </Style>
     </ControlTheme>
 
@@ -193,216 +193,216 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Large">
-            <Setter Property="Padding" Value="{DynamicResource LabelTagLargePadding}" />
-            <Setter Property="MinHeight" Value="{DynamicResource LabelTagLargeHeight}" />
+            <Setter Property="Label.Padding" Value="{DynamicResource LabelTagLargePadding}" />
+            <Setter Property="Label.MinHeight" Value="{DynamicResource LabelTagLargeHeight}" />
         </Style>
         <Style Selector="^.Circle">
-            <Setter Property="CornerRadius" Value="{DynamicResource LabelTagCircleCornerRadius}" />
+            <Setter Property="Label.CornerRadius" Value="{DynamicResource LabelTagCircleCornerRadius}" />
         </Style>
         <Style Selector="^">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
+            <Setter Property="Label.BorderBrush" Value="Transparent" />
+            <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
             <Style Selector="^.Red">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightRedBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightRedForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightRedBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightRedForeground}" />
             </Style>
             <Style Selector="^.Pink">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightPinkBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightPinkForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightPinkBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightPinkForeground}" />
             </Style>
             <Style Selector="^.Purple">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightPurpleBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightPurpleForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightPurpleBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightPurpleForeground}" />
             </Style>
             <Style Selector="^.Violet">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightVioletBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightVioletForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightVioletBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightVioletForeground}" />
             </Style>
             <Style Selector="^.Indigo">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightIndigoBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightIndigoForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightIndigoBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightIndigoForeground}" />
             </Style>
             <Style Selector="^.Blue">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightBlueBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightBlueForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightBlueBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightBlueForeground}" />
             </Style>
             <Style Selector="^.LightBlue">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightLightBlueBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightLightBlueForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLightBlueBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLightBlueForeground}" />
             </Style>
             <Style Selector="^.Cyan">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightCyanBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightCyanForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightCyanBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightCyanForeground}" />
             </Style>
             <Style Selector="^.Teal">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightTealBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightTealForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightTealBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightTealForeground}" />
             </Style>
             <Style Selector="^.Green">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightGreenBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreenForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreenBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreenForeground}" />
             </Style>
             <Style Selector="^.LightGreen">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightLightGreenBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightLightGreenForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLightGreenBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLightGreenForeground}" />
             </Style>
             <Style Selector="^.Lime">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightLimeBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightLimeForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLimeBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLimeForeground}" />
             </Style>
             <Style Selector="^.Yellow">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightYellowBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightYellowForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightYellowBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightYellowForeground}" />
             </Style>
             <Style Selector="^.Amber">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightAmberBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightAmberForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightAmberBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightAmberForeground}" />
             </Style>
             <Style Selector="^.Orange">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightOrangeBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightOrangeForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightOrangeBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightOrangeForeground}" />
             </Style>
             <Style Selector="^.Grey">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
             </Style>
             <Style Selector="^.White">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightWhiteBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightWhiteForeground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagLightWhiteBorderBrush}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightWhiteBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightWhiteForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagLightWhiteBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Ghost">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="BorderBrush" Value="{DynamicResource LabelTagLightGreyBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
+            <Setter Property="Label.Background" Value="Transparent" />
+            <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagLightGreyBackground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
             <Style Selector="^.Red">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostRedBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostRedForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostRedBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostRedForeground}" />
             </Style>
             <Style Selector="^.Pink">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostPinkBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostPinkForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostPinkBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostPinkForeground}" />
             </Style>
             <Style Selector="^.Purple">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostPurpleBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostPurpleForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostPurpleBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostPurpleForeground}" />
             </Style>
             <Style Selector="^.Violet">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostVioletBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostVioletForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostVioletBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostVioletForeground}" />
             </Style>
             <Style Selector="^.Indigo">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostIndigoBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostIndigoForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostIndigoBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostIndigoForeground}" />
             </Style>
             <Style Selector="^.Blue">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostBlueBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostBlueForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostBlueBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostBlueForeground}" />
             </Style>
             <Style Selector="^.LightBlue">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostLightBlueBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostLightBlueForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLightBlueBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLightBlueForeground}" />
             </Style>
             <Style Selector="^.Cyan">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostCyanBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostCyanForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostCyanBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostCyanForeground}" />
             </Style>
             <Style Selector="^.Teal">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostTealBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostTealForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostTealBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostTealForeground}" />
             </Style>
             <Style Selector="^.Green">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostGreenBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostGreenForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostGreenBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostGreenForeground}" />
             </Style>
             <Style Selector="^.LightGreen">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostLightGreenBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostLightGreenForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLightGreenBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLightGreenForeground}" />
             </Style>
             <Style Selector="^.Lime">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostLimeBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostLimeForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLimeBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLimeForeground}" />
             </Style>
             <Style Selector="^.Yellow">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostYellowBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostYellowForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostYellowBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostYellowForeground}" />
             </Style>
             <Style Selector="^.Amber">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostAmberBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostAmberForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostAmberBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostAmberForeground}" />
             </Style>
             <Style Selector="^.Orange">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostOrangeBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostOrangeForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostOrangeBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostOrangeForeground}" />
             </Style>
             <Style Selector="^.Grey">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostGreyBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostGreyForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostGreyBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostGreyForeground}" />
             </Style>
             <Style Selector="^.White">
-                <Setter Property="Background" Value="{DynamicResource LabelTagGhostWhiteBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostWhiteForeground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostWhiteBorderBrush}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagGhostWhiteBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostWhiteForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostWhiteBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Solid">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource LabelTagSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
+            <Setter Property="Label.BorderBrush" Value="Transparent" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagSolidForeground}" />
+            <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
             <Style Selector="^.Red">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidRedBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidRedBackground}" />
             </Style>
             <Style Selector="^.Pink">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidPinkBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidPinkBackground}" />
             </Style>
             <Style Selector="^.Purple">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidPurpleBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidPurpleBackground}" />
             </Style>
             <Style Selector="^.Violet">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidVioletBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidVioletBackground}" />
             </Style>
             <Style Selector="^.Indigo">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidIndigoBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidIndigoBackground}" />
             </Style>
             <Style Selector="^.Blue">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidBlueBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidBlueBackground}" />
             </Style>
             <Style Selector="^.LightBlue">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidLightBlueBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLightBlueBackground}" />
             </Style>
             <Style Selector="^.Cyan">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidCyanBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidCyanBackground}" />
             </Style>
             <Style Selector="^.Teal">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidTealBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidTealBackground}" />
             </Style>
             <Style Selector="^.Green">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidGreenBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreenBackground}" />
             </Style>
             <Style Selector="^.LightGreen">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidLightGreenBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLightGreenBackground}" />
             </Style>
             <Style Selector="^.Lime">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidLimeBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLimeBackground}" />
             </Style>
             <Style Selector="^.Yellow">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidYellowBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidYellowBackground}" />
             </Style>
             <Style Selector="^.Amber">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidAmberBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidAmberBackground}" />
             </Style>
             <Style Selector="^.Orange">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidOrangeBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidOrangeBackground}" />
             </Style>
             <Style Selector="^.Grey">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
             </Style>
             <Style Selector="^.White">
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagSolidWhiteForeground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagSolidWhiteBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidWhiteBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagSolidWhiteForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagSolidWhiteBorderBrush}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidWhiteBackground}" />
             </Style>
         </Style>
     </ControlTheme>

src/Semi.Avalonia/Controls/ListBox.axaml

@@ -30,8 +30,6 @@
                         AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                         HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                         IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                        IsDeferredScrollingEnabled="{TemplateBinding (ScrollViewer.IsDeferredScrollingEnabled)}"
-                        IsScrollInertiaEnabled="{TemplateBinding (ScrollViewer.IsScrollInertiaEnabled)}"
                         VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                         <ItemsPresenter
                             Name="PART_ItemsPresenter"
@@ -65,29 +63,29 @@
         </Setter>
 
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemDisabledForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ListBoxItemDisabledBackground}" />
+            <Setter Property="ListBoxItem.Foreground" Value="{DynamicResource ListBoxItemDisabledForeground}" />
+            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemDisabledBackground}" />
             <Style Selector="^:selected">
-                <Setter Property="Background"
+                <Setter Property="ListBoxItem.Background"
                         Value="{DynamicResource ListBoxItemSelectedDisabledBackground}" />
             </Style>
         </Style>
 
         <!--  Pointerover State  -->
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
+            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
         </Style>
 
         <!--  Pressed State  -->
         <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
+            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
         </Style>
 
         <!--  Selected State  -->
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
+            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background"
+                <Setter Property="ListBoxItem.Background"
                         Value="{DynamicResource ListBoxItemSelectedPointeroverBackground}" />
             </Style>
         </Style>
@@ -184,7 +182,7 @@
             <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDefaultBackground}" />
         </Style>
         <Style Selector="^ /template/ Ellipse#CheckGlyph">
-            <Setter Property="Opacity" Value="0" />
+            <Setter Property="Ellipse.Opacity" Value="0" />
         </Style>
 
         <!--  Unchecked Pointerover State  -->
@@ -195,7 +193,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPointeroverBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
         </Style>
 
@@ -206,7 +204,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPressedBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
         </Style>
 
@@ -217,7 +215,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDisabledBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Foreground" Value="{DynamicResource ListBoxItemRadioGroupDisabledForeground}" />
@@ -231,7 +229,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="1" />
+                <Setter Property="Ellipse.Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
@@ -243,7 +241,7 @@
                             Value="{DynamicResource ListBoxItemRadioGroupCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -255,7 +253,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -267,7 +265,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource ListBoxItemRadioGroupDisabledForeground}" />
@@ -314,30 +312,30 @@
         </Setter>
         <Setter Property="ListBoxItem.Background" Value="Transparent" />
         <Style Selector="^:pointerover">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonUncheckedPointeroverBackground}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Foreground"
+            <Setter Property="ListBoxItem.Foreground"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonUncheckedDisabledForeground}" />
         </Style>
         <Style Selector="^:selected">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonCheckedBackground}" />
-            <Setter Property="Foreground"
+            <Setter Property="ListBoxItem.Foreground"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonCheckedForeground}" />
             <Style Selector="^:disabled">
-                <Setter Property="Foreground"
+                <Setter Property="ListBoxItem.Foreground"
                         Value="{DynamicResource ListBoxItemRadioGroupButtonCheckedDisabledForeground}" />
             </Style>
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallFontSize}" />
-            <Setter Property="Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallPadding}" />
+            <Setter Property="ListBoxItem.FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallFontSize}" />
+            <Setter Property="ListBoxItem.Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallPadding}" />
         </Style>
         <Style Selector="^.Large">
-            <Setter Property="FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonLargeFontSize}" />
-            <Setter Property="Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonLargePadding}" />
+            <Setter Property="ListBoxItem.FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonLargeFontSize}" />
+            <Setter Property="ListBoxItem.Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonLargePadding}" />
         </Style>
     </ControlTheme>
 
@@ -414,31 +412,31 @@
             <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDefaultBackground}" />
         </Style>
         <Style Selector="^ /template/ Ellipse#CheckGlyph">
-            <Setter Property="Opacity" Value="0" />
+            <Setter Property="Ellipse.Opacity" Value="0" />
         </Style>
 
         <!--  Unchecked Pointerover State  -->
         <Style Selector="^:pointerover">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPointeroverBackground}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke"
                         Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
         </Style>
 
         <!--  Unchecked Pressed State  -->
         <Style Selector="^:pressed">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPressedBackground}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPressedBorderBrush}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
         </Style>
 
@@ -449,7 +447,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDisabledBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Foreground" Value="{DynamicResource ListBoxItemRadioGroupDisabledForeground}" />
@@ -458,21 +456,21 @@
 
         <!--  Checked State  -->
         <Style Selector="^:selected">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckedBackground}" />
-            <Setter Property="BorderBrush"
+            <Setter Property="ListBoxItem.BorderBrush"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckDefaultBorderBrush}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDefaultBorderBrush}" />
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="1" />
+                <Setter Property="Ellipse.Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
             <Style Selector="^:pointerover">
-                <Setter Property="BorderBrush"
+                <Setter Property="ListBoxItem.BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPointeroverBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke"
@@ -487,13 +485,13 @@
                             Value="{DynamicResource ListBoxItemRadioGroupCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
             <!--  Checked Pressed State  -->
             <Style Selector="^:pressed">
-                <Setter Property="BorderBrush"
+                <Setter Property="ListBoxItem.BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPressedBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke"
@@ -501,7 +499,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -513,7 +511,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ Border#RootBorder">
                     <Setter Property="BorderBrush"
@@ -562,11 +560,11 @@
         <Setter Property="ListBoxItem.BorderBrush"
                 Value="{DynamicResource ListBoxItemRadioGroupCardDefaultBorderBrush}" />
         <Style Selector="^:pointerover">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPointeroverBackground}" />
         </Style>
         <Style Selector="^:pressed">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPressedBackground}" />
         </Style>
         <Style Selector="^:disabled">
@@ -575,16 +573,16 @@
             </Style>
         </Style>
         <Style Selector="^:selected">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckedBackground}" />
-            <Setter Property="BorderBrush"
+            <Setter Property="ListBoxItem.BorderBrush"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckDefaultBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="BorderBrush"
+                <Setter Property="ListBoxItem.BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="BorderBrush"
+                <Setter Property="ListBoxItem.BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPressedBorderBrush}" />
             </Style>
             <Style Selector="^:disabled">

src/Semi.Avalonia/Controls/ManagedFileChooser.axaml

@@ -16,9 +16,9 @@
     </Design.PreviewWith>
 
     <converters:KeyToPathConverter x:Key="Icons">
-        <StreamGeometry x:Key="Icon_Folder">M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z</StreamGeometry>
-        <StreamGeometry x:Key="Icon_File">M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M15,18V16H6V18H15M18,14V12H6V14H18Z</StreamGeometry>
-        <StreamGeometry x:Key="Icon_Volume">M6,2H18A2,2 0 0,1 20,4V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2M12,4A6,6 0 0,0 6,10C6,13.31 8.69,16 12.1,16L11.22,13.77C10.95,13.29 11.11,12.68 11.59,12.4L12.45,11.9C12.93,11.63 13.54,11.79 13.82,12.27L15.74,14.69C17.12,13.59 18,11.9 18,10A6,6 0 0,0 12,4M12,9A1,1 0 0,1 13,10A1,1 0 0,1 12,11A1,1 0 0,1 11,10A1,1 0 0,1 12,9M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M12.09,13.27L14.58,19.58L17.17,18.08L12.95,12.77L12.09,13.27Z</StreamGeometry>
+        <PathGeometry x:Key="Icon_Folder">M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z</PathGeometry>
+        <PathGeometry x:Key="Icon_File">M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M15,18V16H6V18H15M18,14V12H6V14H18Z</PathGeometry>
+        <PathGeometry x:Key="Icon_Volume">M6,2H18A2,2 0 0,1 20,4V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2M12,4A6,6 0 0,0 6,10C6,13.31 8.69,16 12.1,16L11.22,13.77C10.95,13.29 11.11,12.68 11.59,12.4L12.45,11.9C12.93,11.63 13.54,11.79 13.82,12.27L15.74,14.69C17.12,13.59 18,11.9 18,10A6,6 0 0,0 12,4M12,9A1,1 0 0,1 13,10A1,1 0 0,1 12,11A1,1 0 0,1 11,10A1,1 0 0,1 12,9M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M12.09,13.27L14.58,19.58L17.17,18.08L12.95,12.77L12.09,13.27Z</PathGeometry>
     </converters:KeyToPathConverter>
     <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}" TargetType="dialogs:ManagedFileChooser">
         <Setter Property="dialogs:ManagedFileChooser.Template">
@@ -80,11 +80,11 @@
                             <TextBox
                                 IsVisible="{Binding !SelectingFolder}"
                                 Text="{Binding FileName}"
-                                Watermark="{DynamicResource STRING_CHOOSER_FILE_NAME}" />
+                                Watermark="File name" />
                         </DockPanel>
                         <CheckBox
                             VerticalAlignment="Center"
-                            Content="{DynamicResource STRING_CHOOSER_SHOW_HIDDEN_FILES}"
+                            Content="Show hidden files"
                             DockPanel.Dock="Left"
                             IsChecked="{Binding ShowHiddenFiles}" />
                         <UniformGrid
@@ -94,13 +94,15 @@
                             <Button
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Command="{Binding Ok}"
-                                Content="{DynamicResource STRING_CHOOSER_DIALOG_OK}" />
+                                Command="{Binding Ok}">
+                                OK
+                            </Button>
                             <Button
                                 Margin="8,0,0,0"
                                 Classes="Danger"
-                                Command="{Binding Cancel}"
-                                Content="{DynamicResource STRING_CHOOSER_DIALOG_CANCEL}" />
+                                Command="{Binding Cancel}">
+                                Cancel
+                            </Button>
                         </UniformGrid>
                     </DockPanel>
                     <Border
@@ -131,13 +133,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"

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"

src/Semi.Avalonia/Controls/NotificationCard.axaml

@@ -37,8 +37,8 @@
                                     Height="16"
                                     Margin="16,16,12,0"
                                     VerticalAlignment="Top"
-                                    IsVisible="False"
-                                    Data="{DynamicResource NotificationCardInformationIconPathData}"/>
+                                    Data="{DynamicResource InformationIconPathData}"
+                                    IsVisible="False" />
                                 <ContentControl
                                     Name="PART_Content"
                                     MinHeight="64"
@@ -134,24 +134,24 @@
         </Style>
 
         <Style Selector="^:information /template/ PathIcon#NotificationIcon">
-            <Setter Property="IsVisible" Value="True" />
-            <Setter Property="Foreground" Value="{DynamicResource NotificationCardInformationIconForeground}" />
-            <Setter Property="Data" Value="{DynamicResource NotificationCardInformationIconPathData}" />
+            <Setter Property="PathIcon.IsVisible" Value="True" />
+            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardInformationIconForeground}" />
+            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardInformationIconPathData}" />
         </Style>
         <Style Selector="^:success /template/ PathIcon#NotificationIcon">
-            <Setter Property="IsVisible" Value="True" />
-            <Setter Property="Foreground" Value="{DynamicResource NotificationCardSuccessIconForeground}" />
-            <Setter Property="Data" Value="{DynamicResource NotificationCardSuccessIconPathData}" />
+            <Setter Property="PathIcon.IsVisible" Value="True" />
+            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardSuccessIconForeground}" />
+            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardSuccessIconPathData}" />
         </Style>
         <Style Selector="^:warning /template/ PathIcon#NotificationIcon">
-            <Setter Property="IsVisible" Value="True" />
-            <Setter Property="Foreground" Value="{DynamicResource NotificationCardWarningIconForeground}" />
-            <Setter Property="Data" Value="{DynamicResource NotificationCardWarningIconPathData}" />
+            <Setter Property="PathIcon.IsVisible" Value="True" />
+            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardWarningIconForeground}" />
+            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardWarningIconPathData}" />
         </Style>
         <Style Selector="^:error /template/ PathIcon#NotificationIcon">
-            <Setter Property="IsVisible" Value="True" />
-            <Setter Property="Foreground" Value="{DynamicResource NotificationCardErrorIconForeground}" />
-            <Setter Property="Data" Value="{DynamicResource NotificationCardErrorIconPathData}" />
+            <Setter Property="PathIcon.IsVisible" Value="True" />
+            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardErrorIconForeground}" />
+            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardErrorIconPathData}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/PathIcon.axaml

@@ -11,7 +11,6 @@
                 <Border Background="{TemplateBinding Background}">
                     <Viewbox Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
                         <Path
-                            Name="PART_Path"
                             Data="{TemplateBinding Data}"
                             Fill="{TemplateBinding Foreground}"
                             Stretch="Uniform" />
@@ -19,8 +18,5 @@
                 </Border>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^.Active /template/ Path#PART_Path">
-            <Setter Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderBrush}"></Setter>
-        </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/ProgressBar.axaml

@@ -171,26 +171,22 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
+            <Setter Property="ProgressBar.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}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
         </Style>
         <Style Selector="^:horizontal /template/ Border#PART_Indicator">
             <Setter Property="HorizontalAlignment" Value="Left" />
@@ -297,46 +293,46 @@
             <Style Selector="^:horizontal /template/ LayoutTransformControl#PART_LayoutTransformControl">
                 <Setter Property="Grid.Column" Value="0" />
                 <Setter Property="Grid.Row" Value="1" />
-                <Setter Property="Margin" Value="4 0" />
+                <Setter Property="LayoutTransformControl.Margin" Value="4 0" />
             </Style>
             <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
                 <Setter Property="Grid.Column" Value="1" />
                 <Setter Property="Grid.Row" Value="0" />
-                <Setter Property="Margin" Value="0 4" />
+                <Setter Property="LayoutTransformControl.Margin" Value="0 4" />
             </Style>
             <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
-                <Setter Property="MinHeight" Value="4" />
-                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="Border.MinHeight" Value="4" />
+                <Setter Property="Border.VerticalAlignment" Value="Center" />
             </Style>
             <Style Selector="^:vertical /template/ Border#ProgressBarRoot">
-                <Setter Property="MinWidth" Value="4" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="Border.MinWidth" Value="4" />
+                <Setter Property="Border.HorizontalAlignment" Value="Center" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_ProgressText">
-                <Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+                <Setter Property="TextBlock.Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
             </Style>
         </Style>
         <Style Selector="^.Right">
             <Style Selector="^:horizontal /template/ LayoutTransformControl#PART_LayoutTransformControl">
                 <Setter Property="Grid.Column" Value="2" />
                 <Setter Property="Grid.Row" Value="1" />
-                <Setter Property="Margin" Value="4 0" />
+                <Setter Property="LayoutTransformControl.Margin" Value="4 0" />
             </Style>
             <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
                 <Setter Property="Grid.Column" Value="1" />
                 <Setter Property="Grid.Row" Value="2" />
-                <Setter Property="Margin" Value="0 4" />
+                <Setter Property="LayoutTransformControl.Margin" Value="0 4" />
             </Style>
             <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
-                <Setter Property="MinHeight" Value="4" />
-                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="Border.MinHeight" Value="4" />
+                <Setter Property="Border.VerticalAlignment" Value="Center" />
             </Style>
             <Style Selector="^:vertical /template/ Border#ProgressBarRoot">
-                <Setter Property="MinWidth" Value="4" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="Border.MinWidth" Value="4" />
+                <Setter Property="Border.HorizontalAlignment" Value="Center" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_ProgressText">
-                <Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+                <Setter Property="TextBlock.Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
             </Style>
         </Style>
     </ControlTheme>
@@ -401,26 +397,22 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
+            <Setter Property="ProgressBar.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}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
         </Style>
         <Style Selector="^:indeterminate /template/ Arc#Indicator">
             <Setter Property="Opacity" Value="0" />

src/Semi.Avalonia/Controls/RadioButton.axaml

@@ -83,7 +83,7 @@
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
 
             <!--  Unchecked Pointerover State  -->
@@ -93,7 +93,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
             </Style>
 
@@ -104,7 +104,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
             </Style>
 
@@ -115,7 +115,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
@@ -130,7 +130,7 @@
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="1" />
+                <Setter Property="Ellipse.Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
@@ -140,7 +140,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -151,7 +151,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -162,7 +162,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
@@ -201,28 +201,28 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:unchecked">
-            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="RadioButton.Background" Value="Transparent" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource RadioButtonButtonUncheckedPointeroverBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonButtonUncheckedPointeroverBackground}" />
             </Style>
             <Style Selector="^:disabled">
-                <Setter Property="Foreground" Value="{DynamicResource RadioButtonButtonUncheckedDisabledForeground}" />
+                <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonUncheckedDisabledForeground}" />
             </Style>
         </Style>
         <Style Selector="^:checked">
-            <Setter Property="Background" Value="{DynamicResource RadioButtonButtonCheckedBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource RadioButtonButtonCheckedForeground}" />
+            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonButtonCheckedBackground}" />
+            <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonCheckedForeground}" />
             <Style Selector="^:disabled">
-                <Setter Property="Foreground" Value="{DynamicResource RadioButtonButtonCheckedDisabledForeground}" />
+                <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonCheckedDisabledForeground}" />
             </Style>
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="FontSize" Value="{DynamicResource RadioButtonButtonSmallFontSize}" />
-            <Setter Property="Padding" Value="{DynamicResource RadioButtonButtonSmallPadding}" />
+            <Setter Property="RadioButton.FontSize" Value="{DynamicResource RadioButtonButtonSmallFontSize}" />
+            <Setter Property="RadioButton.Padding" Value="{DynamicResource RadioButtonButtonSmallPadding}" />
         </Style>
         <Style Selector="^.Large">
-            <Setter Property="FontSize" Value="{DynamicResource RadioButtonButtonLargeFontSize}" />
-            <Setter Property="Padding" Value="{DynamicResource RadioButtonButtonLargePadding}" />
+            <Setter Property="RadioButton.FontSize" Value="{DynamicResource RadioButtonButtonLargeFontSize}" />
+            <Setter Property="RadioButton.Padding" Value="{DynamicResource RadioButtonButtonLargePadding}" />
         </Style>
     </ControlTheme>
 
@@ -294,28 +294,28 @@
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
 
             <!--  Unchecked Pointerover State  -->
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPointeroverBorderBrush}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
             </Style>
 
             <!--  Unchecked Pressed State  -->
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPressedBorderBrush}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
             </Style>
 
@@ -326,7 +326,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
@@ -336,19 +336,19 @@
 
         <!--  Checked State  -->
         <Style Selector="^:checked">
-            <Setter Property="Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
+            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
+            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconDefaultBorderBrush}" />
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="1" />
+                <Setter Property="Ellipse.Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
             <Style Selector="^:pointerover">
-                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
+                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPointeroverBorderBrush}" />
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
@@ -358,19 +358,19 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
             <!--  Checked Pressed State  -->
             <Style Selector="^:pressed">
-                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
+                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPressedBorderBrush}" />
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -381,7 +381,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ Border#RootBorder">
                     <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
@@ -421,12 +421,12 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:unchecked">
-            <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardDefaultBorderBrush}" />
+            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardDefaultBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
             </Style>
             <Style Selector="^:disabled">
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
@@ -435,13 +435,13 @@
             </Style>
         </Style>
         <Style Selector="^:checked">
-            <Setter Property="Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
+            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
+            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
+                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
+                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
             </Style>
             <Style Selector="^:disabled">
                 <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />

src/Semi.Avalonia/Controls/RepeatButton.axaml

@@ -41,44 +41,45 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
+            <Setter Property="RepeatButton.Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
+            <Setter Property="RepeatButton.Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
 
@@ -91,118 +92,88 @@
         <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
         <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="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -213,9 +184,9 @@
         <Setter Property="RepeatButton.Background" Value="Transparent" />
         <Setter Property="RepeatButton.BorderBrush" Value="Transparent" />
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="Transparent" />
+            <Setter Property="RepeatButton.Background" Value="Transparent" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
     </ControlTheme>