Merge pull request #399 from irihitech/upgrade

Upgrade to 11.0.7.5
misc: Semi.Avalonia.TreeDataGrid upgrade to 11.0.10.
2026-03-03 00:00:55 +08:00 · 2024-08-01 20:53:48 +08:00 · 2024-08-01 20:47:02 +08:00 · 2024-08-01 20:46:25 +08:00 · 2024-08-01 20:01:58 +08:00 · 2024-08-01 20:01:33 +08:00
510 changed files with 9013 additions and 15752 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,15 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: semiavalonia
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-polar: # Replace with a single Polar username
-buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
-thanks_dev: # Replace with a single thanks.dev username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,7 +4,10 @@ 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
 on:
-  workflow_dispatch:
+  push:
+    branches: [ "action/deploy" ]
+  pull_request:
+    branches: [ "action/deploy" ]

 jobs:
  deploy-to-github-pages:
@@ -24,6 +27,9 @@ jobs:
      - name: Publish .NET Project
        run: dotnet publish $PROJECT_PATH -c Release --nologo

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

@@ -33,7 +39,6 @@ jobs:
      - 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 }}
-          single-commit: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: ${{ env.OUTPUT_PATH }}
--- a/.github/workflows/pack-nightly.yml
+++ b/.github/workflows/pack-nightly.yml
@@ -1,69 +0,0 @@
-name: Pack Nightly
-
-on:
-  workflow_dispatch:
-    inputs:
-      Version_Prefix:
-        description: 'Version Prefix'
-        required: true
-        default: '11.2.999'
-        type: string
-      Semi_Avalonia:
-        description: 'Pack Semi.Avalonia'
-        default: true
-        type: boolean
-      Semi_Avalonia_ColorPicker:
-        description: 'Pack Semi.Avalonia.ColorPicker'
-        default: true
-        type: boolean
-      Semi_Avalonia_DataGrid:
-        description: 'Pack Semi.Avalonia.DataGrid'
-        default: false
-        type: boolean
-      Semi_Avalonia_TreeDataGrid:
-        description: 'Pack Semi.Avalonia.TreeDataGrid'
-        default: false
-        type: boolean
-
-jobs:
-  Pack_Nightly:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-
-      - name: Get Version
-        run: |
-          VERSION_TIMESTAMP=$(date +'%Y%m%d%H%M%S')
-          VERSION="${{ inputs.Version_Prefix }}-nightly-${VERSION_TIMESTAMP}"
-          echo "VERSION=$VERSION" >> $GITHUB_ENV
-
-      - name: Pack Semi.Avalonia
-        if: ${{ inputs.Semi_Avalonia }}
-        run: dotnet pack src/Semi.Avalonia -o nugets /p:Version=${{ env.VERSION }}
-
-      - name: Pack Semi.Avalonia.ColorPicker
-        if: ${{ inputs.Semi_Avalonia_ColorPicker }}
-        run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets /p:Version=${{ env.VERSION }}
-
-      - name: Pack Semi.Avalonia.DataGrid
-        if: ${{ inputs.Semi_Avalonia_DataGrid }}
-        run: dotnet pack src/Semi.Avalonia.DataGrid -o nugets /p:Version=${{ env.VERSION }}
-
-      - name: Pack Semi.Avalonia.TreeDataGrid
-        if: ${{ inputs.Semi_Avalonia_TreeDataGrid }}
-        run: dotnet pack src/Semi.Avalonia.TreeDataGrid -o nugets /p:Version=${{ env.VERSION }}
-
-      - name: Add NuGet Source
-        run: dotnet nuget add source ${{ secrets.IRIHI_NUGET_NIGHTLY_FEED }} -n irihi.tech -u ${{ secrets.IRIHI_NUGET_USERNAME }} -p ${{ secrets.IRIHI_NUGET_PASSWORD }} --store-password-in-clear-text
-
-      - name: Publish Nightly Package
-        run: dotnet nuget push "nugets/*.nupkg" --api-key ${{ secrets.IRIHI_NUGET_API_KEY }} --source irihi.tech --skip-duplicate
-
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: nugets
-          path: nugets
-        if: always()
--- a/.github/workflows/pack.yml
+++ b/.github/workflows/pack.yml
@@ -1,77 +1,58 @@
-name: Pack to NuGet
+name: Pack

 on:
-  workflow_dispatch:
-    inputs:
-      Upload_to_NuGet:
-        description: 'Upload to NuGet'
-        default: true
-        type: boolean
-      Semi_Avalonia:
-        description: 'Pack Semi.Avalonia'
-        default: true
-        type: boolean
-      Semi_Avalonia_ColorPicker:
-        description: 'Pack Semi.Avalonia.ColorPicker'
-        default: true
-        type: boolean
-      Semi_Avalonia_DataGrid:
-        description: 'Pack Semi.Avalonia.DataGrid'
-        default: false
-        type: boolean
-      Semi_Avalonia_TreeDataGrid:
-        description: 'Pack Semi.Avalonia.TreeDataGrid'
-        default: false
-        type: boolean
-  workflow_call:
-    inputs:
-      Upload_to_NuGet:
-        type: boolean
-        default: false
-      Semi_Avalonia:
-        type: boolean
-        default: true
-      Semi_Avalonia_ColorPicker:
-        type: boolean
-        default: true
-      Semi_Avalonia_DataGrid:
-        type: boolean
-        default: true
-      Semi_Avalonia_TreeDataGrid:
-        type: boolean
-        default: true
+  push:
+    branches: [ "action/pack" ]
+  pull_request:
+    branches: [ "action/pack" ]

 jobs:
-  Pack_to_NuGet:
-    runs-on: ubuntu-latest
-
+  nuget_desktop:
+    runs-on: windows-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.1

-      - name: Pack Semi.Avalonia
-        if: ${{ inputs.Semi_Avalonia }}
-        run: dotnet pack src/Semi.Avalonia -o nugets
+      - name: Nuget Semi.Avalonia
+        run: dotnet pack ./src/Semi.Avalonia -o ./nugets

-      - name: Pack Semi.Avalonia.ColorPicker
-        if: ${{ inputs.Semi_Avalonia_ColorPicker }}
-        run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets
+      - name: Nuget Semi.Avalonia.ColorPicker
+        run: dotnet pack ./src/Semi.Avalonia.ColorPicker  -o ./nugets

-      - name: Pack Semi.Avalonia.DataGrid
-        if: ${{ inputs.Semi_Avalonia_DataGrid }}
-        run: dotnet pack src/Semi.Avalonia.DataGrid -o nugets
+      - name: Nuget Semi.Avalonia.DataGrid
+        run: dotnet pack ./src/Semi.Avalonia.DataGrid  -o ./nugets

-      - name: Pack Semi.Avalonia.TreeDataGrid
-        if: ${{ inputs.Semi_Avalonia_TreeDataGrid }}
-        run: dotnet pack src/Semi.Avalonia.TreeDataGrid -o nugets
+      - name: Nuget Semi.Avalonia.TreeDataGrid
+        run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid  -o ./nugets

-      - name: Upload to NuGet
-        if: ${{ inputs.Upload_to_NuGet }}
-        run: dotnet nuget push "nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+      - 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.6.2
+        uses: actions/upload-artifact@v4.3.1
        with:
-          name: nugets
-          path: nugets
-        if: always()
+          name: nuget_desktop
+          path: |
+            ./nugets
+            ./**/publish/*.exe
+
+  android:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+
+      - name: CD Android
+        run: cd ./demo/Semi.Avalonia.Demo.Android
+
+      - name: Restore Dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet publish ./demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: android
+          path: ./**/publish/*Signed.apk
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,225 +0,0 @@
-name: Publish Demo
-
-on:
-  workflow_dispatch:
-    inputs:
-      win-x64:
-        description: 'Windows x64'
-        default: false
-        type: boolean
-      win-x64-aot:
-        description: 'Windows x64 AOT'
-        default: false
-        type: boolean
-      linux-x64:
-        description: 'Linux x64'
-        default: false
-        type: boolean
-      linux-x64-aot:
-        description: 'Linux x64 AOT'
-        default: false
-        type: boolean
-      drm-linux-x64:
-        description: 'DRM Linux x64'
-        default: false
-        type: boolean
-      drm-linux-x64-aot:
-        description: 'DRM Linux x64 AOT'
-        default: false
-        type: boolean
-      osx-arm64:
-        description: 'macOS arm64'
-        default: false
-        type: boolean
-      osx-arm64-aot:
-        description: 'macOS arm64 AOT'
-        default: false
-        type: boolean
-      android-arm64:
-        description: 'Android arm64'
-        default: false
-        type: boolean
-  workflow_call:
-    inputs:
-      win-x64:
-        type: boolean
-        default: true
-      win-x64-aot:
-        type: boolean
-        default: true
-      linux-x64:
-        type: boolean
-        default: true
-      linux-x64-aot:
-        type: boolean
-        default: true
-      drm-linux-x64:
-        type: boolean
-        default: true
-      drm-linux-x64-aot:
-        type: boolean
-        default: true
-      osx-arm64:
-        type: boolean
-        default: true
-      osx-arm64-aot:
-        type: boolean
-        default: true
-      android-arm64:
-        type: boolean
-        default: true
-
-jobs:
-  win-x64:
-    if: ${{inputs.win-x64}}
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-      - name: Publish win-x64
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: Semi.Avalonia.Demo.Desktop.win-x64
-          path: |
-            publish
-            !publish/*.pdb
-
-  win-x64-aot:
-    if: ${{inputs.win-x64-aot}}
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-      - name: Enable Native AOT in .csproj
-        run: sed -i 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
-      - name: Publish win-x64 AOT
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT
-          path: |
-            publish
-            !publish/*.pdb
-
-  linux-x64:
-    if: ${{inputs.linux-x64}}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-      - name: Publish linux-x64
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: Semi.Avalonia.Demo.Desktop.linux-x64
-          path: |
-            publish
-            !publish/*.pdb
-
-  linux-x64-aot:
-    if: ${{inputs.linux-x64-aot}}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-      - name: Enable Native AOT in .csproj
-        run: sed -i 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
-      - name: Publish linux-x64 AOT
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: Semi.Avalonia.Demo.Desktop.linux-x64.NativeAOT
-          path: |
-            publish
-            !publish/*.pdb
-
-  drm-linux-x64:
-    if: ${{inputs.drm-linux-x64}}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-      - name: Publish linux-x64 DRM
-        run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: Semi.Avalonia.Demo.Drm.linux-x64
-          path: |
-            publish
-            !publish/*.pdb
-
-  drm-linux-x64-aot:
-    if: ${{inputs.drm-linux-x64-aot}}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-      - name: Enable Native AOT in .csproj
-        run: sed -i 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
-      - name: Publish linux-x64 AOT
-        run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: Semi.Avalonia.Demo.Drm.linux-x64.NativeAOT
-          path: |
-            publish
-            !publish/*.pdb
-
-  osx-arm64:
-    if: ${{inputs.osx-arm64}}
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-      - name: Publish osx-arm64
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r osx-arm64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: Semi.Avalonia.Demo.Desktop.osx-arm64
-          path: |
-            publish
-            !publish/*.pdb
-
-  osx-arm64-aot:
-    if: ${{inputs.osx-arm64-aot}}
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-      - name: Enable Native AOT in .csproj
-        run: sed -i '' 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
-      - name: Publish osx-arm64 AOT
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r osx-arm64 -c Release -o publish
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: Semi.Avalonia.Demo.Desktop.osx-arm64.NativeAOT
-          path: |
-            publish
-            !publish/*.pdb
-
-  android-arm64:
-    if: ${{inputs.android-arm64 }}
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-      - name: CD Android
-        run: cd demo/Semi.Avalonia.Demo.Android
-      - name: Restore Dependencies
-        run: dotnet restore
-      - name: Publish Android
-        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o publish /p:RuntimeIdentifier=android-arm64
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: android-arm64
-          path: publish/*Signed.apk
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -1,73 +0,0 @@
-name: Release Tag
-
-on:
-  workflow_dispatch:
-    inputs:
-      Upload_to_NuGet:
-        description: 'Upload to NuGet'
-        default: false
-        type: boolean
-      Semi_Avalonia:
-        description: 'Pack Semi.Avalonia'
-        default: true
-        type: boolean
-      Semi_Avalonia_ColorPicker:
-        description: 'Pack Semi.Avalonia.ColorPicker'
-        default: true
-        type: boolean
-      Semi_Avalonia_DataGrid:
-        description: 'Pack Semi.Avalonia.DataGrid'
-        default: false
-        type: boolean
-      Semi_Avalonia_TreeDataGrid:
-        description: 'Pack Semi.Avalonia.TreeDataGrid'
-        default: false
-        type: boolean
-
-jobs:
-  nuget:
-    uses: ./.github/workflows/pack.yml
-    with:
-      Upload_to_NuGet: ${{ inputs.Upload_to_NuGet }}
-      Semi_Avalonia: ${{ inputs.Semi_Avalonia }}
-      Semi_Avalonia_ColorPicker: ${{ inputs.Semi_Avalonia_ColorPicker }}
-      Semi_Avalonia_DataGrid: ${{ inputs.Semi_Avalonia_DataGrid }}
-      Semi_Avalonia_TreeDataGrid: ${{ inputs.Semi_Avalonia_TreeDataGrid }}
-
-  publish:
-    uses: ./.github/workflows/publish.yml
-
-  draft-release:
-    needs: [ nuget,publish ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v4.3.0
-
-      - name: Display structure of downloaded files
-        run: ls -R
-
-      - name: Zip artifacts
-        run: |
-          zip -rj Semi.Avalonia.Demo.Desktop.win-x64.zip Semi.Avalonia.Demo.Desktop.win-x64
-          zip -rj Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT
-          zip -rj Semi.Avalonia.Demo.Desktop.linux-x64.zip Semi.Avalonia.Demo.Desktop.linux-x64
-          zip -rj Semi.Avalonia.Demo.Desktop.linux-x64.NativeAOT.zip Semi.Avalonia.Demo.Desktop.linux-x64.NativeAOT
-          zip -rj Semi.Avalonia.Demo.Drm.linux-x64.zip Semi.Avalonia.Demo.Drm.linux-x64
-          zip -rj Semi.Avalonia.Demo.Drm.linux-x64.NativeAOT.zip Semi.Avalonia.Demo.Drm.linux-x64.NativeAOT
-          zip -rj Semi.Avalonia.Demo.Desktop.osx-arm64.zip Semi.Avalonia.Demo.Desktop.osx-arm64
-          cd Semi.Avalonia.Demo.Desktop.osx-arm64.NativeAOT
-          zip -r ../Semi.Avalonia.Demo.Desktop.osx-arm64.NativeAOT.zip .
-
-      - name: Display structure of zipped files
-        run: ls -R
-
-      - name: Release
-        uses: softprops/action-gh-release@v2.3.2
-        if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
-        with:
-          generate_release_notes: true
-          draft: true
-          files: |
-            nugets/*.nupkg
-            android-arm64/*.apk
-            *.zip
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2022 IRIHI Technology
+Copyright (c) 2022 iriHi Technology

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -1,88 +1,55 @@
-# Semi Avalonia
+# Semi.Avalonia

 [![Semi Avalonia](https://img.shields.io/nuget/v/Semi.Avalonia.svg?color=red&style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
 [![Semi Avalonia](https://img.shields.io/nuget/dt/Semi.Avalonia.svg?style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
-[![GitCode](https://gitcode.com/IRIHI_Technology/Semi.Avalonia/star/badge.svg)](https://gitcode.com/IRIHI_Technology/Semi.Avalonia)
-
-[中文](./README_CN.md)

 Avalonia Theme inspired by Semi Design

-Semi.Avalonia can be previewed in the browser [here](https://irihitech.github.io/Semi.Avalonia/)
-
-If you are looking for more detailed documentation, Please visit [Semi Documentation](https://docs.irihi.tech/semi/)
-
-If you are looking for more customized controls, Please try [Ursa](https://github.com/irihitech/Ursa.Avalonia)
-
-![Light](./docs/demo.jpg)
-
-## How to Use
-
-### Installation
+# How to Use

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

 ```xaml
-<Application
-    ...
-    xmlns:semi="https://irihi.tech/semi">
-    <Application.Styles>
-        <semi:SemiTheme Locale="zh-CN" />
-    </Application.Styles>
-</Application>
+<Application.Styles>
+    <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
+</Application.Styles>
 ```

-That's all.
-
-ColorPicker, DataGrid, TreeDataGrid, Dock, Tabalonia and AvaloniaEdit are distributed in separated packages. Please install if you need.
+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.Dock
-dotnet add package Semi.Avalonia.Tabalonia
-dotnet add package Semi.Avalonia.AvaloniaEdit
 ```
-
 ```xaml
 <Application.Styles>
-    <semi:ColorPickerSemiTheme />
-    <semi:DataGridSemiTheme />
-    <semi:TreeDataGridSemiTheme />
-    <semi:DockSemiTheme />
-    <semi:TabaloniaSemiTheme />
-    <semi:AvaloniaEditSemiTheme />
+    <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
+    <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
+    <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
 </Application.Styles>
 ```

-Notice: Dock, Tabalonia and AvaloniaEdit are delivered via nuget for free, but not open source. Please read the license and agree to continue use these packages. If you need source code, please contact us via email: [contact@irihi.tech](contact@irihi.tech)
-
 ## Demo

 You can always download demo executable to play around with Semi Avalonia Themes.
-<https://github.com/irihitech/Semi.Avalonia/releases>
-
-## Support
-
-We offer limited free community support for Semi Avalonia and Ursa. If you have any question or suggestion, feel free to raise issues and discussions via GitHub, and you are welcomed to join our group via FeiShu(Lark)
-
-![FeiShu](./docs/community-support.png)
+https://github.com/irihitech/Semi.Avalonia/releases

 ## Version compatibility

 | Semi Design Version | Avalonia Version |
 |:--------------------|:-----------------|
-| 11.2.1              | >=11.2.1         |
-| 11.2.0              | 11.2.0           |
-| 11.1.0              | >=11.1.0         |
-| 11.0.7              | >=11.0.7         |
+| 11.0.7              | 11.0.7           |
 | 11.0.1              | <=11.0.6         |

+## TODO
+* FocusAdorner
+
 ## Credits

 [Semi Design](https://semi.design/)
@@ -95,3 +62,10 @@ We offer limited free community support for Semi Avalonia and Ursa. If you have

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

+## Screenshot
+
+Light Mode
+![Light](./docs/Light.png)
+
+Dark Mode
+![Dark](./docs/Dark.png)
--- a/README_CN.md
+++ b/README_CN.md
@@ -1,97 +0,0 @@
-# Semi Avalonia
-
-[![Semi Avalonia](https://img.shields.io/nuget/v/Semi.Avalonia.svg?color=red&style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
-[![Semi Avalonia](https://img.shields.io/nuget/dt/Semi.Avalonia.svg?style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
-[![GitCode](https://gitcode.com/IRIHI_Technology/Semi.Avalonia/star/badge.svg)](https://gitcode.com/IRIHI_Technology/Semi.Avalonia)
-
-[English](./README.md)
-
-Avalonia UI 控件主题，灵感来自 Semi Design
-
-Semi.Avalonia 现在可以在浏览器上 [查看效果](https://irihitech.github.io/Semi.Avalonia/)
-
-如果您希望查看更详细的文档，请浏览 [Semi 文档](https://docs.irihi.tech/semi/)
-
-如果您希望使用更多的拓展控件，欢迎尝试 [Ursa](https://github.com/irihitech/Ursa.Avalonia)
-
-![Light](./docs/demo.jpg)
-
-## 如何使用
-
-### 安装
-
-```bash
-dotnet add package Semi.Avalonia
-```
-
-在样式中引用 Semi 主题：
-
-```xaml
-<Application
-    ...
-    xmlns:semi="https://irihi.tech/semi">
-    <Application.Styles>
-        <semi:SemiTheme Locale="zh-CN" />
-    </Application.Styles>
-</Application>
-```
-
-这样就可以了。
-
-ColorPicker、DataGrid、TreeDataGrid、Dock、Tabalonia 和 AvaloniaEdit 的样式单独分发，如果需要请安装并引用。
-
-```bash
-dotnet add package Semi.Avalonia.ColorPicker
-dotnet add package Semi.Avalonia.DataGrid
-dotnet add package Semi.Avalonia.TreeDataGrid
-dotnet add package Semi.Avalonia.Dock
-dotnet add package Semi.Avalonia.Tabalonia
-dotnet add package Semi.Avalonia.AvaloniaEdit
-```
-
-```xaml
-<Application.Styles>
-    <semi:ColorPickerSemiTheme />
-    <semi:DataGridSemiTheme />
-    <semi:TreeDataGridSemiTheme />
-    <semi:DockSemiTheme />
-    <semi:TabaloniaSemiTheme />
-    <semi:AvaloniaEditSemiTheme />
-</Application.Styles>
-```
-
-注意：Dock、Tabalonia 和 AvaloniaEdit 是通过 NuGet 免费分发的，但不是开源的。请阅读许可协议并同意后继续使用这些包。如果您需要源代码，请通过电子邮件联系我们：[contact@irihi.tech](contact@irihi.tech)
-
-## 示例
-
-您可以从 Semi Avalonia 的 release 页下载并试用 Semi Avalonia 的展示应用。
-<https://github.com/irihitech/Semi.Avalonia/releases>
-
-## 社区支持
-
-我们提供有限度的免费社区支持，如果您有任何问题或建议，除了在GitHub上提交issue或发起讨论，也欢迎加入我们的飞书交流群：
-
-![FeiShu](./docs/community-support.png)
-
-## 版本兼容性
-
-| Semi Design Version | Avalonia Version |
-|:--------------------|:-----------------|
-| 11.2.1              | >=11.2.1         |
-| 11.2.0              | 11.2.0           |
-| 11.1.0              | >=11.1.0         |
-| 11.0.7              | >=11.0.7         |
-| 11.0.1              | <=11.0.6         |
-
-## 致谢
-
-[Semi Design](https://semi.design/)
-
-[Avalonia](https://github.com/AvaloniaUI/Avalonia)
-
-[FluentAvalonia](https://github.com/amwx/FluentAvalonia)
-
-[Material Design Icons](https://pictogrammers.com/library/mdi/)
-
-[CommunityToolKit](https://github.com/CommunityToolkit/dotnet)
-
--- a/Semi.Avalonia.sln
+++ b/Semi.Avalonia.sln
@@ -12,15 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution
 		src\Package.props = src\Package.props
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Action", "GitHub Action", "{318534A1-1CC3-40FB-B4AE-736F94465232}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\deploy.yml = .github\workflows\deploy.yml
-		.github\workflows\pack.yml = .github\workflows\pack.yml
-		.github\workflows\pack-nightly.yml = .github\workflows\pack-nightly.yml
-		.github\workflows\publish.yml = .github\workflows\publish.yml
-		.github\workflows\release-tag.yml = .github\workflows\release-tag.yml
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{43091528-9509-43CB-A003-9C5C11E96DD6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo.Desktop", "demo\Semi.Avalonia.Demo.Desktop\Semi.Avalonia.Demo.Desktop.csproj", "{2ADCA724-2B6D-46EC-87F7-604D7918B89A}"
@@ -39,6 +30,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.Demo.Drm", "d
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.TreeDataGrid", "src\Semi.Avalonia.TreeDataGrid\Semi.Avalonia.TreeDataGrid.csproj", "{398D2998-0835-41F5-99A3-608CAB8051E2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.TreeDataGrid.Demo", "demo\Semi.Avalonia.TreeDataGrid.Demo\Semi.Avalonia.TreeDataGrid.Demo.csproj", "{6178B545-4BB6-458C-A27C-EE11F3885D38}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -82,6 +75,10 @@ Global
 		{398D2998-0835-41F5-99A3-608CAB8051E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{398D2998-0835-41F5-99A3-608CAB8051E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{398D2998-0835-41F5-99A3-608CAB8051E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6178B545-4BB6-458C-A27C-EE11F3885D38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6178B545-4BB6-458C-A27C-EE11F3885D38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6178B545-4BB6-458C-A27C-EE11F3885D38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6178B545-4BB6-458C-A27C-EE11F3885D38}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -92,6 +89,7 @@ Global
 		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0} = {43091528-9509-43CB-A003-9C5C11E96DD6}
 		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F} = {43091528-9509-43CB-A003-9C5C11E96DD6}
 		{86D93406-412A-4429-93B2-92AAD0407784} = {43091528-9509-43CB-A003-9C5C11E96DD6}
+		{6178B545-4BB6-458C-A27C-EE11F3885D38} = {43091528-9509-43CB-A003-9C5C11E96DD6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7CA41ED3-2CED-40CC-AA21-28C3B42B1E86}
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
-    <PropertyGroup>
-        <AvaloniaVersion>11.3.0</AvaloniaVersion>
-        <DataGridVersion>11.3.0</DataGridVersion>
-        <CommunityToolkitVersion>8.4.0</CommunityToolkitVersion>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Nullable>enable</Nullable>
+    <AvaloniaVersion>11.0.7</AvaloniaVersion>
+  </PropertyGroup>
 </Project>
--- a/demo/Semi.Avalonia.Demo.Android/Resources/AboutResources.txt
+++ b/demo/Semi.Avalonia.Demo.Android/Resources/AboutResources.txt
@@ -1,44 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.axml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable/
-        icon.png
-
-    layout/
-        main.axml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called "R" 
-(this is an Android convention) that contains the tokens for each one of the resources 
-included. For example, for the above Resources layout, this is what the R class would expose:
-
-public class R {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
-to reference the layout/main.axml file, or R.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.
--- a/demo/Semi.Avalonia.Demo.Android/Resources/drawable-night-v31/avalonia_anim.xml
+++ b/demo/Semi.Avalonia.Demo.Android/Resources/drawable-night-v31/avalonia_anim.xml
@@ -1,66 +0,0 @@
-<animated-vector
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:aapt="http://schemas.android.com/aapt">
-  <aapt:attr name="android:drawable">
-    <vector
-      android:name="vector"
-      android:width="128dp"
-      android:height="128dp"
-      android:viewportWidth="128"
-      android:viewportHeight="128">
-      <group
-        android:name="wrapper"
-        android:translateX="21"
-        android:translateY="21">
-        <group android:name="group">
-          <path
-            android:name="path"
-            android:pathData="M 74.853 85.823 L 75.368 85.823 C 80.735 85.823 85.144 81.803 85.761 76.602 L 85.836 41.76 C 85.225 18.593 66.254 0 42.939 0 C 19.24 0 0.028 19.212 0.028 42.912 C 0.028 66.357 18.831 85.418 42.18 85.823 L 74.853 85.823 Z"
-            android:strokeWidth="1"/>
-          <path
-            android:name="path_1"
-            android:pathData="M 43.059 14.614 C 29.551 14.614 18.256 24.082 15.445 36.743 C 18.136 37.498 20.109 39.968 20.109 42.899 C 20.109 45.831 18.136 48.301 15.445 49.055 C 18.256 61.716 29.551 71.184 43.059 71.184 C 47.975 71.184 52.599 69.93 56.628 67.723 L 56.628 70.993 L 71.344 70.993 L 71.344 44.072 C 71.357 43.714 71.344 43.26 71.344 42.899 C 71.344 27.278 58.68 14.614 43.059 14.614 Z M 29.51 42.899 C 29.51 35.416 35.576 29.35 43.059 29.35 C 50.541 29.35 56.607 35.416 56.607 42.899 C 56.607 50.382 50.541 56.448 43.059 56.448 C 35.576 56.448 29.51 50.382 29.51 42.899 Z"
-            android:strokeWidth="1"
-            android:fillType="evenOdd"/>
-          <path
-            android:name="path_2"
-            android:pathData="M 18.105 42.88 C 18.105 45.38 16.078 47.407 13.579 47.407 C 11.079 47.407 9.052 45.38 9.052 42.88 C 9.052 40.381 11.079 38.354 13.579 38.354 C 16.078 38.354 18.105 40.381 18.105 42.88 Z"
-            android:strokeWidth="1"/>
-        </group>
-      </group>
-    </vector>
-  </aapt:attr>
-  <target android:name="path">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:propertyName="fillColor"
-        android:duration="1000"
-        android:valueFrom="#00ffffff"
-        android:valueTo="#161c2d"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in"/>
-    </aapt:attr>
-  </target>
-  <target android:name="path_1">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:propertyName="fillColor"
-        android:duration="1000"
-        android:valueFrom="#00ffffff"
-        android:valueTo="#f9f9fb"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in"/>
-    </aapt:attr>
-  </target>
-  <target android:name="path_2">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:propertyName="fillColor"
-        android:duration="1000"
-        android:valueFrom="#00ffffff"
-        android:valueTo="#f9f9fb"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in"/>
-    </aapt:attr>
-  </target>
-</animated-vector>
--- a/demo/Semi.Avalonia.Demo.Android/Resources/drawable-v31/avalonia_anim.xml
+++ b/demo/Semi.Avalonia.Demo.Android/Resources/drawable-v31/avalonia_anim.xml
@@ -1,71 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="128dp"
-            android:height="128dp"
-            android:viewportWidth="128"
-            android:viewportHeight="128">
-            <group
-                android:name="wrapper"
-                android:translateX="21"
-                android:translateY="21">
-                <group android:name="group">
-                    <path
-                        android:name="path"
-                        android:pathData="M 74.853 85.823 L 75.368 85.823 C 80.735 85.823 85.144 81.803 85.761 76.602 L 85.836 41.76 C 85.225 18.593 66.254 0 42.939 0 C 19.24 0 0.028 19.212 0.028 42.912 C 0.028 66.357 18.831 85.418 42.18 85.823 L 74.853 85.823 Z"
-                        android:fillColor="#00ffffff"
-                        android:strokeWidth="1"/>
-                    <path
-                        android:name="path_1"
-                        android:pathData="M 43.059 14.614 C 29.551 14.614 18.256 24.082 15.445 36.743 C 18.136 37.498 20.109 39.968 20.109 42.899 C 20.109 45.831 18.136 48.301 15.445 49.055 C 18.256 61.716 29.551 71.184 43.059 71.184 C 47.975 71.184 52.599 69.93 56.628 67.723 L 56.628 70.993 L 71.344 70.993 L 71.344 44.072 C 71.357 43.714 71.344 43.26 71.344 42.899 C 71.344 27.278 58.68 14.614 43.059 14.614 Z M 29.51 42.899 C 29.51 35.416 35.576 29.35 43.059 29.35 C 50.541 29.35 56.607 35.416 56.607 42.899 C 56.607 50.382 50.541 56.448 43.059 56.448 C 35.576 56.448 29.51 50.382 29.51 42.899 Z"
-                        android:fillColor="#00ffffff"
-                        android:strokeWidth="1"
-                        android:fillType="evenOdd"/>
-                    <path
-                        android:name="path_2"
-                        android:pathData="M 18.105 42.88 C 18.105 45.38 16.078 47.407 13.579 47.407 C 11.079 47.407 9.052 45.38 9.052 42.88 C 9.052 40.381 11.079 38.354 13.579 38.354 C 16.078 38.354 18.105 40.381 18.105 42.88 Z"
-                        android:fillColor="#00ffffff"
-                        android:strokeWidth="1"/>
-                </group>
-            </group>
-        </vector>
-    </aapt:attr>
-    <target android:name="path_2">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillColor"
-                android:startOffset="100"
-                android:duration="900"
-                android:valueFrom="#00ffffff"
-                android:valueTo="#161c2d"
-                android:valueType="colorType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="path">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillColor"
-                android:duration="500"
-                android:valueFrom="#00ffffff"
-                android:valueTo="#f9f9fb"
-                android:valueType="colorType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="path_1">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillColor"
-                android:startOffset="100"
-                android:duration="900"
-                android:valueFrom="#00ffffff"
-                android:valueTo="#161c2d"
-                android:valueType="colorType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-</animated-vector>
--- a/demo/Semi.Avalonia.Demo.Android/Resources/drawable/Icon.png
+++ b/demo/Semi.Avalonia.Demo.Android/Resources/drawable/Icon.png
--- a/demo/Semi.Avalonia.Demo.Android/Resources/values-night/colors.xml
+++ b/demo/Semi.Avalonia.Demo.Android/Resources/values-night/colors.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="splash_background">#212121</color>
-</resources>
--- a/demo/Semi.Avalonia.Demo.Android/Resources/values-v31/styles.xml
+++ b/demo/Semi.Avalonia.Demo.Android/Resources/values-v31/styles.xml
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<resources>
-
-  <style name="MyTheme">
-  </style>
-
-  <style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
-    <item name="android:windowActionBar">false</item>
-    <item name="android:windowBackground">@null</item>
-    <item name="android:windowNoTitle">true</item>
-    <item name="android:windowSplashScreenBackground">@color/splash_background</item>
-    <item name="android:windowSplashScreenAnimatedIcon">@drawable/avalonia_anim</item>
-    <item name="android:windowSplashScreenAnimationDuration">1000</item>
-    <item name="postSplashScreenTheme">@style/MyTheme.Main</item>
-
-  </style>
-  <style name="MyTheme.Main"
-         parent ="MyTheme.NoActionBar">
-    <item name="android:windowIsTranslucent">true</item>
-  </style>
-</resources>
--- a/demo/Semi.Avalonia.Demo.Android/Resources/values/styles.xml
+++ b/demo/Semi.Avalonia.Demo.Android/Resources/values/styles.xml
@@ -1,12 +1,17 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <resources>

  <style name="MyTheme">
  </style>

-  <style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
+  <style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
    <item name="android:windowActionBar">false</item>
-    <item name="android:windowBackground">@drawable/splash_screen</item>
    <item name="android:windowNoTitle">true</item>
  </style>
+
+  <style name="MyTheme.Splash" parent ="MyTheme.NoActionBar">
+    <item name="android:windowBackground">@drawable/splash_screen</item>
+    <item name="android:windowContentOverlay">@null</item>
+  </style>
+
 </resources>
--- a/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
+++ b/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
@@ -3,28 +3,23 @@
        <OutputType>Exe</OutputType>
        <TargetFramework>net8.0-android</TargetFramework>
        <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
-        <Nullable>enable</Nullable>
        <ApplicationId>com.irihitech.Semi.Avalonia</ApplicationId>
        <ApplicationVersion>1</ApplicationVersion>
        <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
        <AndroidPackageFormat>apk</AndroidPackageFormat>
-        <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+        <AndroidEnableProfiledAot>False</AndroidEnableProfiledAot>
        <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
        <RootNamespace>Semi.Avalonia.Demo.Android</RootNamespace>
    </PropertyGroup>

+    <Import Project="../Directory.Build.props" />
+
    <ItemGroup>
-        <AndroidResource Include="Icon.png">
-            <Link>Resources\drawable\Icon.png</Link>
-        </AndroidResource>
+        <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1"/>
+        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
    </ItemGroup>

-    <ItemGroup>
-        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj"/>
-    </ItemGroup>
 </Project>
--- a/demo/Semi.Avalonia.Demo.Desktop/Program.cs
+++ b/demo/Semi.Avalonia.Demo.Desktop/Program.cs
@@ -1,11 +1,13 @@
-using System;
-using Avalonia;
+using Avalonia;
 using Avalonia.Dialogs;
 using Avalonia.Media;
+using System;
+using System.Linq;
+using System.Threading;

 namespace Semi.Avalonia.Demo.Desktop;

-sealed class Program
+class Program
 {
    // Initialization code. Don't use any Avalonia, third-party APIs or any
    // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
@@ -14,13 +16,13 @@ sealed class Program
    public static void Main(string[] args) => BuildAvaloniaApp()
        .With(new FontManagerOptions
        {
-            FontFallbacks =
-            [
+            FontFallbacks = new[]
+            {
                new FontFallback
                {
                    FontFamily = new FontFamily("Microsoft YaHei")
                }
-            ]
+            }
        })
        .StartWithClassicDesktopLifetime(args);

@@ -31,4 +33,4 @@ sealed class Program
            .UsePlatformDetect()
            .With(new Win32PlatformOptions())
            .LogToTrace();
-}
+}
--- a/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
+++ b/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
@@ -5,7 +5,10 @@
        <Nullable>enable</Nullable>
        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
        <!-- Uncomment below to enable Native AOT compilation-->
-        <!--<PublishAot>true</PublishAot>-->
+        <!--
+        <PublishAot>true</PublishAot>
+        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+        -->
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
@@ -18,14 +21,16 @@
    </PropertyGroup>

    <ItemGroup>
-        <TrimmerRootDescriptor Include="Roots.xml"/>
+        <TrimmerRootDescriptor Include="Roots.xml" />
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
    </ItemGroup>

    <ItemGroup>
-        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj"/>
+        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
    </ItemGroup>
 </Project>
--- a/demo/Semi.Avalonia.Demo.Desktop/app.manifest
+++ b/demo/Semi.Avalonia.Demo.Desktop/app.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
  <!-- This manifest is used on Windows only.
-       Don't remove it as it might cause problems with window transparency and embedded controls.
+       Don't remove it as it might cause problems with window transparency and embeded controls.
       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
  <assemblyIdentity version="1.0.0.0" name="Semi.Avalonia.Demo.Desktop"/>

--- a/demo/Semi.Avalonia.Demo.Drm/Program.cs
+++ b/demo/Semi.Avalonia.Demo.Drm/Program.cs
@@ -3,11 +3,10 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using Avalonia;
-using Avalonia.Dialogs;

 namespace Semi.Avalonia.Demo.Drm;

-sealed class Program
+class Program
 {
    // Initialization code. Don't use any Avalonia, third-party APIs or any
    // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
@@ -29,7 +28,7 @@ sealed class Program
        if (args.Contains("--drm"))
        {
            SilenceConsole();
-            return builder.StartLinuxDrm(args, scaling: GetScaling());
+            return builder.StartLinuxDrm(args: args, card: "/dev/dri/card1", scaling: GetScaling());
        }

        return builder.StartWithClassicDesktopLifetime(args);
@@ -38,9 +37,7 @@ sealed class Program
    // 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()
--- a/demo/Semi.Avalonia.Demo.Drm/README.md
+++ b/demo/Semi.Avalonia.Demo.Drm/README.md
@@ -1,162 +0,0 @@
-# DRM Start Steps
-
-[中文](README_CN.md)
-
-(Ubuntu 20.04 live server linux-x64 Virtual Machine Test Success)  
-(Orange Pi Zero2 Ubuntu20.04-arm64 Test Success)
-
-[Avalonia Official Reference Document](https://docs.avaloniaui.net/docs/next/guides/platforms/rpi/running-on-raspbian-lite-via-drm)
-
-## Setup Running Environment
-
-1. Run the following commands on the Linux side
-```bash
-sudo apt update
-sudo apt upgrade
-sudo reboot
-sudo apt-get install libgbm1 libgl1-mesa-dri libegl1-mesa libinput10
-```
-
-2. Install the test tool (if a colored cube appears, the environment is installed)
-```bash
-sudo apt-get install kmscube
-sudo kmscube
-```
-
-3. [Install .NET Runtime](https://learn.microsoft.com/dotnet/core/install/linux?WT.mc_id=dotnet-35129-website)
-
-4. Add the Avalonia.LinuxFramebuffer package in NuGet
-
-```bash
-dotnet add package Avalonia.LinuxFramebuffer
-```
-
-5. Add StartLinuxDrm code
-
-```csharp
-public static int Main(string[] args)
-{
-    var builder = BuildAvaloniaApp();
-    if (args.Contains("--drm"))
-    {
-        SilenceConsole();
-        // By default, Avalonia will try to detect output card automatically.
-        // But you can specify one, for example "/dev/dri/card1".
-        return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-    }
-
-    return builder.StartWithClassicDesktopLifetime(args);
-}
-
-private static void SilenceConsole()
-{
-    new Thread(() =>
-        {
-            Console.CursorVisible = false;
-            while (true)
-                Console.ReadKey(true);
-        })
-        { IsBackground = true }.Start();
-}
-```
-
-6. Publish the app to Linux
-
-```bash
-dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linux-x64 --sc /p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true
-```
-
-Add the following code to the csproj file for AOT publishing
-
-```xml
-<PropertyGroup>
-    <PublishAot>true</PublishAot>
-    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
-</PropertyGroup>
-```
-
-```bash
-dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linu-x64
-```
-
-7. Run the program
-
-```bash
-sudo ./Semi.Avalonia.Demo.Drm --drm
-```
-
-## Troubleshooting
-
-1. Error message
-
-> 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
-
-Solution:
-
-If you use the Semi release file, do not trim it, otherwise an error will occur.
-
-24.8.18 update: This issue has been fixed.
-
-2. Error message
-
-> Unhandled exception. System.TypeInitializationException: The type initializer for 'SkiaSharp.SKImageInfo' threw an exception.**
-    **--->System.DllNotFoundException: Unable to load shared library 'libSkiaSharp' or one of its dependencies.In order to help diagnose loading problems, consider setting the LD_DEBUG environment variable: liblibSkiaSharp: cannot open shared object file: No such file or directory
-    at SkiaSharp.SkiaApi.sk_colortype_get_default_8888()
-    at SkiaSharp.SKImageInfo..cctor()
-
-Solution:
-
-Linux CLI installation
-
-```bash
-sudo apt-get install -y libfontconfig1  
-```
-[Reference](https://github.com/mono/SkiaSharp/issues/509)
-
-3. Error message
-
-> Permission denied
-
-Solution:
-
-add permission
-
-```bash
-sudo chmod +x ./Semi.Avalonia.Demo.Drm
-```
-
-4. Error message
-
-> 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)
-
-Solution:
-
-The `program.cs` graphics card path is incorrect, it may not be `dev/dri/card1`, see if there are other graphics cards in the `dev/dri` directory such as `card0`.
-
-24.8.18 update: Avalonia will now automatically detect the graphics card path, so you don't need to specify the graphics card path.
-
-```csharp
-return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-```
-
-5. Error message
->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[])
-
-Solution:
-
-Unable to open `/dev/dri/card1`, may be the graphics card is mounted to another folder.
-
-24.8.18 update: Avalonia will now automatically detect the graphics card path, so you don't need to specify the graphics card path.
-
-```csharp
-return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-```
--- a/demo/Semi.Avalonia.Demo.Drm/README_CN.md
+++ b/demo/Semi.Avalonia.Demo.Drm/README_CN.md
@@ -1,162 +0,0 @@
-# DRM启动步骤
-
-[English](README.md)
-
-(Ubuntu 20.04 live server linux-x64 虚拟机测试成功)  
-(Orange Pi Zero2 Ubuntu20.04-arm64 测试成功)
-
-[Avalonia 官方参考文档](https://docs.avaloniaui.net/docs/next/guides/platforms/rpi/running-on-raspbian-lite-via-drm)
-
-## 搭建运行环境
-
-1. Linux端运行命令
-```bash
-sudo apt update
-sudo apt upgrade
-sudo reboot
-sudo apt-get install libgbm1 libgl1-mesa-dri libegl1-mesa libinput10
-```
-
-2. 安装测试工具(出现一个彩色立方体说明环境安装完成)  
-```bash
-sudo apt-get install kmscube
-sudo kmscube
-```
-
-3. [安装.net运行时](https://learn.microsoft.com/dotnet/core/install/linux?WT.mc_id=dotnet-35129-website)
-
-4. NuGet里面添加Avalonia.LinuxFramebuffer包
-
-```bash
-dotnet add package Avalonia.LinuxFramebuffer
-```
-
-5. 添加StartLinuxDrm代码
-
-```csharp
-public static int Main(string[] args)
-{
-    var builder = BuildAvaloniaApp();
-    if (args.Contains("--drm"))
-    {
-        SilenceConsole();
-        // By default, Avalonia will try to detect output card automatically.
-        // But you can specify one, for example "/dev/dri/card1".
-        return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-    }
-
-    return builder.StartWithClassicDesktopLifetime(args);
-}
-
-private static void SilenceConsole()
-{
-    new Thread(() =>
-        {
-            Console.CursorVisible = false;
-            while (true)
-                Console.ReadKey(true);
-        })
-        { IsBackground = true }.Start();
-}
-```
-
-6. 发布程序到Linux
-
-```bash
-dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linux-x64 --sc /p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true
-```
-
-AOT发布需要在csproj文件中添加以下代码
-
-```xml
-<PropertyGroup>
-    <PublishAot>true</PublishAot>
-    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
-</PropertyGroup>
-```
-
-```bash
-dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linu-x64
-```
-
-7. 运行程序
-
-```bash
-sudo ./Semi.Avalonia.Demo.Drm --drm
-```
-
-## 报错处理
-
-1. 报错内容
-
-> 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发布文件不要裁剪，如果裁剪会报错。
-
-24.8.18更新：现在已经修复了这个问题。
-
-2. 报错内容
-
-> Unhandled exception. System.TypeInitializationException: The type initializer for 'SkiaSharp.SKImageInfo' threw an exception.**
-    **--->System.DllNotFoundException: Unable to load shared library 'libSkiaSharp' or one of its dependencies.In order to help diagnose loading problems, consider setting the LD_DEBUG environment variable: liblibSkiaSharp: cannot open shared object file: No such file or directory
-    at SkiaSharp.SkiaApi.sk_colortype_get_default_8888()
-    at SkiaSharp.SKImageInfo..cctor()
-
-解决方法：
-
-Linux 命令行安装
-
-```bash
-sudo apt-get install -y libfontconfig1  
-```
-
-[参考网址](https://github.com/mono/SkiaSharp/issues/509)
-
-3. 报错内容
-
-> Permission denied
-
-解决方法：
-
-添加执行权限
-```bash
-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`。
-
-24.8.18更新：现在Avalonia会自动检测显卡路径，所以不需要指定显卡路径。
-
-```csharp
-return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-```
-
-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`，可能是显卡挂载到别的文件夹下了。
-
-24.8.18更新：现在Avalonia会自动检测显卡路径，所以不需要指定显卡路径。
-
-```csharp
-return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-```
--- a/demo/Semi.Avalonia.Demo.Drm/Roots.xml
+++ b/demo/Semi.Avalonia.Demo.Drm/Roots.xml
@@ -1,3 +0,0 @@
-<linker>
-    <assembly fullname="Semi.Avalonia.Demo" preserve="All"/>
-</linker>
--- a/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
+++ b/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
@@ -1,32 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <OutputType>WinExe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-        <!-- Uncomment below to enable Native AOT compilation-->
-        <!--<PublishAot>true</PublishAot>-->
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>

-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsTrimmable>true</IsTrimmable>
-        <PublishTrimmed>true</PublishTrimmed>
-    </PropertyGroup>

-    <PropertyGroup>
-        <ApplicationManifest>app.manifest</ApplicationManifest>
-    </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+    <!--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 Include="Avalonia.LinuxFramebuffer" Version="$(AvaloniaVersion)" />
+  </ItemGroup>

-    <ItemGroup>
-        <TrimmerRootDescriptor Include="Roots.xml"/>
-    </ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Avalonia.LinuxFramebuffer" Version="$(AvaloniaVersion)"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj"/>
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
+  </ItemGroup>
 </Project>
--- a/demo/Semi.Avalonia.Demo.Drm/使用方法.md
+++ b/demo/Semi.Avalonia.Demo.Drm/使用方法.md
@@ -0,0 +1,77 @@
+# DRM启动步骤
+
+(Ubuntu18.04Server版本 虚拟机测试OK)  
+(Orange Pi Zero2 Ubuntu20.04-arm64 测试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
+```
+
+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)
+
+4.新建一个Avalonia项目，nuget里面添加Avalonia.LinuxFramebuffer包
+
+5.添加StartLinuxDrm代码(不知道怎么添加看Semi.Avalonia.Demo.Drm项目代码)
+
+6.发布程序到Linux(安装.net，怎么运行这些省略)
+            
+7.运行 ./Semi.Avalonia.Demo.Drm --drm
+
+## 报错处理：
+
+1. 报错内容
+
+>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发布文件不要裁剪，如果裁剪会报错
+         
+
+2. 报错内容
+>Unhandled exception. System.TypeInitializationException: The type initializer for 'SkiaSharp.SKImageInfo' threw an exception.**
+    **--->System.DllNotFoundException: Unable to load shared library 'libSkiaSharp' or one of its dependencies.In order to help diagnose loading problems, consider setting the LD_DEBUG environment variable: liblibSkiaSharp: cannot open shared object file: No such file or directory
+    at SkiaSharp.SkiaApi.sk_colortype_get_default_8888()
+    at SkiaSharp.SKImageInfo..cctor()
+
+解决方法：
+>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`，可能是显卡挂载到别的文件夹下了，待解决。
--- a/demo/Semi.Avalonia.Demo.Web/Assets/Fonts/SourceHanSansCN-Bold.otf
+++ b/demo/Semi.Avalonia.Demo.Web/Assets/Fonts/SourceHanSansCN-Bold.otf
--- a/demo/Semi.Avalonia.Demo.Web/Assets/Fonts/SourceHanSansCN-Regular.otf
+++ b/demo/Semi.Avalonia.Demo.Web/Assets/Fonts/SourceHanSansCN-Regular.otf
--- a/demo/Semi.Avalonia.Demo.Web/AvaloniaAppBuilderExtensions.cs
+++ b/demo/Semi.Avalonia.Demo.Web/AvaloniaAppBuilderExtensions.cs
@@ -11,6 +11,6 @@ public static class AvaloniaAppBuilderExtensions
        builder.With(new FontManagerOptions
        {
            DefaultFamilyName = DefaultFontFamily,
-            FontFallbacks = [new FontFallback { FontFamily = new FontFamily(DefaultFontFamily) }]
+            FontFallbacks = new[] { new FontFallback { FontFamily = new FontFamily(DefaultFontFamily) } }
        });
 }
--- a/demo/Semi.Avalonia.Demo.Web/Properties/AssemblyInfo.cs
+++ b/demo/Semi.Avalonia.Demo.Web/Properties/AssemblyInfo.cs
@@ -1 +0,0 @@
-[assembly: System.Runtime.Versioning.SupportedOSPlatform("browser")]
--- a/demo/Semi.Avalonia.Demo.Web/Properties/launchSettings.json
+++ b/demo/Semi.Avalonia.Demo.Web/Properties/launchSettings.json
@@ -6,8 +6,8 @@
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      },
-      "applicationUrl": "https://localhost:7169;http://localhost:5235",
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}"
    }
  }
-}
+}
--- a/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
+++ b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WebAssembly">
    <PropertyGroup>
-        <TargetFramework>net8.0-browser</TargetFramework>
        <OutputType>Exe</OutputType>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Nullable>enable</Nullable>
+        <TargetFramework>net8.0-browser</TargetFramework>
    </PropertyGroup>

    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo.Web/runtimeconfig.template.json
+++ b/demo/Semi.Avalonia.Demo.Web/runtimeconfig.template.json
@@ -1,10 +1,11 @@
 {
-    "wasmHostProperties": {
-        "perHostConfig": [
-            {
-                "name": "browser",
-                "host": "browser"
-            }
-        ]
-    }
+  "wasmHostProperties": {
+    "perHostConfig": [
+      {
+        "name": "browser",
+        "html-path": "index.html",
+        "Host": "browser"
+      }
+    ]
+  }
 }
--- a/demo/Semi.Avalonia.Demo.Web/wwwroot/Logo.svg
+++ b/demo/Semi.Avalonia.Demo.Web/wwwroot/Logo.svg
@@ -0,0 +1,5 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.4661 34.928C30.5364 34.928 30.6052 34.928 30.6754 34.928C32.8596 34.928 34.654 33.2918 34.9053 31.1752L34.9356 16.9955C34.6872 7.56697 26.9662 0 17.4777 0C7.83263 0 0.0137329 7.8189 0.0137329 17.464C0.0137329 27.0059 7.66618 34.7631 17.1687 34.928H30.4661Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5239 5.948C12.0268 5.948 7.42967 9.80117 6.286 14.954C7.38092 15.2609 8.18385 16.2664 8.18385 17.4593C8.18385 18.6523 7.38092 19.6577 6.286 19.9647C7.42966 25.1175 12.0268 28.9706 17.5239 28.9706C19.525 28.9706 21.4068 28.4601 23.0462 27.562V28.8927H29.0352V17.9365C29.0407 17.7908 29.0352 17.6063 29.0352 17.4593C29.0352 11.1018 23.8814 5.948 17.5239 5.948ZM12.0098 17.4593C12.0098 14.414 14.4786 11.9452 17.5239 11.9452C20.5693 11.9452 23.038 14.414 23.038 17.4593C23.038 20.5047 20.5693 22.9734 17.5239 22.9734C14.4786 22.9734 12.0098 20.5047 12.0098 17.4593Z" fill="#8B44AC"/>
+<path d="M7.36841 17.4517C7.36841 18.4691 6.54368 19.2938 5.52631 19.2938C4.50894 19.2938 3.6842 18.4691 3.6842 17.4517C3.6842 16.4343 4.50894 15.6096 5.52631 15.6096C6.54368 15.6096 7.36841 16.4343 7.36841 17.4517Z" fill="#8B44AC"/>
+</svg>
--- a/demo/Semi.Avalonia.Demo.Web/wwwroot/app.css
+++ b/demo/Semi.Avalonia.Demo.Web/wwwroot/app.css
@@ -1,58 +1,74 @@
-/* HTML styles for the splash screen */
-.avalonia-splash {
+:root {
+    --sat: env(safe-area-inset-top);
+    --sar: env(safe-area-inset-right);
+    --sab: env(safe-area-inset-bottom);
+    --sal: env(safe-area-inset-left);
+}
+
+/* HTML styles for the splash screen */
+
+.highlight {
+    color: white;
+    font-size: 2.5rem;
+    display: block;
+}
+
+.purple {
+    color: #8b44ac;
+}
+
+.icon {
+    opacity: 0.05;
+    height: 35%;
+    width: 35%;
    position: absolute;
-    height: 100%;
-    width: 100%;
-    background: white;
-    font-family: 'Outfit', sans-serif;
-    justify-content: center;
-    align-items: center;
-    display: flex;
+    background-repeat: no-repeat;
+    right: 0px;
+    bottom: 0px;
+    margin-right: 3%;
+    margin-bottom: 5%;
+    z-index: 5000;
+    background-position: right bottom;
    pointer-events: none;
 }

-/* Light theme styles */
-@media (prefers-color-scheme: light) {
-    .avalonia-splash {
-        background: white;
-    }
-
-    .avalonia-splash h2 {
-        color: #1b2a4e;
-    }
-
-    .avalonia-splash a {
-        color: #0D6EFD;
-    }
-}
-
-@media (prefers-color-scheme: dark) {
-    .avalonia-splash {
-        background: #1b2a4e;
-    }
-
-    .avalonia-splash h2 {
-        color: white;
-    }
-
-    .avalonia-splash a {
-        color: white;
-    }
-}
-
-.avalonia-splash h2 {
-    font-weight: 400;
-    font-size: 1.5rem;
-}
-
-.avalonia-splash a {
+#avalonia-splash a {
+    color: whitesmoke;
    text-decoration: none;
-    font-size: 2.5rem;
-    display: block;   
 }

-.avalonia-splash.splash-close {
-    transition: opacity 200ms, display 200ms;
-    display: none;
-    opacity: 0;
+.center {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100vh;
+}
+
+#avalonia-splash {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    color: whitesmoke;
+    background: #1b2a4e;
+    font-family: 'Nunito', sans-serif;
+    background-position: center;
+    background-size: cover;
+    background-repeat: no-repeat;
+    justify-content: center;
+    align-items: center;
+}
+
+.splash-close {
+    animation: fadeout 0.25s linear forwards;
+}
+
+@keyframes fadeout {
+    0% {
+        opacity: 100%;
+    }
+
+    100% {
+        opacity: 0;
+        visibility: collapse;
+    }
 }
--- a/demo/Semi.Avalonia.Demo.Web/wwwroot/favicon.ico
+++ b/demo/Semi.Avalonia.Demo.Web/wwwroot/favicon.ico
--- a/demo/Semi.Avalonia.Demo.Web/wwwroot/index.html
+++ b/demo/Semi.Avalonia.Demo.Web/wwwroot/index.html
@@ -5,33 +5,26 @@
    <title>Semi.Avalonia.Demo.Web</title>
    <meta charset="UTF-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="stylesheet" href="./app.css" />
-    <link rel="icon" type="image/x-icon" href="/favicon.ico">
 </head>

-<body style="margin: 0; overflow: hidden">
-<div id="out">
-    <div class="avalonia-splash">
-        <h2>
-            Powered by
-            <a href="https://www.avaloniaui.net/" target="_blank">
-                <svg width="266" height="52" viewBox="0 0 266 52" fill="none" xmlns="http://www.w3.org/2000/svg">
-                    <path d="M55.8592 47.3941C54.9035 47.3941 54.1184 47.1723 53.504 46.7285C52.9237 46.2848 52.5483 45.6875 52.3776 44.9365C52.2411 44.1856 52.3947 43.3493 52.8384 42.4277L65.9456 13.7045C66.4917 12.544 67.1403 11.7077 67.8912 11.1957C68.6421 10.6496 69.5125 10.3765 70.5024 10.3765C71.4923 10.3765 72.3627 10.6496 73.1136 11.1957C73.8645 11.7077 74.496 12.544 75.008 13.7045L88.2176 42.4277C88.6613 43.3493 88.8149 44.2027 88.6784 44.9877C88.576 45.7387 88.2347 46.336 87.6544 46.7797C87.0741 47.1893 86.3232 47.3941 85.4016 47.3941C84.2411 47.3941 83.3365 47.1211 82.688 46.5749C82.0736 46.0288 81.5275 45.1755 81.0496 44.0149L78.9279 39.0997H62.0415L59.9552 44.0149C59.4432 45.2096 58.8971 46.08 58.3168 46.6261C57.7707 47.1381 56.9515 47.3941 55.8592 47.3941ZM70.4 19.2853L64.6844 32.9045H76.2627L70.5024 19.2853H70.4Z" fill="currentColor"/>
-                    <path d="M101.869 47.3941C100.879 47.3941 100.009 47.1381 99.258 46.6261C98.5071 46.08 97.9096 45.2779 97.4659 44.2197L89.7348 26.4021C89.3593 25.5147 89.2228 24.6955 89.3252 23.9445C89.4276 23.1595 89.786 22.5451 90.4004 22.1013C91.0489 21.6235 91.9364 21.3845 93.0628 21.3845C93.9844 21.3845 94.7353 21.6064 95.3156 22.0501C95.8959 22.4597 96.4079 23.2619 96.8516 24.4565L102.018 37.95L107.552 24.4053C108.03 23.2448 108.559 22.4597 109.14 22.0501C109.72 21.6064 110.522 21.3845 111.546 21.3845C112.433 21.3845 113.133 21.6235 113.645 22.1013C114.191 22.5451 114.516 23.1424 114.618 23.8933C114.755 24.6443 114.618 25.4635 114.208 26.3509L106.324 44.2197C105.88 45.312 105.283 46.1141 104.532 46.6261C103.815 47.1381 102.927 47.3941 101.869 47.3941Z" fill="currentColor"/>
-                    <path d="M126.569 47.4965C124.726 47.4965 123.07 47.1381 121.602 46.4213C120.135 45.7045 118.991 44.7317 118.172 43.5029C117.353 42.2741 116.943 40.8917 116.943 39.3557C116.943 37.5125 117.421 36.0619 118.377 35.0037C119.333 33.9115 120.886 33.1435 123.036 32.6997C125.186 32.2219 128.037 31.9829 131.586 31.9829H133.43V35.9765H131.638C129.897 35.9765 128.48 36.0789 127.388 36.2837C126.33 36.4544 125.562 36.7616 125.084 37.2053C124.64 37.6491 124.418 38.2635 124.418 39.0485C124.418 40.0043 124.743 40.7893 125.391 41.4037C126.074 42.0181 127.047 42.3253 128.31 42.3253C129.299 42.3253 130.17 42.1035 130.921 41.6597C131.706 41.1819 132.32 40.5504 132.764 39.7653C133.208 38.9461 133.43 38.0245 133.43 37.0005V31.1125C133.43 29.6107 133.088 28.5525 132.406 27.9381C131.723 27.2896 130.562 26.9653 128.924 26.9653C128.002 26.9653 126.995 27.0848 125.903 27.3237C124.845 27.5285 123.667 27.8869 122.37 28.3989C121.619 28.7403 120.954 28.8256 120.374 28.6549C119.793 28.4501 119.35 28.1088 119.042 27.6309C118.735 27.1189 118.582 26.5728 118.582 25.9925C118.582 25.3781 118.752 24.7979 119.094 24.2517C119.435 23.6715 119.998 23.2448 120.783 22.9717C122.387 22.3232 123.889 21.8795 125.289 21.6405C126.722 21.4016 128.037 21.2821 129.231 21.2821C131.859 21.2821 134.01 21.6747 135.682 22.4597C137.389 23.2107 138.669 24.3883 139.522 25.9925C140.376 27.5627 140.802 29.5936 140.802 32.0853V43.4517C140.802 44.7147 140.495 45.6875 139.881 46.3701C139.266 47.0528 138.379 47.3941 137.218 47.3941C136.058 47.3941 135.153 47.0528 134.505 46.3701C133.89 45.6875 133.583 44.7147 133.583 43.4517L133.594 43.15C133.594 43.15 133.293 44.032 132.61 44.8853C131.962 45.7045 131.126 46.3531 130.102 46.8309C129.078 47.2747 127.9 47.4965 126.569 47.4965Z" fill="currentColor"/>
-                    <path d="M155.632 47.4965C152.594 47.4965 150.324 46.6603 148.822 44.9877C147.321 43.2811 146.57 40.7552 146.57 37.4101V14.3189C146.57 13.0219 146.894 12.0491 147.542 11.4005C148.225 10.7179 149.198 10.3765 150.461 10.3765C151.69 10.3765 152.628 10.7179 153.277 11.4005C153.959 12.0491 154.301 13.0219 154.301 14.3189V37.1029C154.301 38.5024 154.591 39.5435 155.171 40.2261C155.786 40.8747 156.588 41.1989 157.578 41.1989C157.851 41.1989 158.107 41.1819 158.346 41.1477C158.585 41.1136 158.841 41.0965 159.114 41.0965C159.66 41.0283 160.035 41.1989 160.24 41.6085C160.479 41.984 160.598 42.752 160.598 43.9125C160.598 44.9365 160.394 45.7216 159.984 46.2677C159.574 46.7797 158.943 47.1211 158.09 47.2917C157.748 47.3259 157.356 47.36 156.912 47.3941C156.468 47.4624 156.042 47.4965 155.632 47.4965Z" fill="currentColor"/>
-                    <path d="M175.453 47.4965C172.756 47.4965 170.401 46.9675 168.387 45.9093C166.407 44.8512 164.871 43.3323 163.779 41.3525C162.687 39.3728 162.141 37.0347 162.141 34.3381C162.141 32.3243 162.448 30.5152 163.062 28.9109C163.677 27.3067 164.564 25.9413 165.725 24.8149C166.919 23.6544 168.336 22.784 169.974 22.2037C171.613 21.5893 173.439 21.2821 175.453 21.2821C178.149 21.2821 180.487 21.8112 182.467 22.8693C184.481 23.9275 186.034 25.4293 187.126 27.3749C188.253 29.3205 188.816 31.6416 188.816 34.3381C188.816 36.3861 188.492 38.2123 187.843 39.8165C187.229 41.4208 186.341 42.8032 185.181 43.9637C184.02 45.1243 182.604 46.0117 180.931 46.6261C179.293 47.2064 177.467 47.4965 175.453 47.4965ZM175.453 41.7109C176.579 41.7109 177.552 41.4379 178.371 40.8917C179.19 40.3456 179.839 39.5435 180.317 38.4853C180.795 37.3931 181.034 36.0107 181.034 34.3381C181.034 31.8464 180.522 30.0203 179.498 28.8597C178.474 27.6651 177.125 27.0677 175.453 27.0677C174.361 27.0677 173.388 27.3237 172.534 27.8357C171.715 28.3477 171.067 29.1499 170.589 30.2421C170.145 31.3003 169.923 32.6656 169.923 34.3381C169.923 36.8299 170.435 38.6901 171.459 39.9189C172.483 41.1136 173.814 41.7109 175.453 41.7109Z" fill="currentColor"/>
-                    <path d="M197.411 47.3941C196.148 47.3941 195.175 47.0528 194.492 46.3701C193.844 45.6875 193.52 44.7147 193.52 43.4517V25.2757C193.52 24.0128 193.844 23.0571 194.492 22.4085C195.175 21.7259 196.114 21.3845 197.308 21.3845C198.537 21.3845 199.476 21.7259 200.124 22.4085C200.773 23.0571 201.112 24.1871 201.112 25.45C201.141 25.3955 202.48 23.552 204.016 22.6645C205.586 21.7429 207.361 21.2821 209.34 21.2821C211.354 21.2821 213.01 21.6747 214.307 22.4597C215.604 23.2107 216.577 24.3712 217.225 25.9413C217.874 27.4773 218.198 29.44 218.198 31.8293V43.4517C218.198 44.7147 217.857 45.6875 217.174 46.3701C216.525 47.0528 215.57 47.3941 214.307 47.3941C213.078 47.3941 212.122 47.0528 211.44 46.3701C210.791 45.6875 210.467 44.7147 210.467 43.4517V32.1877C210.467 30.4469 210.143 29.2011 209.494 28.4501C208.88 27.6651 207.924 27.2725 206.627 27.2725C204.988 27.2725 203.674 27.7845 202.684 28.8085C201.729 29.8325 201.251 31.1979 201.251 32.9045V43.4517C201.251 46.08 199.971 47.3941 197.411 47.3941Z" fill="currentColor"/>
-                    <path d="M227.861 47.3429C226.598 47.3429 225.625 46.9845 224.942 46.2677C224.294 45.5168 223.97 44.4757 223.97 43.1445V25.6341C223.97 24.2688 224.294 23.2277 224.942 22.5109C225.625 21.76 226.598 21.3845 227.861 21.3845C229.09 21.3845 230.028 21.76 230.677 22.5109C231.359 23.2277 231.701 24.2688 231.701 25.6341V43.1445C231.701 44.4757 231.377 45.5168 230.728 46.2677C230.079 46.9845 229.124 47.3429 227.861 47.3429ZM227.861 17.1861C226.427 17.1861 225.318 16.8619 224.533 16.2133C223.782 15.5307 223.406 14.5749 223.406 13.3461C223.406 12.0832 223.782 11.1275 224.533 10.4789C225.318 9.79629 226.427 9.45496 227.861 9.45496C229.294 9.45496 230.387 9.79629 231.138 10.4789C231.889 11.1275 232.264 12.0832 232.264 13.3461C232.264 14.5749 231.889 15.5307 231.138 16.2133C230.387 16.8619 229.294 17.1861 227.861 17.1861Z" fill="currentColor"/>
-                    <path d="M246.169 47.4965C244.326 47.4965 242.67 47.1381 241.202 46.4213C239.735 45.7045 238.591 44.7317 237.772 43.5029C236.953 42.2741 236.543 40.8917 236.543 39.3557C236.543 37.5125 237.021 36.0619 237.977 35.0037C238.933 33.9115 240.486 33.1435 242.636 32.6997C244.786 32.2219 247.637 31.9829 251.186 31.9829H253.03V35.9765H251.238C249.497 35.9765 248.08 36.0789 246.988 36.2837C245.93 36.4544 245.162 36.7616 244.684 37.2053C244.24 37.6491 244.018 38.2635 244.018 39.0485C244.018 40.0043 244.343 40.7893 244.991 41.4037C245.674 42.0181 246.647 42.3253 247.91 42.3253C248.899 42.3253 249.77 42.1035 250.521 41.6597C251.306 41.1819 251.92 40.5504 252.364 39.7653C252.808 38.9461 253.03 38.0245 253.03 37.0005V31.1125C253.03 29.6107 252.688 28.5525 252.006 27.9381C251.323 27.2896 250.162 26.9653 248.524 26.9653C247.602 26.9653 246.595 27.0848 245.503 27.3237C244.445 27.5285 243.267 27.8869 241.97 28.3989C241.219 28.7403 240.554 28.8256 239.974 28.6549C239.393 28.4501 238.95 28.1088 238.642 27.6309C238.335 27.1189 238.182 26.5728 238.182 25.9925C238.182 25.3781 238.352 24.7979 238.694 24.2517C239.035 23.6715 239.598 23.2448 240.383 22.9717C241.987 22.3232 243.489 21.8795 244.889 21.6405C246.322 21.4016 247.637 21.2821 248.831 21.2821C251.459 21.2821 253.61 21.6747 255.282 22.4597C256.989 23.2107 258.269 24.3883 259.122 25.9925C259.976 27.5627 260.402 29.5936 260.402 32.0853V43.4517C260.402 44.7147 260.095 45.6875 259.481 46.3701C258.866 47.0528 257.979 47.3941 256.818 47.3941C255.658 47.3941 254.753 47.0528 254.105 46.3701C253.49 45.6875 253.183 44.7147 253.183 43.4517V43.1789C253.183 43.3144 252.893 44.032 252.21 44.8853C251.562 45.7045 250.726 46.3531 249.702 46.8309C248.678 47.2747 247.5 47.4965 246.169 47.4965Z" fill="currentColor"/>
-                    <path d="M22.3444 20.9916C18.7895 20.9916 15.9077 24.0073 15.9077 27.7274C15.9077 31.4475 18.7895 34.4632 22.3444 34.4632C25.8993 34.4632 28.7811 31.4475 28.7811 27.7274C28.7811 24.0073 25.8993 20.9916 22.3444 20.9916Z" fill="currentColor"/>
-                    <path fill-rule="evenodd" clip-rule="evenodd" d="M37.6937 49.0667H21.9271C10.8346 48.8653 1.90173 39.3893 1.90173 27.7333C1.90173 15.9513 11.0289 6.40002 22.2878 6.40002C33.3638 6.40002 42.3768 15.6435 42.6667 27.161L42.6314 44.4824C42.338 47.0679 40.2434 49.0667 37.6937 49.0667ZM9.22617 24.667C10.5612 18.3725 15.9275 13.6656 22.3444 13.6656C29.7657 13.6656 35.7818 19.9613 35.7818 27.7274C35.7818 27.7857 35.7825 27.8488 35.7831 27.9136C35.7846 28.0483 35.7861 28.1901 35.7818 28.3103V41.6939H28.7907V40.0685C26.877 41.1655 24.6803 41.7892 22.3444 41.7892C15.9275 41.7892 10.5612 37.0823 9.22617 30.7878C10.5043 30.4129 11.4416 29.1847 11.4416 27.7274C11.4416 26.2701 10.5043 25.0419 9.22617 24.667ZM8.33937 29.9683C9.52696 29.9683 10.4897 28.9609 10.4897 27.7181C10.4897 26.4753 9.52696 25.4678 8.33937 25.4678C7.15178 25.4678 6.18904 26.4753 6.18904 27.7181C6.18904 28.9609 7.15178 29.9683 8.33937 29.9683Z" fill="currentColor"/>
-                </svg>
-            </a>
-        </h2>
+<body style="margin: 0px; overflow: hidden">
+    <div id="out">
+        <div id="avalonia-splash">
+            <div class="center">
+                <h2 class="purple">
+                    Powered by
+                    <a class="highlight" href="https://www.avaloniaui.net/" target="_blank">Avalonia UI</a>
+                </h2>
+            </div>
+            <img class="icon" src="Logo.svg" alt="Avalonia Logo" />
+        </div>
    </div>
-</div>
-<script type='module' src="./main.js"></script>
+    <script type='module' src="./main.js"></script>
 </body>

-</html>
+</html>
--- a/demo/Semi.Avalonia.Demo.Web/wwwroot/main.js
+++ b/demo/Semi.Avalonia.Demo.Web/wwwroot/main.js
@@ -10,4 +10,4 @@ const dotnetRuntime = await dotnet

 const config = dotnetRuntime.getConfig();

-await dotnetRuntime.runMain(config.mainAssemblyName, [globalThis.location.href]);
+await dotnetRuntime.runMain(config.mainAssemblyName, [window.location.search]);
--- a/demo/Semi.Avalonia.Demo/App.axaml
+++ b/demo/Semi.Avalonia.Demo/App.axaml
@@ -2,33 +2,13 @@
    x:Class="Semi.Avalonia.Demo.App"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True"
-    x:DataType="viewModels:ApplicationViewModel"
-    xmlns:semi="https://irihi.tech/semi"
-    xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels">
+    xmlns:semi="https://irihi.tech/semi">
    <Application.Styles>
-        <semi:SemiTheme Locale="zh-CN" />
-        <semi:SemiPopupAnimations />
-        <semi:ColorPickerSemiTheme />
-        <semi:DataGridSemiTheme />
-        <semi:TreeDataGridSemiTheme />
+        <!-- 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>
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="Themes/_index.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-    <TrayIcon.Icons>
-        <TrayIcons>
-            <TrayIcon Icon="/Assets/irihi.ico" MacOSProperties.IsTemplateIcon="true" ToolTipText="Semi Avalonia Demo">
-                <TrayIcon.Menu>
-                    <NativeMenu>
-                        <NativeMenuItem Header="Exit" Command="{Binding ExitCommand}" />
-                    </NativeMenu>
-                </TrayIcon.Menu>
-            </TrayIcon>
-        </TrayIcons>
-    </TrayIcon.Icons>
 </Application>
--- a/demo/Semi.Avalonia.Demo/App.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/App.axaml.cs
@@ -1,8 +1,6 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
-using Semi.Avalonia.Demo.ViewModels;
 using Semi.Avalonia.Demo.Views;

 namespace Semi.Avalonia.Demo;
@@ -12,7 +10,6 @@ public partial class App : Application
    public override void Initialize()
    {
        AvaloniaXamlLoader.Load(this);
-        this.DataContext = new ApplicationViewModel();
    }

    public override void OnFrameworkInitializationCompleted()
@@ -20,9 +17,6 @@ public partial class App : Application
        switch (ApplicationLifetime)
        {
            case IClassicDesktopStyleApplicationLifetime desktop:
-                // Line below is needed to remove Avalonia data validation.
-                // Without this line you will get duplicate validations from both Avalonia and CT
-                BindingPlugins.DataValidators.RemoveAt(0);
                desktop.MainWindow = new MainWindow();
                break;
            case ISingleViewApplicationLifetime singleView:
@@ -30,7 +24,6 @@ public partial class App : Application
                break;
        }

-        this.RegisterFollowSystemTheme();
        base.OnFrameworkInitializationCompleted();
    }
 }
--- a/demo/Semi.Avalonia.Demo/Assets/avalonia-logo.ico
+++ b/demo/Semi.Avalonia.Demo/Assets/avalonia-logo.ico
--- a/demo/Semi.Avalonia.Demo/Assets/irihi.ico
+++ b/demo/Semi.Avalonia.Demo/Assets/irihi.ico
--- a/demo/Semi.Avalonia.Demo/Constant/ColorTokens.cs
+++ b/demo/Semi.Avalonia.Demo/Constant/ColorTokens.cs
@@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Semi.Avalonia.Demo.Constant;
-
-public static class ColorTokens
-{
-    public static IReadOnlyList<Tuple<string, string>> PrimaryTokens { get; } =
-    [
-        new("SemiColorPrimary", "Primary"),
-        new("SemiColorPrimaryPointerover", "Primary Pointerover"),
-        new("SemiColorPrimaryActive", "Primary Active"),
-        new("SemiColorPrimaryDisabled", "Primary Disabled"),
-        new("SemiColorPrimaryLight", "Primary Light"),
-        new("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"),
-        new("SemiColorPrimaryLightActive", "Primary Light Active"),
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> SecondaryTokens { get; } =
-    [
-        new("SemiColorSecondary", "Secondary"),
-        new("SemiColorSecondaryPointerover", "Secondary Pointerover"),
-        new("SemiColorSecondaryActive", "Secondary Active"),
-        new("SemiColorSecondaryDisabled", "Secondary Disabled"),
-        new("SemiColorSecondaryLight", "Secondary Light"),
-        new("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"),
-        new("SemiColorSecondaryLightActive", "Secondary Light Active")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> TertiaryTokens { get; } =
-    [
-        new("SemiColorTertiary", "Tertiary"),
-        new("SemiColorTertiaryPointerover", "Tertiary Pointerover"),
-        new("SemiColorTertiaryActive", "Tertiary Active"),
-        new("SemiColorTertiaryLight", "Tertiary Light"),
-        new("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"),
-        new("SemiColorTertiaryLightActive", "Tertiary Light Active")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> InformationTokens { get; } =
-    [
-        new("SemiColorInformation", "Information"),
-        new("SemiColorInformationPointerover", "Information Pointerover"),
-        new("SemiColorInformationActive", "Information Active"),
-        new("SemiColorInformationDisabled", "Information Disabled"),
-        new("SemiColorInformationLight", "Information Light"),
-        new("SemiColorInformationLightPointerover", "Information Light Pointerover"),
-        new("SemiColorInformationLightActive", "Information Light Active")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> SuccessTokens { get; } =
-    [
-        new("SemiColorSuccess", "Success"),
-        new("SemiColorSuccessPointerover", "Success Pointerover"),
-        new("SemiColorSuccessActive", "Success Active"),
-        new("SemiColorSuccessDisabled", "Success Disabled"),
-        new("SemiColorSuccessLight", "Success Light"),
-        new("SemiColorSuccessLightPointerover", "Success Light Pointerover"),
-        new("SemiColorSuccessLightActive", "Success Light Active")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> WarningTokens { get; } =
-    [
-        new("SemiColorWarning", "Warning"),
-        new("SemiColorWarningPointerover", "Warning Pointerover"),
-        new("SemiColorWarningActive", "Warning Active"),
-        new("SemiColorWarningLight", "Warning Light"),
-        new("SemiColorWarningLightPointerover", "Warning Light Pointerover"),
-        new("SemiColorWarningLightActive", "Warning Light Active")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> DangerTokens { get; } =
-    [
-        new("SemiColorDanger", "Danger"),
-        new("SemiColorDangerPointerover", "Danger Pointerover"),
-        new("SemiColorDangerActive", "Danger Active"),
-        new("SemiColorDangerLight", "Danger Light"),
-        new("SemiColorDangerLightPointerover", "Danger Light Pointerover"),
-        new("SemiColorDangerLightActive", "Danger Light Active")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> TextTokens { get; } =
-    [
-        new("SemiColorText0", "Text 0"),
-        new("SemiColorText1", "Text 1"),
-        new("SemiColorText2", "Text 2"),
-        new("SemiColorText3", "Text 3")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> LinkTokens { get; } =
-    [
-        new("SemiColorLink", "Link"),
-        new("SemiColorLinkPointerover", "Link Pointerover"),
-        new("SemiColorLinkActive", "Link Active"),
-        new("SemiColorLinkVisited", "Link Visited")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> BackgroundTokens { get; } =
-    [
-        new("SemiColorBackground0", "Background 0"),
-        new("SemiColorBackground1", "Background 1"),
-        new("SemiColorBackground2", "Background 2"),
-        new("SemiColorBackground3", "Background 3"),
-        new("SemiColorBackground4", "Background 4")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> FillTokens { get; } =
-    [
-        new("SemiColorFill0", "Fill 0"),
-        new("SemiColorFill1", "Fill 1"),
-        new("SemiColorFill2", "Fill 2")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> BorderTokens { get; } =
-    [
-        new("SemiColorBorder", "Border"),
-        new("SemiColorFocusBorder", "Focus Border")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> DisabledTokens { get; } =
-    [
-        new("SemiColorDisabledText", "Disabled Text"),
-        new("SemiColorDisabledBorder", "Disabled Border"),
-        new("SemiColorDisabledBackground", "Disabled Background"),
-        new("SemiColorDisabledFill", "Disabled Fill")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> OtherTokens { get; } =
-    [
-        new("SemiColorWhite", "White"),
-        new("SemiColorBlack", "Black"),
-        new("SemiColorNavBackground", "Navigation Background"),
-        new("SemiColorOverlayBackground", "Overlay Background"),
-        new("SemiColorHighlightBackground", "Highlight Background"),
-        new("SemiColorHighlight", "Highlight Text")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> ShadowTokens { get; } =
-    [
-        new("SemiColorShadow", "Shadow"),
-        new("SemiShadowElevated", "Shadow Elevated")
-    ];
-}
--- a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml
+++ b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml
@@ -2,9 +2,13 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:controls="clr-namespace:Semi.Avalonia.Demo.Controls"
-    x:CompileBindings="True">
+    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>
    <ControlTheme x:Key="{x:Type controls:ColorDetailControl}" TargetType="controls:ColorDetailControl">
-        <Setter Property="Template">
+        <!--  Add Resources Here  -->
+        <Setter Property="controls:ColorDetailControl.Template">
            <ControlTemplate TargetType="controls:ColorDetailControl">
                <StackPanel>
                    <TextBlock
@@ -17,7 +21,7 @@
                        HorizontalAlignment="Stretch"
                        Background="{TemplateBinding Background}"
                        CornerRadius="6" />
-                    <Grid ColumnDefinitions="*, Auto" RowDefinitions="*, *, *, *, *, *, *, *">
+                    <Grid ColumnDefinitions="*, Auto" RowDefinitions="*, *, *, *, *, *, *">
                        <!--  Row 0-1-2 ResourceKey  -->
                        <TextBlock
                            Grid.Column="0"
@@ -34,26 +38,38 @@
                        <Button
                            Grid.Row="1"
                            Grid.Column="1"
+                            Classes="Tertiary"
                            Command="{Binding $parent[controls:ColorDetailControl].Copy}"
                            CommandParameter="{x:Static controls:ColorDetailControl.KEY_ResourceKey}"
-                            Theme="{DynamicResource  IconBorderlessButton}"
-                            Content="{StaticResource SemiIconCopy}" />
+                            Theme="{DynamicResource BorderlessButton}">
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{StaticResource CopyIcon}"
+                                Foreground="{Binding $parent[Button].Foreground}" />
+                        </Button>
                        <SelectableTextBlock
                            Grid.Row="2"
                            Grid.Column="0"
                            VerticalAlignment="Center"
-                            IsVisible="{TemplateBinding ColorResourceKey, Converter={x:Static ObjectConverters.IsNotNull}}"
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ColorResourceKey, Converter={x:Static ObjectConverters.IsNotNull}}"
                            Text="{TemplateBinding ColorResourceKey}" />
                        <Button
                            Grid.Row="2"
                            Grid.Column="1"
+                            Classes="Tertiary"
                            Command="{Binding $parent[controls:ColorDetailControl].Copy}"
                            CommandParameter="{x:Static controls:ColorDetailControl.KEY_ColorResourceKey}"
-                            IsVisible="{TemplateBinding ColorResourceKey, Converter={x:Static ObjectConverters.IsNotNull}}"
-                            Theme="{DynamicResource  IconBorderlessButton}"
-                            Content="{StaticResource SemiIconCopy}" />
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ColorResourceKey, Converter={x:Static ObjectConverters.IsNotNull}}"
+                            Theme="{DynamicResource BorderlessButton}">
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{StaticResource CopyIcon}"
+                                Foreground="{Binding $parent[Button].Foreground}" />
+                        </Button>

-                        <!--  Row 3-4-5 HEX  -->
+                        <!--  Row 3-4 HEX  -->
                        <TextBlock
                            Grid.Row="3"
                            Grid.Column="0"
@@ -61,7 +77,7 @@
                            Margin="4,8,0,0"
                            VerticalAlignment="Center"
                            Classes="Tertiary"
-                            Text="Hex" />
+                            Text="ARGB" />
                        <SelectableTextBlock
                            Grid.Row="4"
                            Grid.Column="0"
@@ -70,26 +86,20 @@
                        <Button
                            Grid.Row="4"
                            Grid.Column="1"
+                            Classes="Tertiary"
                            Command="{Binding $parent[controls:ColorDetailControl].Copy}"
                            CommandParameter="{x:Static controls:ColorDetailControl.KEY_Hex}"
-                            Theme="{DynamicResource  IconBorderlessButton}"
-                            Content="{StaticResource SemiIconCopy}" />
-                        <SelectableTextBlock
-                            Grid.Row="5"
-                            Grid.Column="0"
-                            VerticalAlignment="Center"
-                            Text="{TemplateBinding Hex2}" />
-                        <Button
-                            Grid.Row="5"
-                            Grid.Column="1"
-                            Command="{Binding $parent[controls:ColorDetailControl].Copy}"
-                            CommandParameter="{x:Static controls:ColorDetailControl.KEY_Hex2}"
-                            Theme="{DynamicResource  IconBorderlessButton}"
-                            Content="{StaticResource SemiIconCopy}" />
+                            Theme="{DynamicResource BorderlessButton}">
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{StaticResource CopyIcon}"
+                                Foreground="{Binding $parent[Button].Foreground}" />
+                        </Button>

-                        <!--  Row 6-7 Opacity  -->
+                        <!--  Row 5-6 Opacity  -->
                        <TextBlock
-                            Grid.Row="6"
+                            Grid.Row="5"
                            Grid.Column="0"
                            Grid.ColumnSpan="2"
                            Margin="4,8,0,0"
@@ -97,21 +107,26 @@
                            Classes="Tertiary"
                            Text="Opacity" />
                        <SelectableTextBlock
-                            Grid.Row="7"
+                            Grid.Row="6"
                            Grid.Column="0"
                            VerticalAlignment="Center"
                            Text="{TemplateBinding OpacityNumber}" />
                        <Button
-                            Grid.Row="7"
+                            Grid.Row="6"
                            Grid.Column="1"
+                            Classes="Tertiary"
                            Command="{Binding $parent[controls:ColorDetailControl].Copy}"
                            CommandParameter="{x:Static controls:ColorDetailControl.KEY_Opacity}"
-                            Theme="{DynamicResource  IconBorderlessButton}"
-                            Content="{StaticResource SemiIconCopy}" />
-
+                            Theme="{DynamicResource BorderlessButton}">
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{StaticResource CopyIcon}"
+                                Foreground="{Binding $parent[Button].Foreground}" />
+                        </Button>
                    </Grid>
                </StackPanel>
            </ControlTemplate>
        </Setter>
    </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
--- a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.cs
+++ b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.cs
@@ -1,32 +1,30 @@
 using System.Globalization;
-using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input.Platform;
 using Avalonia.Media;
-using Semi.Avalonia.Demo.Converters;
+using Avalonia.Media.Immutable;

 namespace Semi.Avalonia.Demo.Controls;

-public class ColorDetailControl : TemplatedControl
+public class ColorDetailControl: TemplatedControl
 {
    public const string KEY_ResourceKey = "ResourceKey";
    public const string KEY_Hex = "Hex";
-    public const string KEY_Hex2 = "Hex2";
    public const string KEY_Opacity = "Opacity";
    public const string KEY_ColorResourceKey = "ColorResourceKey";
-
-    public static readonly StyledProperty<string?> ResourceKeyProperty =
-        AvaloniaProperty.Register<ColorDetailControl, string?>(nameof(ResourceKey));
-
+    
+    public static readonly StyledProperty<string?> ResourceKeyProperty = AvaloniaProperty.Register<ColorDetailControl, string?>(
+        nameof(ResourceKey));
    public string? ResourceKey
    {
        get => GetValue(ResourceKeyProperty);
        set => SetValue(ResourceKeyProperty, value);
    }

-    public static readonly StyledProperty<string?> ResourceNameProperty =
-        AvaloniaProperty.Register<ColorDetailControl, string?>(nameof(ResourceName));
+    public static readonly StyledProperty<string?> ResourceNameProperty = AvaloniaProperty.Register<ColorDetailControl, string?>(
+        nameof(ResourceName));

    public string? ResourceName
    {
@@ -34,8 +32,8 @@ public class ColorDetailControl : TemplatedControl
        set => SetValue(ResourceNameProperty, value);
    }

-    public static readonly StyledProperty<string?> ColorResourceKeyProperty =
-        AvaloniaProperty.Register<ColorDetailControl, string?>(nameof(ColorResourceKey));
+    public static readonly StyledProperty<string?> ColorResourceKeyProperty = AvaloniaProperty.Register<ColorDetailControl, string?>(
+        nameof(ColorResourceKey));

    public string? ColorResourceKey
    {
@@ -43,39 +41,27 @@ public class ColorDetailControl : TemplatedControl
        set => SetValue(ColorResourceKeyProperty, value);
    }

-    public static readonly DirectProperty<ColorDetailControl, string?> HexProperty =
-        AvaloniaProperty.RegisterDirect<ColorDetailControl, string?>(nameof(Hex), o => o.Hex);
-
+    public static readonly DirectProperty<ColorDetailControl, string?> HexProperty = AvaloniaProperty.RegisterDirect<ColorDetailControl, string?>(
+        nameof(Hex), o => o.Hex);
    private string? _hex;
-
    public string? Hex
    {
        get => _hex;
        private set => SetAndRaise(HexProperty, ref _hex, value);
    }
-
-    private string? _hex2;
-
-    public static readonly DirectProperty<ColorDetailControl, string?> Hex2Property =
-        AvaloniaProperty.RegisterDirect<ColorDetailControl, string?>(nameof(Hex2), o => o.Hex2);
-
-    public string? Hex2
-    {
-        get => _hex2;
-        set => SetAndRaise(Hex2Property, ref _hex2, value);
-    }
-
-    public static readonly DirectProperty<ColorDetailControl, string?> OpacityNumberProperty =
-        AvaloniaProperty.RegisterDirect<ColorDetailControl, string?>(nameof(OpacityNumber), o => o.OpacityNumber);
-
+    
+    public static readonly DirectProperty<ColorDetailControl, string?> OpacityNumberProperty = AvaloniaProperty.RegisterDirect<ColorDetailControl, string?>(
+        nameof(OpacityNumber), o => o.OpacityNumber);
    private string? _opacityNumber;
-
    public string? OpacityNumber
    {
        get => _opacityNumber;
        private set => SetAndRaise(OpacityNumberProperty, ref _opacityNumber, value);
    }
-
+    
+    
+    
+    
    static ColorDetailControl()
    {
        BackgroundProperty.Changed.AddClassHandler<ColorDetailControl>((o, e) => o.OnBackgroundChanged(e));
@@ -84,36 +70,38 @@ public class ColorDetailControl : TemplatedControl
    private void OnBackgroundChanged(AvaloniaPropertyChangedEventArgs args)
    {
        var color = args.GetNewValue<IBrush>();
-        if (color is ISolidColorBrush brush)
+        if (color is ISolidColorBrush b)
        {
-            var hex1 = ColorConverter.ToHex.Convert(brush.Color, typeof(string), false, CultureInfo.InvariantCulture);
-            var hex2 = ColorConverter.ToHex.Convert(brush.Color, typeof(string), true, CultureInfo.InvariantCulture);
-            Hex = hex1 as string;
-            Hex2 = hex2 as string;
-            OpacityNumber = brush.Opacity.ToString(CultureInfo.InvariantCulture);
+            Hex = b.Color.ToString().ToUpperInvariant();
+            OpacityNumber = b.Opacity.ToString(CultureInfo.InvariantCulture);
        }
    }

-    public async Task Copy(object o)
+    public async void Copy(object o)
    {
        string? text = null;
        if (o is string s)
        {
-            text = s switch
+            switch (s)
            {
-                KEY_ResourceKey => ResourceKey,
-                KEY_Hex => Hex,
-                KEY_Hex2 => Hex2,
-                KEY_Opacity => OpacityNumber,
-                KEY_ColorResourceKey => ColorResourceKey,
-                _ => string.Empty
-            };
+                case KEY_ResourceKey: text = ResourceKey;
+                    break;
+                case KEY_Hex: text = Hex;
+                    break;
+                case KEY_Opacity: text = OpacityNumber;
+                    break;
+                case KEY_ColorResourceKey: text = ColorResourceKey;
+                    break;
+                default: text = string.Empty; break;
+            }
        }

        var toplevel = TopLevel.GetTopLevel(this);
        if (toplevel?.Clipboard is { } c)
        {
-            await c.SetTextAsync(text ?? string.Empty);
+            await c.SetTextAsync(text??string.Empty);
        }
+
    }
+    
 }
--- a/demo/Semi.Avalonia.Demo/Controls/ColorItemControl.axaml
+++ b/demo/Semi.Avalonia.Demo/Controls/ColorItemControl.axaml
@@ -2,23 +2,24 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:controls="using:Semi.Avalonia.Demo.Controls"
-    x:CompileBindings="True">
+    xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels"
+    x:CompileBindings="True"
+    x:DataType="viewModels:ColorItemViewModel">
    <Design.PreviewWith>
        <controls:ColorItemControl />
    </Design.PreviewWith>

    <ControlTheme x:Key="{x:Type controls:ColorItemControl}" TargetType="controls:ColorItemControl">
-        <Setter Property="Width" Value="120" />
-        <Setter Property="Height" Value="60" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Template">
+        <Setter Property="controls:ColorItemControl.Width" Value="120" />
+        <Setter Property="controls:ColorItemControl.Height" Value="60" />
+        <Setter Property="controls:ColorItemControl.Cursor" Value="Hand" />
+        <Setter Property="controls:ColorItemControl.Template">
            <ControlTemplate TargetType="controls:ColorItemControl">
+                <!--    -->
                <Border
                    Width="{TemplateBinding Width}"
                    Height="{TemplateBinding Height}"
                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
                    CornerRadius="{TemplateBinding CornerRadius}">
                    <Panel>
                        <TextBlock
@@ -41,7 +42,7 @@
            </ControlTemplate>
        </Setter>
        <Style Selector="^:pointerover /template/ TextBlock#PART_HexTextBlock">
-            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="TextBlock.IsVisible" Value="True" />
        </Style>
    </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
--- a/demo/Semi.Avalonia.Demo/Controls/ColorItemControl.cs
+++ b/demo/Semi.Avalonia.Demo/Controls/ColorItemControl.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using CommunityToolkit.Mvvm.Messaging;
@@ -8,8 +9,8 @@ namespace Semi.Avalonia.Demo.Controls;

 public class ColorItemControl : TemplatedControl
 {
-    public static readonly StyledProperty<string?> ColorNameProperty =
-        AvaloniaProperty.Register<ColorItemControl, string?>(nameof(ColorName));
+    public static readonly StyledProperty<string?> ColorNameProperty = AvaloniaProperty.Register<ColorItemControl, string?>(
+        nameof(ColorName));

    public string? ColorName
    {
@@ -25,18 +26,14 @@ public class ColorItemControl : TemplatedControl
        get => GetValue(HexProperty);
        set => SetValue(HexProperty, value);
    }
-
+    
    protected override void OnPointerPressed(PointerPressedEventArgs e)
    {
        base.OnPointerPressed(e);
-        switch (this.DataContext)
+        if (this.DataContext is ColorItemViewModel v)
        {
-            case ColorItemViewModel colorItemViewModel:
-                WeakReferenceMessenger.Default.Send(colorItemViewModel);
-                break;
-            case ColorResource colorResource:
-                WeakReferenceMessenger.Default.Send(colorResource);
-                break;
+            WeakReferenceMessenger.Default.Send(v);
        }
+        
    }
 }
--- a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml
+++ b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml
@@ -3,19 +3,20 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:controls="clr-namespace:Semi.Avalonia.Demo.Controls"
    xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-    xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
    x:CompileBindings="True"
    x:DataType="viewModels:FunctionalColorGroupViewModel">
+    <!--  Add Resources Here  -->
    <ControlTheme x:Key="{x:Type controls:FunctionalColorGroupControl}" TargetType="controls:FunctionalColorGroupControl">
-        <Setter Property="Template">
-            <ControlTemplate TargetType="controls:FunctionalColorGroupControl">
+        <!--  Add Resources Here  -->
+        <Setter Property="controls:FunctionalColorGroupControl.Template">
+            <ControlTemplate x:DataType="viewModels:FunctionalColorGroupViewModel" TargetType="controls:FunctionalColorGroupControl">
                <Grid RowDefinitions="Auto, *">
-                    <SelectableTextBlock
+                    <TextBlock
                        Grid.Row="0"
                        Margin="0,16,0,0"
                        Classes="H3"
                        Text="{TemplateBinding Title}"
-                        Theme="{DynamicResource TitleSelectableTextBlock}" />
+                        Theme="{DynamicResource TitleTextBlock}" />
                    <TabControl Grid.Row="1">
                        <TabItem Header="Light">
                            <DataGrid IsReadOnly="True" ItemsSource="{TemplateBinding LightColors}">
@@ -31,21 +32,27 @@
                                            </DataTemplate>
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>
-                                    <DataGridTemplateColumn Width="300" Header="ResourceKey">
+                                    <DataGridTemplateColumn Width="*" Header="ResourceKey">
                                        <DataGridTemplateColumn.CellTemplate>
                                            <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                    VerticalAlignment="Center"
                                                    Text="{Binding ResourceKey}" />
                                            </DataTemplate>
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>
+                                    <DataGridTextColumn
+                                        Width="*"
+                                        x:DataType="viewModels:ColorItemViewModel"
+                                        Binding="{ReflectionBinding ColorDisplayName}"
+                                        CanUserSort="False"
+                                        Header="Name" />
                                    <DataGridTemplateColumn Width="100" Header="Hex">
                                        <DataGridTemplateColumn.CellTemplate>
                                            <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                    VerticalAlignment="Center"
                                                    Text="{Binding Hex}" />
                                            </DataTemplate>
@@ -55,29 +62,13 @@
                                        <DataGridTemplateColumn.CellTemplate>
                                            <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
+                                                    HorizontalAlignment="Right"
                                                    VerticalAlignment="Center"
                                                    Text="{Binding Brush.Opacity}" />
                                            </DataTemplate>
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>
-                                    <DataGridTextColumn
-                                        Width="*"
-                                        x:DataType="viewModels:ColorItemViewModel"
-                                        Binding="{Binding ColorDisplayName}"
-                                        CanUserSort="False"
-                                        Header="Description" />
-                                    <DataGridTemplateColumn Width="100" Header="CopyText">
-                                        <DataGridTemplateColumn.CellTemplate>
-                                            <DataTemplate DataType="viewModels:ColorItemViewModel">
-                                                <Button
-                                                    Command="{Binding $parent[pages:PaletteDemo].Copy}"
-                                                    CommandParameter="{Binding CopyText}"
-                                                    Theme="{DynamicResource  IconBorderlessButton}"
-                                                    Content="{StaticResource SemiIconCopy}" />
-                                            </DataTemplate>
-                                        </DataGridTemplateColumn.CellTemplate>
-                                    </DataGridTemplateColumn>
                                </DataGrid.Columns>
                            </DataGrid>
                        </TabItem>
@@ -95,21 +86,27 @@
                                            </DataTemplate>
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>
-                                    <DataGridTemplateColumn Width="300" Header="ResourceKey">
+                                    <DataGridTemplateColumn Width="*" Header="ResourceKey">
                                        <DataGridTemplateColumn.CellTemplate>
                                            <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                    VerticalAlignment="Center"
                                                    Text="{Binding ResourceKey}" />
                                            </DataTemplate>
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>
+                                    <DataGridTextColumn
+                                        Width="*"
+                                        x:DataType="viewModels:ColorItemViewModel"
+                                        Binding="{ReflectionBinding ColorDisplayName}"
+                                        CanUserSort="False"
+                                        Header="Name" />
                                    <DataGridTemplateColumn Width="100" Header="Hex">
                                        <DataGridTemplateColumn.CellTemplate>
                                            <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                    VerticalAlignment="Center"
                                                    Text="{Binding Hex}" />
                                            </DataTemplate>
@@ -119,29 +116,13 @@
                                        <DataGridTemplateColumn.CellTemplate>
                                            <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
+                                                    HorizontalAlignment="Right"
                                                    VerticalAlignment="Center"
                                                    Text="{Binding Brush.Opacity}" />
                                            </DataTemplate>
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>
-                                    <DataGridTextColumn
-                                        Width="*"
-                                        x:DataType="viewModels:ColorItemViewModel"
-                                        Binding="{Binding ColorDisplayName}"
-                                        CanUserSort="False"
-                                        Header="Description" />
-                                    <DataGridTemplateColumn Width="100" Header="CopyText">
-                                        <DataGridTemplateColumn.CellTemplate>
-                                            <DataTemplate DataType="viewModels:ColorItemViewModel">
-                                                <Button
-                                                    Command="{Binding $parent[pages:PaletteDemo].Copy}"
-                                                    CommandParameter="{Binding CopyText}"
-                                                    Theme="{DynamicResource  IconBorderlessButton}"
-                                                    Content="{StaticResource SemiIconCopy}" />
-                                            </DataTemplate>
-                                        </DataGridTemplateColumn.CellTemplate>
-                                    </DataGridTemplateColumn>
                                </DataGrid.Columns>
                            </DataGrid>
                        </TabItem>
@@ -150,4 +131,4 @@
            </ControlTemplate>
        </Setter>
    </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
--- a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs
+++ b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs
@@ -4,38 +4,33 @@ using Avalonia.Controls.Primitives;

 namespace Semi.Avalonia.Demo.Controls;

-public class FunctionalColorGroupControl : TemplatedControl
+public class FunctionalColorGroupControl: TemplatedControl
 {
-    public static readonly StyledProperty<string?> TitleProperty =
-        AvaloniaProperty.Register<FunctionalColorGroupControl, string?>(nameof(Title));
-
+    public static readonly StyledProperty<string?> TitleProperty = AvaloniaProperty.Register<FunctionalColorGroupControl, string?>(
+        nameof(Title));
    public string? Title
    {
        get => GetValue(TitleProperty);
        set => SetValue(TitleProperty, value);
    }
-
-    public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable?> LightColorsProperty =
-        AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable?>(nameof(LightColors),
-            o => o.LightColors, (o, v) => o.LightColors = v);
-
+    
+    public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable?> LightColorsProperty = AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable?>(
+        nameof(LightColors), o => o.LightColors, (o, v) => o.LightColors = v);
    private IEnumerable? _lightColors;
-
    public IEnumerable? LightColors
    {
        get => _lightColors;
        set => SetAndRaise(LightColorsProperty, ref _lightColors, value);
    }
-
-    public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable?> DarkColorsProperty =
-        AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable?>(nameof(DarkColors),
-            o => o.DarkColors, (o, v) => o.DarkColors = v);
-
+    
+    public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable?> DarkColorsProperty = AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable?>(
+        nameof(DarkColors), o => o.DarkColors, (o, v) => o.DarkColors = v);
    private IEnumerable? _darkColors;
-
    public IEnumerable? DarkColors
    {
        get => _darkColors;
        set => SetAndRaise(DarkColorsProperty, ref _darkColors, value);
    }
+    
+    
 }
--- a/demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.cs
+++ b/demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.cs
@@ -1,41 +0,0 @@
-using System.Collections;
-using Avalonia;
-using Avalonia.Controls.Primitives;
-
-namespace Semi.Avalonia.Demo.Controls;
-
-public class ShadowGroupControl : TemplatedControl
-{
-    public static readonly StyledProperty<string?> TitleProperty =
-        AvaloniaProperty.Register<ShadowGroupControl, string?>(nameof(Title));
-
-    public string? Title
-    {
-        get => GetValue(TitleProperty);
-        set => SetValue(TitleProperty, value);
-    }
-
-    private IEnumerable? _lightShadows;
-
-    public static readonly DirectProperty<ShadowGroupControl, IEnumerable?> LightShadowsProperty =
-        AvaloniaProperty.RegisterDirect<ShadowGroupControl, IEnumerable?>(nameof(LightShadows),
-            o => o.LightShadows, (o, v) => o.LightShadows = v);
-
-    public IEnumerable? LightShadows
-    {
-        get => _lightShadows;
-        set => SetAndRaise(LightShadowsProperty, ref _lightShadows, value);
-    }
-
-    private IEnumerable? _darkShadows;
-
-    public static readonly DirectProperty<ShadowGroupControl, IEnumerable?> DarkShadowsProperty =
-        AvaloniaProperty.RegisterDirect<ShadowGroupControl, IEnumerable?>(nameof(DarkShadows),
-            o => o.DarkShadows, (o, v) => o.DarkShadows = v);
-
-    public IEnumerable? DarkShadows
-    {
-        get => _darkShadows;
-        set => SetAndRaise(DarkShadowsProperty, ref _darkShadows, value);
-    }
-}
--- a/demo/Semi.Avalonia.Demo/Converters/ColorConverter.cs
+++ b/demo/Semi.Avalonia.Demo/Converters/ColorConverter.cs
@@ -1,22 +0,0 @@
-using Avalonia.Data.Converters;
-using Avalonia.Media;
-
-namespace Semi.Avalonia.Demo.Converters;
-
-public static class ColorConverter
-{
-    public static readonly IValueConverter ToHex =
-        new FuncValueConverter<object, bool, string>(
-            (obj, withAlpha) =>
-                obj switch
-                {
-                    Color color => withAlpha
-                        ? $"#{color.A:X2}{color.R:X2}{color.G:X2}{color.B:X2}"
-                        : $"#{color.R:X2}{color.G:X2}{color.B:X2}",
-                    ISolidColorBrush brush => withAlpha
-                        ? $"#{brush.Color.A:X2}{brush.Color.R:X2}{brush.Color.G:X2}{brush.Color.B:X2}"
-                        : $"#{brush.Color.R:X2}{brush.Color.G:X2}{brush.Color.B:X2}",
-                    _ => string.Empty
-                }
-        );
-}
--- a/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml
@@ -1,237 +0,0 @@
-<UserControl
-    x:Class="Semi.Avalonia.Demo.Pages.AboutUs"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:collections="clr-namespace:Avalonia.Collections;assembly=Avalonia.Base"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:iri="https://irihi.tech/shared"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-    x:DataType="vm:AboutUsViewModel"
-    x:CompileBindings="True"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
-                    <collections:AvaloniaList x:Key="CanvasPalette" x:TypeArguments="Color">
-                        <Color>#FFFDB7A5</Color>
-                        <Color>#FFF6A0B5</Color>
-                        <Color>#FFDD9BE0</Color>
-                        <Color>#FFC4A7E9</Color>
-                        <Color>#FFA7B3E1</Color>
-                        <Color>#FF98CDFD</Color>
-                        <Color>#FF95D8F8</Color>
-                    </collections:AvaloniaList>
-                    <LinearGradientBrush x:Key="TileTitleForeground" StartPoint="">
-                        <GradientStop Offset="0.0" Color="#FFA20B48" />
-                        <GradientStop Offset="0.3" Color="#FF71168A" />
-                        <GradientStop Offset="0.6" Color="#FF46259E" />
-                        <GradientStop Offset="1.0" Color="#FF28348C" />
-                    </LinearGradientBrush>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Dark">
-                    <collections:AvaloniaList x:Key="CanvasPalette" x:TypeArguments="Color">
-                        <Color>#FFB42019</Color>
-                        <Color>#FFA41751</Color>
-                        <Color>#FF731F8A</Color>
-                        <Color>#FF582EA0</Color>
-                        <Color>#FF29368E</Color>
-                        <Color>#FF135CB8</Color>
-                        <Color>#FF0366A9</Color>
-                    </collections:AvaloniaList>
-                    <LinearGradientBrush x:Key="TileTitleForeground">
-                        <GradientStop Offset="0.0" Color="#FFF7A8BC" />
-                        <GradientStop Offset="0.3" Color="#FFDDA0E1" />
-                        <GradientStop Offset="0.6" Color="#FFBEADE9" />
-                        <GradientStop Offset="1.0" Color="#FFA7B4E2" />
-                    </LinearGradientBrush>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-            <ControlTheme x:Key="TileButton" TargetType="Button">
-                <Setter Property="HorizontalContentAlignment" Value="Left" />
-                <Setter Property="Padding" Value="24" />
-                <Setter Property="VerticalContentAlignment" Value="Center" />
-                <Setter Property="Template">
-                    <ControlTemplate>
-                        <Border
-                            Padding="0"
-                            Classes="Hover"
-                            Cursor="Hand"
-                            Theme="{DynamicResource CardBorder}">
-                            <Border.Transitions>
-                                <Transitions>
-                                    <BrushTransition Property="BorderBrush" Duration="0.5" />
-                                </Transitions>
-                            </Border.Transitions>
-                            <ContentPresenter
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}" />
-                        </Border>
-                    </ControlTemplate>
-                </Setter>
-                <Style Selector="^:pointerover /template/ Border">
-                    <Setter Property="BorderBrush" Value="{DynamicResource TileTitleForeground}" />
-                </Style>
-            </ControlTheme>
-        </ResourceDictionary>
-    </UserControl.Resources>
-    <UserControl.Styles>
-        <Style Selector="TextBlock.TileTitle">
-            <Setter Property="FontWeight" Value="700" />
-            <Setter Property="FontSize" Value="24" />
-            <Setter Property="Margin" Value="0 0 0 8" />
-            <Setter Property="Foreground" Value="{DynamicResource TileTitleForeground}" />
-        </Style>
-    </UserControl.Styles>
-    <Grid RowDefinitions="*, Auto">
-        <ScrollViewer>
-            <StackPanel>
-                <Grid
-                    Margin="0,96,0,48"
-                    HorizontalAlignment="Center"
-                    ColumnDefinitions="*, *"
-                    RowDefinitions="*, *">
-                    <iri:IrihiLogo
-                        Grid.Row="0"
-                        Grid.RowSpan="2"
-                        Grid.Column="0"
-                        Fill="{DynamicResource TextBlockSecondaryForeground}"
-                        Width="96"
-                        Margin="0,0,24,0"
-                        VerticalAlignment="Center" />
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="1"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Bottom"
-                        Classes="Secondary"
-                        FontSize="48"
-                        FontWeight="700"
-                        Text="铱泓科技" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        Margin="12,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Classes="Secondary"
-                        FontSize="16"
-                        Text="IRIHI Technology" />
-                </Grid>
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    Classes="Tertiary"
-                    FontSize="20"
-                    FontWeight="700"
-                    Text="聚焦生产力的美学进化" />
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    Classes="Tertiary"
-                    FontSize="20"
-                    Text="Aesthetic Evolution of Productivity" />
-                <UniformGrid
-                    MaxWidth="810"
-                    Margin="24"
-                    HorizontalAlignment="Center"
-                    Columns="2">
-                    <Button
-                        Margin="8"
-                        Command="{Binding NavigateCommand}"
-                        CommandParameter="semi"
-                        Theme="{DynamicResource TileButton}">
-                        <StackPanel HorizontalAlignment="Left">
-                            <TextBlock Classes="TileTitle" Text="Semi" />
-                            <StackPanel Orientation="Horizontal" Margin="0 0 0 8">
-                                <Label Theme="{DynamicResource TagLabel}" Classes="Blue Ghost">Open Source</Label>
-                            </StackPanel>
-                            <TextBlock Text="开箱即用的独立主题库" />
-                            <TextBlock Text="A ready-to-use standalone theme library" />
-                        </StackPanel>
-                    </Button>
-                    <Button
-                        Margin="8"
-                        Command="{Binding NavigateCommand}"
-                        CommandParameter="ursa"
-                        Theme="{DynamicResource TileButton}">
-                        <StackPanel HorizontalAlignment="Left">
-                            <TextBlock Classes="TileTitle" Text="Ursa" />
-                            <StackPanel Orientation="Horizontal" Margin="0 0 0 8">
-                                <Label Theme="{DynamicResource TagLabel}" Classes="Blue Ghost">Open Source</Label>
-                            </StackPanel>
-                            <TextBlock Text="高性能企业级桌面客户端控件库" />
-                            <TextBlock Text="High-performance enterprise level control library for desktop apps" />
-                        </StackPanel>
-                    </Button>
-                    <Button
-                        Margin="8"
-                        Command="{Binding NavigateCommand}"
-                        CommandParameter="mantra"
-                        Theme="{DynamicResource TileButton}">
-                        <StackPanel HorizontalAlignment="Left">
-                            <TextBlock Classes="TileTitle" Text="Mantra" />
-                            <StackPanel Orientation="Horizontal" Margin="0 0 0 8">
-                                <Label Theme="{DynamicResource TagLabel}" Classes="Purple Ghost">Commercial</Label>
-                            </StackPanel>
-                            <TextBlock Text="高性能文字排版渲染控件库" />
-                            <TextBlock Text="High-performance typography control library" />
-                        </StackPanel>
-                    </Button>
-                    <Button
-                        Margin="8"
-                        Command="{Binding NavigateCommand}"
-                        CommandParameter="huska"
-                        Theme="{DynamicResource TileButton}">
-                        <StackPanel HorizontalAlignment="Left">
-                            <TextBlock Classes="TileTitle" Text="Huska" />
-                            <StackPanel Orientation="Horizontal" Margin="0 0 0 8">
-                                <Label Theme="{DynamicResource TagLabel}" Classes="Purple Ghost">Commercial</Label>
-                            </StackPanel>
-                            <TextBlock Text="手绘风格主题库" />
-                            <TextBlock Text="Hand-drawing theme library" />
-                        </StackPanel>
-                    </Button>
-                </UniformGrid>
-            </StackPanel>
-        </ScrollViewer>
-        <StackPanel
-            Grid.Row="1"
-            Margin="0,16"
-            Spacing="32"
-            HorizontalAlignment="Center"
-            Orientation="Horizontal">
-            <StackPanel Orientation="Horizontal">
-                <HyperlinkButton
-                    Classes="WithIcon"
-                    VerticalAlignment="Center"
-                    Content="Homepage"
-                    NavigateUri="https://irihi.tech">
-                    <HyperlinkButton.Styles>
-                        <Style Selector=".WithIcon /template/ PathIcon">
-                            <Setter Property="Data" Value="{StaticResource SemiIconHome}" />
-                        </Style>
-                    </HyperlinkButton.Styles>
-                </HyperlinkButton>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <HyperlinkButton
-                    Classes="WithIcon"
-                    Content="GitHub"
-                    NavigateUri="https://github.com/irihitech">
-                    <HyperlinkButton.Styles>
-                        <Style Selector=".WithIcon /template/ PathIcon">
-                            <Setter Property="Data" Value="{StaticResource SemiIconGithubLogo}" />
-                        </Style>
-                    </HyperlinkButton.Styles>
-                </HyperlinkButton>
-            </StackPanel>
-        </StackPanel>
-    </Grid>
-</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml.cs
@@ -1,24 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Semi.Avalonia.Demo.ViewModels;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class AboutUs : UserControl
-{
-    public AboutUs()
-    {
-        InitializeComponent();
-        this.DataContext = new AboutUsViewModel();
-    }
-
-    protected override void OnLoaded(RoutedEventArgs e)
-    {
-        base.OnLoaded(e);
-        if (this.DataContext is AboutUsViewModel vm)
-        {
-            var launcher = TopLevel.GetTopLevel(this)?.Launcher;
-            vm.Launcher = launcher;
-        }
-    }
-}
--- a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
@@ -3,86 +3,72 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Semi.Avalonia.Demo.Pages"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
    d:DesignHeight="450"
    d:DesignWidth="800"
    x:CompileBindings="False"
-    x:DataType="vm:AutoCompleteBoxDemoViewModel"
+    x:DataType="local:AutoCompleteBoxDemoViewModel"
    mc:Ignorable="d">
    <Design.DataContext>
-        <vm:AutoCompleteBoxDemoViewModel />
+        <local:AutoCompleteBoxDemoViewModel />
    </Design.DataContext>
    <StackPanel HorizontalAlignment="Left" Spacing="20">
        <StackPanel.Styles>
            <Style Selector="AutoCompleteBox">
                <Setter Property="Width" Value="300" />
-                <Setter Property="ItemsSource">
-                    <Binding Path="States" />
-                </Setter>
-                <Setter Property="ItemTemplate">
-                    <DataTemplate DataType="vm:StateData">
-                        <TextBlock Text="{Binding Name}" />
-                    </DataTemplate>
-                </Setter>
            </Style>
        </StackPanel.Styles>
-
        <AutoCompleteBox
-            Watermark="Please select a State"
-            ValueMemberBinding="{Binding Name}" />
+            ItemsSource="{Binding States}"
+            ValueMemberBinding="{Binding Name}"
+            Watermark="Please select a State">
+            <AutoCompleteBox.ItemTemplate>
+                <DataTemplate DataType="local:StateData">
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </AutoCompleteBox.ItemTemplate>
+        </AutoCompleteBox>
        <AutoCompleteBox
            Classes="Large"
-            ValueMemberBinding="{ReflectionBinding Name}" />
+            ItemsSource="{Binding States}"
+            ValueMemberBinding="{ReflectionBinding Name}">
+            <AutoCompleteBox.ItemTemplate>
+                <DataTemplate DataType="local:StateData">
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </AutoCompleteBox.ItemTemplate>
+        </AutoCompleteBox>
        <AutoCompleteBox
            Classes="Small"
-            ValueMemberBinding="{ReflectionBinding Name}" />
+            ItemsSource="{Binding States}"
+            ValueMemberBinding="{ReflectionBinding Name}">
+            <AutoCompleteBox.ItemTemplate>
+                <DataTemplate DataType="local:StateData">
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </AutoCompleteBox.ItemTemplate>
+        </AutoCompleteBox>
        <AutoCompleteBox
            Classes="Bordered"
-            ValueMemberBinding="{ReflectionBinding Name}" />
+            ItemsSource="{Binding States}"
+            ValueMemberBinding="{ReflectionBinding Name}">
+            <AutoCompleteBox.ItemTemplate>
+                <DataTemplate DataType="local:StateData">
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </AutoCompleteBox.ItemTemplate>
+        </AutoCompleteBox>
        <AutoCompleteBox
            IsEnabled="False"
-            Watermark="Disabled"
-            ValueMemberBinding="{ReflectionBinding Name}" />
-        <AutoCompleteBox
-            InnerLeftContent="https://"
-            InnerRightContent=".com"
-            ValueMemberBinding="{ReflectionBinding Name}" />
-
-        <StackPanel Orientation="Horizontal">
-            <AutoCompleteBox
-                Width="100"
-                Classes="Large"
-                Watermark="Large"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox
-                Width="100"
-                Watermark="Default"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox
-                Width="100"
-                Classes="Small"
-                Watermark="Small"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-        </StackPanel>
-
-        <StackPanel Orientation="Horizontal">
-            <AutoCompleteBox
-                Width="100"
-                IsEnabled="False"
-                Watermark="Disabled"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox
-                Width="100"
-                Classes="Bordered"
-                Watermark="Bordered"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox
-                Width="100"
-                Classes="Bordered"
-                IsEnabled="False"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-        </StackPanel>
-
+            ItemsSource="{Binding States}"
+            ValueMemberBinding="{ReflectionBinding Name}"
+            Watermark="Disabled">
+            <AutoCompleteBox.ItemTemplate>
+                <DataTemplate DataType="local:StateData">
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </AutoCompleteBox.ItemTemplate>
+        </AutoCompleteBox>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml.cs
@@ -1,5 +1,9 @@
+using System.Collections.ObjectModel;
+using Avalonia;
 using Avalonia.Controls;
-using Semi.Avalonia.Demo.ViewModels;
+using Avalonia.Markup.Xaml;
+using System.Collections.Generic;
+using CommunityToolkit.Mvvm.ComponentModel;

 namespace Semi.Avalonia.Demo.Pages;

@@ -10,4 +14,86 @@ public partial class AutoCompleteBoxDemo : UserControl
        InitializeComponent();
        this.DataContext = new AutoCompleteBoxDemoViewModel();
    }
+}
+
+public class AutoCompleteBoxDemoViewModel: ObservableObject
+{
+    public ObservableCollection<StateData> States { get; set; }
+
+    public AutoCompleteBoxDemoViewModel()
+    {
+        States = new ObservableCollection<StateData>(GetStates());
+        
+    }
+
+    private static List<StateData> GetStates()
+    {
+        return new List<StateData>
+        {
+            new StateData("Alabama", "AL", "Montgomery"),
+            new StateData("Alaska", "AK", "Juneau"),
+            new StateData("Arizona", "AZ", "Phoenix"),
+            new StateData("Arkansas", "AR", "Little Rock"),
+            new StateData("California", "CA", "Sacramento"),
+            new StateData("Colorado", "CO", "Denver"),
+            new StateData("Connecticut", "CT", "Hartford"),
+            new StateData("Delaware", "DE", "Dover"),
+            new StateData("Florida", "FL", "Tallahassee"),
+            new StateData("Georgia", "GA", "Atlanta"),
+            new StateData("Hawaii", "HI", "Honolulu"),
+            new StateData("Idaho", "ID", "Boise"),
+            new StateData("Illinois", "IL", "Springfield"),
+            new StateData("Indiana", "IN", "Indianapolis"),
+            new StateData("Iowa", "IA", "Des Moines"),
+            new StateData("Kansas", "KS", "Topeka"),
+            new StateData("Kentucky", "KY", "Frankfort"),
+            new StateData("Louisiana", "LA", "Baton Rouge"),
+            new StateData("Maine", "ME", "Augusta"),
+            new StateData("Maryland", "MD", "Annapolis"),
+            new StateData("Massachusetts", "MA", "Boston"),
+            new StateData("Michigan", "MI", "Lansing"),
+            new StateData("Minnesota", "MN", "St. Paul"),
+            new StateData("Mississippi", "MS", "Jackson"),
+            new StateData("Missouri", "MO", "Jefferson City"),
+            new StateData("Montana", "MT", "Helena"),
+            new StateData("Nebraska", "NE", "Lincoln"),
+            new StateData("Nevada", "NV", "Carson City"),
+            new StateData("New Hampshire", "NH", "Concord"),
+            new StateData("New Jersey", "NJ", "Trenton"),
+            new StateData("New Mexico", "NM", "Santa Fe"),
+            new StateData("New York", "NY", "Albany"),
+            new StateData("North Carolina", "NC", "Raleigh"),
+            new StateData("North Dakota", "ND", "Bismarck"),
+            new StateData("Ohio", "OH", "Columbus"),
+            new StateData("Oklahoma", "OK", "Oklahoma City"),
+            new StateData("Oregon", "OR", "Salem"),
+            new StateData("Pennsylvania", "PA", "Harrisburg"),
+            new StateData("Rhode Island", "RI", "Providence"),
+            new StateData("South Carolina", "SC", "Columbia"),
+            new StateData("South Dakota", "SD", "Pierre"),
+            new StateData("Tennessee", "TN", "Nashville"),
+            new StateData("Texas", "TX", "Austin"),
+            new StateData("Utah", "UT", "Salt Lake City"),
+            new StateData("Vermont", "VT", "Montpelier"),
+            new StateData("Virginia", "VA", "Richmond"),
+            new StateData("Washington", "WA", "Olympia"),
+            new StateData("West Virginia", "WV", "Charleston"),
+            new StateData("Wisconsin", "WI", "Madison"),
+            new StateData("Wyoming", "WY", "Cheyenne"),
+        };
+    }
+}
+
+public class StateData
+{
+    public string Name { get; private set; }
+    public string Abbreviation { get; private set; }
+    public string Capital { get; private set; }
+
+    public StateData(string name, string abbreviation, string capital)
+    {
+        Name = name;
+        Abbreviation = abbreviation;
+        Capital = capital;
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml
@@ -18,4 +18,4 @@
            <TextBlock>Shadow on Pointerover</TextBlock>
        </Border>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
@@ -112,14 +112,14 @@
                    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" />
+                <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" />
@@ -139,7 +139,7 @@
            </StackPanel>
            <StackPanel Orientation="Horizontal" Spacing="8">
                <SplitButton Content="Default" Classes="Success" />
-                <SplitButton Content="Solid" Theme="{DynamicResource SolidSplitButton}" 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" />
@@ -165,7 +165,7 @@
            </StackPanel>
            <StackPanel Orientation="Horizontal" Spacing="8">
                <ToggleSplitButton Content="Default" Classes="Success" />
-                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True" />
+                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True"  />
                <ToggleSplitButton Content="Default" Classes="Success" IsEnabled="False" />
                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True" IsEnabled="False" />
            </StackPanel>
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml
@@ -32,4 +32,4 @@
                Text="A.S.I.A" />
        </ButtonSpinner>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml.cs
@@ -1,5 +1,7 @@
 using System;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -29,6 +31,7 @@ public partial class ButtonSpinnerDemo : UserControl

            txtBox.Text = _mountains[value];
        }
+
    }

    private readonly string[] _mountains = new[]
--- a/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml
@@ -8,22 +8,11 @@
    d:DesignWidth="800"
    mc:Ignorable="d">
    <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <StackPanel Orientation="Horizontal">
-            <CalendarDatePicker Classes="Large" />
-            <CalendarDatePicker />
-            <CalendarDatePicker Classes="Small" />
-        </StackPanel>
-
-        <StackPanel Orientation="Horizontal">
-            <CalendarDatePicker IsEnabled="False" />
-            <CalendarDatePicker Classes="Bordered" />
-            <CalendarDatePicker Classes="Bordered" IsEnabled="False" />
-        </StackPanel>
-
-        <CalendarDatePicker Width="500" />
-
+        <CalendarDatePicker />
        <CalendarDatePicker Classes="ClearButton" Width="200" />
-
+        <CalendarDatePicker Width="500" />
+        <CalendarDatePicker Classes="Large" />
+        <CalendarDatePicker Classes="Small" />
        <CalendarDatePicker
            Name="DatePicker2"
            Margin="0,0,0,8"
@@ -34,5 +23,9 @@
            CustomDateFormatString="ddd, MMM d"
            SelectedDateFormat="Custom" />
        <CalendarDatePicker Margin="0,0,0,8" Watermark="Watermark" />
+
+        <CalendarDatePicker IsEnabled="False" />
+        <CalendarDatePicker Classes="Bordered" />
+        <CalendarDatePicker Classes="Bordered" IsEnabled="False" />
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml
@@ -11,4 +11,4 @@
        <Calendar />
        <Calendar SelectionMode="SingleRange" />
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +10,9 @@ public partial class CalendarDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml
@@ -8,26 +8,20 @@
    d:DesignWidth="800"
    mc:Ignorable="d">
    <UserControl.Styles>
-        <Style Selector="Carousel">
+        <Style Selector="Border">
            <Setter Property="Height" Value="200" />
-            <Style Selector="^ TextBlock">
-                <Setter Property="HorizontalAlignment" Value="Center" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="Foreground" Value="#1C1F23" />
-            </Style>
        </Style>
-        <Style Selector="RadioButton">
-            <Setter Property="Theme" Value="{DynamicResource ButtonRadioButton}" />
+        <Style Selector="TextBlock">
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Foreground" Value="#1C1F23" />
        </Style>
    </UserControl.Styles>
    <StackPanel Spacing="20">
-        <Carousel Theme="{DynamicResource FullCarousel}"
-                  Classes.Dot="{Binding #DotButton.IsChecked}"
-                  Classes.Columnar="{Binding #ColumnarButton.IsChecked}"
-                  Classes.Line="{Binding #LineButton.IsChecked}"
-                  Classes.Left="{Binding #LeftButton.IsChecked}"
-                  Classes.Center="{Binding #CenterButton.IsChecked}"
-                  Classes.Right="{Binding #RightButton.IsChecked}">
+        <Carousel Theme="{DynamicResource FullCarousel}">
+            <Carousel.PageTransition>
+                <PageSlide Orientation="Horizontal" Duration="0.25" />
+            </Carousel.PageTransition>
            <Border Background="#EAF5FF">
                <TextBlock Text="Text 1" />
            </Border>
@@ -41,39 +35,39 @@
                <TextBlock Text="Text 4" />
            </Border>
        </Carousel>
-        <StackPanel Orientation="Horizontal" Spacing="8">
-            <TextBlock VerticalAlignment="Center" Text="Type" />
-            <Border Theme="{DynamicResource RadioButtonGroupBorder}">
-                <StackPanel Orientation="Horizontal">
-                    <RadioButton
-                        Name="DotButton"
-                        IsChecked="True"
-                        Content="Dot" />
-                    <RadioButton
-                        Name="ColumnarButton"
-                        Content="Columnar" />
-                    <RadioButton
-                        Name="LineButton"
-                        Content="Line" />
-                </StackPanel>
+        <Carousel Classes="Line" Theme="{DynamicResource FullCarousel}">
+            <Carousel.PageTransition>
+                <PageSlide Orientation="Horizontal" Duration="0.25" />
+            </Carousel.PageTransition>
+            <Border Background="#EAF5FF">
+                <TextBlock Text="Text 1" />
            </Border>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal" Spacing="8">
-            <TextBlock VerticalAlignment="Center" Text="Position" />
-            <Border Theme="{DynamicResource RadioButtonGroupBorder}">
-                <StackPanel Orientation="Horizontal">
-                    <RadioButton
-                        Name="LeftButton"
-                        IsChecked="True"
-                        Content="Left" />
-                    <RadioButton
-                        Name="CenterButton"
-                        Content="Center" />
-                    <RadioButton
-                        Name="RightButton"
-                        Content="Right" />
-                </StackPanel>
+            <Border Background="#F9F9F9">
+                <TextBlock Text="Text 2" />
            </Border>
-        </StackPanel>
+            <Border Background="#FFF8EA">
+                <TextBlock Text="Text 3" />
+            </Border>
+            <Border Background="#FEF2ED">
+                <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>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml.cs
@@ -1,4 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml
@@ -2,80 +2,33 @@
    x:Class="Semi.Avalonia.Demo.Pages.ColorPickerDemo"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:semi="https://irihi.tech/semi"
+    xmlns:colorPicker="clr-namespace:Semi.Avalonia.ColorPicker;assembly=Semi.Avalonia.ColorPicker"
+    xmlns:controls="using:Avalonia.Controls"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="1450"
+    d:DesignHeight="450"
    d:DesignWidth="800"
    mc:Ignorable="d">
-    <ScrollViewer>
-        <StackPanel Spacing="20">
-            <StackPanel Orientation="Horizontal" Spacing="20">
-                <ColorView Name="Test" ColorSpectrumShape="Ring" />
-                <ColorView ColorSpectrumShape="Box" />
-                <ColorView Palette="{DynamicResource SemiColorPalette}" />
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <ColorView
-                    Name="SimpleColorViewTest"
-                    HsvColor="hsv(180,80%,70%)"
-                    IsAlphaVisible="True"
-                    Theme="{StaticResource SimpleColorView}" />
-                <StackPanel>
-                    <TextBlock Text="{Binding #SimpleColorViewTest.HsvColor}" />
-                    <TextBlock Text="{Binding #SimpleColorViewTest.Color}" />
-                </StackPanel>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <ColorPicker ColorSpectrumShape="Ring">
-                    <ColorPicker.Palette>
-                        <FlatHalfColorPalette />
-                    </ColorPicker.Palette>
-                </ColorPicker>
-                <ColorPicker ColorSpectrumShape="Box">
-                    <ColorPicker.Palette>
-                        <semi:SemiColorLightPalette />
-                    </ColorPicker.Palette>
-                </ColorPicker>
-                <ColorPicker
-                    Theme="{DynamicResource HexColorPicker}"
-                    ColorSpectrumShape="Box">
-                    <ColorPicker.Palette>
-                        <semi:SemiColorLightPalette />
-                    </ColorPicker.Palette>
-                </ColorPicker>
-            </StackPanel>
-            <StackPanel HorizontalAlignment="Left">
-                <TextBlock Text="Use Style to customize button" />
-                <ColorPicker
-                    Margin="8"
-                    MinWidth="32"
-                    HsvColor="hsv(180,80%,70%)">
-                    <ColorPicker.Content>
-                        <Border
-                            Margin="1"
-                            Background="{Binding $parent[ColorPicker].HsvColor, Converter={StaticResource ToBrushConverter}}"
-                            CornerRadius="1" />
-                    </ColorPicker.Content>
-                    <ColorPicker.Styles>
-                        <Style Selector="DropDownButton">
-                            <Setter Property="Padding" Value="0" />
-                            <Style Selector="^ /template/ PathIcon">
-                                <Setter Property="IsVisible" Value="False" />
-                            </Style>
-                        </Style>
-                    </ColorPicker.Styles>
-                </ColorPicker>
-            </StackPanel>
-
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <ColorPicker
-                    Theme="{StaticResource SimpleColorPicker}"
-                    HsvColor="hsv(180,80%,70%)" />
-                <ColorPicker
-                    Theme="{StaticResource HexSimpleColorPicker}"
-                    HsvColor="hsv(180,80%,70%)" />
-            </StackPanel>
+    <StackPanel Spacing="20">
+        <StackPanel
+            VerticalAlignment="Top"
+            Orientation="Horizontal"
+            Spacing="20">
+            <ColorView ColorSpectrumShape="Ring" />
+            <ColorView ColorSpectrumShape="Box" />
+            <ColorView Palette="{DynamicResource SemiColorPalette}" />
        </StackPanel>
-    </ScrollViewer>
-</UserControl>
+        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
+            <ColorPicker ColorSpectrumShape="Ring">
+                <ColorPicker.Palette>
+                    <controls:FlatHalfColorPalette />
+                </ColorPicker.Palette>
+            </ColorPicker>
+            <ColorPicker ColorSpectrumShape="Box">
+                <ColorPicker.Palette>
+                    <colorPicker:SemiColorLightPalette />
+                </ColorPicker.Palette>
+            </ColorPicker>
+        </StackPanel>
+    </StackPanel>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml
@@ -4,49 +4,71 @@
    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"
-    d:DesignHeight="800"
+    d:DesignHeight="450"
    d:DesignWidth="800"
    mc:Ignorable="d">
-    <Design.DataContext>
-        <vm:ComboBoxDemoViewModel />
-    </Design.DataContext>
    <StackPanel Spacing="20">
-        <StackPanel.Styles>
-            <Style Selector="ComboBox">
-                <Setter Property="Width" Value="300" />
-                <Setter Property="ItemsSource" Value="{Binding Items}" />
-            </Style>
-        </StackPanel.Styles>
-
-        <ComboBox />
-        <ComboBox Classes="ClearButton" />
-        <ComboBox PlaceholderText="Please Select" />
-        <ComboBox IsEnabled="False" />
-        <ComboBox Classes="Large" IsEnabled="False" />
-        <ComboBox Classes="Small" />
-        <ComboBox Classes="Bordered" />
-        <ComboBox Classes="Bordered" IsEnabled="False" />
-        <ComboBox>
-            <ComboBox.SelectionBoxItemTemplate>
-                <DataTemplate DataType="x:String">
-                    <ContentControl BorderThickness="1"
-                                    BorderBrush="Gold"
-                                    Content="{Binding}" />
-                </DataTemplate>
-            </ComboBox.SelectionBoxItemTemplate>
+        <ComboBox Width="150">
+            <ComboBoxItem>Ding</ComboBoxItem>
+            <ComboBoxItem>Otter</ComboBoxItem>
+            <ComboBoxItem>Husky</ComboBoxItem>
+            <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>
+            <ComboBoxItem>Husky</ComboBoxItem>
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
+            <ComboBoxItem>Cass</ComboBoxItem>
+        </ComboBox>
+        <ComboBox Width="150" IsEnabled="False">
+            <ComboBoxItem>Ding</ComboBoxItem>
+            <ComboBoxItem>Otter</ComboBoxItem>
+            <ComboBoxItem>Husky</ComboBoxItem>
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
+            <ComboBoxItem>Cass</ComboBoxItem>
+        </ComboBox>
+        <ComboBox
+            Width="150"
+            Classes="Large"
+            IsEnabled="False">
+            <ComboBoxItem>Ding</ComboBoxItem>
+            <ComboBoxItem>Otter</ComboBoxItem>
+            <ComboBoxItem>Husky</ComboBoxItem>
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
+            <ComboBoxItem>Cass</ComboBoxItem>
+        </ComboBox>
+        <ComboBox Width="150" Classes="Small">
+            <ComboBoxItem>Ding</ComboBoxItem>
+            <ComboBoxItem>Otter</ComboBoxItem>
+            <ComboBoxItem>Husky</ComboBoxItem>
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
+            <ComboBoxItem>Cass</ComboBoxItem>
+        </ComboBox>
+        <ComboBox Width="150" Classes="Bordered">
+            <ComboBoxItem>Ding</ComboBoxItem>
+            <ComboBoxItem>Otter</ComboBoxItem>
+            <ComboBoxItem>Husky</ComboBoxItem>
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
+            <ComboBoxItem>Cass</ComboBoxItem>
+        </ComboBox>
+        <ComboBox
+            Width="150"
+            Classes="Bordered"
+            IsEnabled="False">
+            <ComboBoxItem>Ding</ComboBoxItem>
+            <ComboBoxItem>Otter</ComboBoxItem>
+            <ComboBoxItem>Husky</ComboBoxItem>
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
+            <ComboBoxItem>Cass</ComboBoxItem>
        </ComboBox>
-
-        <StackPanel Orientation="Horizontal">
-            <ComboBox Width="100" Classes="Large" PlaceholderText="Large" />
-            <ComboBox Width="100" PlaceholderText="Default" />
-            <ComboBox Width="100" Classes="Small" PlaceholderText="Small" />
-        </StackPanel>
-
-        <StackPanel Orientation="Horizontal">
-            <ComboBox Width="100" IsEnabled="False" PlaceholderText="Disabled" />
-            <ComboBox Width="100" Classes="Bordered" PlaceholderText="Bordered" />
-            <ComboBox Width="100" Classes="Bordered" IsEnabled="False" />
-        </StackPanel>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml.cs
@@ -1,5 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
-using Semi.Avalonia.Demo.ViewModels;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,6 +9,5 @@ public partial class ComboBoxDemo : UserControl
    public ComboBoxDemo()
    {
        InitializeComponent();
-        this.DataContext = new ComboBoxDemoViewModel();
    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
@@ -3,6 +3,7 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Semi.Avalonia.Demo.Pages"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels;assembly=Semi.Avalonia.Demo"
    d:DesignHeight="450"
@@ -12,54 +13,48 @@
    mc:Ignorable="d">
    <TabControl>
        <TabItem Header="DataGrid">
-            <Grid RowDefinitions="Auto, *">
-                <StackPanel Grid.Row="0" Orientation="Horizontal">
-                    <ToggleSwitch Content="Enable" Name="enable" IsChecked="True" />
-                    <ToggleSwitch Content="Inset Content" Name="inset" />
-                    <ToggleSwitch Content="ScrollBar Auto Hide" Name="autohide" />
-                </StackPanel>
-                <DataGrid Grid.Row="1"
-                          Margin="8"
-                          CanUserReorderColumns="True"
-                          CanUserResizeColumns="True"
-                          CanUserSortColumns="True"
-                          HeadersVisibility="All"
-                          IsReadOnly="True"
-                          Classes.InsetContent="{Binding #inset.IsChecked}"
-                          ScrollViewer.AllowAutoHide="{Binding #autohide.IsChecked}"
-                          IsEnabled="{Binding #enable.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>
+           <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>
-
-            </Grid>
+               </DataGrid>
+               
+           </Grid>
        </TabItem>
        <TabItem Header="Grouping">
            <DataGrid
@@ -102,7 +97,7 @@
                </DataGrid.Columns>
            </DataGrid>
        </TabItem>
-        <TabItem Name="EditableTab" Header="Editable">
+        <TabItem x:Name="EditableTab" Header="Editable">
            <Grid Margin="8" RowDefinitions="Auto,*,Auto">
                <StackPanel
                    Grid.Row="0"
@@ -110,14 +105,14 @@
                    Spacing="4">
                    <TextBlock VerticalAlignment="Center" Text="FontSize:" />
                    <Slider
-                        Name="FontSizeSlider"
+                        x:Name="FontSizeSlider"
                        Width="100"
                        VerticalAlignment="Center"
                        Maximum="30"
                        Minimum="5"
                        Value="14" />
                    <CheckBox
-                        Name="IsThreeStateCheckBox"
+                        x:Name="IsThreeStateCheckBox"
                        Content="IsThreeState"
                        IsChecked="False" />
                </StackPanel>
@@ -177,4 +172,4 @@
            </Grid>
        </TabItem>
    </TabControl>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml.cs
@@ -1,4 +1,18 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using Avalonia;
+using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
 using Semi.Avalonia.Demo.ViewModels;

 namespace Semi.Avalonia.Demo.Pages;
--- a/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml
@@ -80,4 +80,4 @@
            </TextBox>
        </StackPanel>
    </ScrollViewer>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +10,9 @@ public partial class DataValidationErrorsDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml
@@ -14,16 +14,5 @@
        <DatePicker IsEnabled="False" />
        <DatePicker Classes="Large" />
        <DatePicker Classes="Small" />
-        <StackPanel Orientation="Horizontal">
-            <DatePicker Classes="Large" />
-            <DatePicker />
-            <DatePicker Classes="Small" />
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <DatePicker IsEnabled="False" />
-            <DatePicker Classes="Bordered" />
-            <DatePicker Classes="Bordered" IsEnabled="False" />
-        </StackPanel>
-
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml.cs
@@ -1,4 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +11,14 @@ public partial class DatePickerDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+
+    public override void Render(DrawingContext context)
+    {
+        base.Render(context);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml
@@ -36,4 +36,4 @@
            </Expander>
        </Grid>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml
@@ -10,7 +10,6 @@
    <UserControl.Styles>
        <Style Selector="Button">
            <Setter Property="Margin" Value="8" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
        </Style>
    </UserControl.Styles>
    <Grid
--- a/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs
@@ -1,4 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Semi.Avalonia.Demo.Pages.GridSplitterDemo"
+    x:Class="Semi.Avalonia.Demo.Pages.GridSplitter"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -14,13 +14,13 @@
            RowDefinitions="*, Auto, *">
            <Border
                HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiGrey0Color}"
+                Background="#FEFBCB"
                CornerRadius="10" />
            <GridSplitter Grid.Row="1" ShowsPreview="True" />
            <Border
                Grid.Row="2"
                HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiGrey0Color}"
+                Background="#FEFBCB"
                CornerRadius="10" />
        </Grid>
        <Grid
@@ -29,14 +29,14 @@
            ColumnDefinitions="*, Auto, *">
            <Border
                HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiGrey0Color}"
+                Background="#FEFBCB"
                CornerRadius="10" />
            <GridSplitter Grid.Column="1" ShowsPreview="True" />
            <Border
                Grid.Column="2"
                HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiGrey0Color}"
+                Background="#FEFBCB"
                CornerRadius="10" />
        </Grid>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/GridSplitter.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/GridSplitter.axaml.cs
@@ -0,0 +1,18 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class GridSplitter : UserControl
+{
+    public GridSplitter()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
--- a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml.cs
@@ -1,11 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class GridSplitterDemo : UserControl
-{
-    public GridSplitterDemo()
-    {
-        InitializeComponent();
-    }
-}
--- a/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml
@@ -2,7 +2,7 @@
             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"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="1450"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
             x:Class="Semi.Avalonia.Demo.Pages.HeaderedContentControlDemo">
    <ScrollViewer>
        <StackPanel HorizontalAlignment="Left" Spacing="20">
@@ -27,18 +27,12 @@
            </WrapPanel>
            <TextBlock>GroupBox Theme</TextBlock>
            <HeaderedContentControl
-                Theme="{DynamicResource GroupBox}"
                HorizontalAlignment="Left"
-                MaxWidth="360">
-                <HeaderedContentControl.Header>
-                    <Panel>
-                        <SelectableTextBlock Text="Semi Design" />
-                        <HyperlinkButton HorizontalAlignment="Right" Content="更多" />
-                    </Panel>
-                </HeaderedContentControl.Header>
-                <HeaderedContentControl.Content>
-                    <SelectableTextBlock Text="Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。" />
-                </HeaderedContentControl.Content>
+                Theme="{DynamicResource GroupBox}"
+                Header="Semi Design"
+                Width="400"
+                Height="200">
+                <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。</TextBlock>
            </HeaderedContentControl>
        </StackPanel>
    </ScrollViewer>
--- a/demo/Semi.Avalonia.Demo/Pages/HighContrastDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/HighContrastDemo.axaml
@@ -1,328 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-             xmlns:controls="clr-namespace:Semi.Avalonia.Demo.Controls"
-             xmlns:cvt="clr-namespace:Semi.Avalonia.Demo.Converters"
-             xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
-             mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="1450"
-             x:DataType="vm:HighContrastDemoViewModel"
-             x:CompileBindings="True"
-             x:Class="Semi.Avalonia.Demo.Pages.HighContrastDemo">
-    <Design.DataContext>
-        <vm:HighContrastDemoViewModel />
-    </Design.DataContext>
-    <SplitView
-        Name="splitView"
-        CompactPaneLength="50"
-        DisplayMode="CompactInline"
-        IsPaneOpen="{Binding #toggle.IsChecked, Mode=TwoWay}"
-        OpenPaneLength="300"
-        PanePlacement="Right">
-        <SplitView.Pane>
-            <StackPanel>
-                <ToggleSwitch
-                    Name="toggle"
-                    HorizontalAlignment="Right"
-                    IsChecked="True"
-                    Theme="{DynamicResource IconBorderlessToggleSwitch}"
-                    Content="{StaticResource SemiIconSidebar}" />
-                <Border IsVisible="{Binding #splitView.IsPaneOpen}" Theme="{DynamicResource CardBorder}">
-                    <Panel>
-                        <TextBlock
-                            IsVisible="{Binding SelectedColorResource, Converter={x:Static ObjectConverters.IsNull}}"
-                            Text="Click on Color to Check Details"
-                            TextWrapping="Wrap" />
-                        <controls:ColorDetailControl
-                            Background="{Binding SelectedColorResource.Brush}"
-                            IsVisible="{Binding SelectedColorResource, Converter={x:Static ObjectConverters.IsNotNull}}"
-                            ResourceKey="{Binding SelectedColorResource.ResourceKey}"
-                            ResourceName="{Binding SelectedColorResource.ResourceKey}" />
-                    </Panel>
-                </Border>
-            </StackPanel>
-        </SplitView.Pane>
-        <SplitView.Content>
-            <ScrollViewer>
-                <StackPanel Spacing="10">
-                    <TextBlock Text="Theme Preview" FontWeight="SemiBold" />
-                    <ListBox
-                        Theme="{StaticResource PureCardRadioGroupListBox}"
-                        ItemsSource="{Binding ThemeVariants}"
-                        SelectedItem="{Binding SelectedThemeVariant}">
-                        <ListBox.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <WrapPanel Orientation="Horizontal" />
-                            </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel HorizontalAlignment="Left" Spacing="5" MinWidth="200">
-                                    <ThemeVariantScope RequestedThemeVariant="{Binding}">
-                                        <Border
-                                            Padding="5 25 5 5"
-                                            HorizontalAlignment="Left"
-                                            Background="{DynamicResource WindowColor}"
-                                            BorderBrush="{DynamicResource WindowTextColor}"
-                                            BorderThickness="1"
-                                            CornerRadius="3">
-                                            <StackPanel Spacing="10">
-                                                <StackPanel Orientation="Horizontal" Spacing="50">
-                                                    <StackPanel Spacing="5">
-                                                        <TextBlock
-                                                            FontSize="50"
-                                                            Text="Aa" />
-                                                        <StackPanel Orientation="Horizontal" Spacing="3">
-                                                            <StackPanel.Styles>
-                                                                <Style Selector="Border">
-                                                                    <Setter Property="BorderThickness" Value="1" />
-                                                                    <Setter Property="BorderBrush" Value="{DynamicResource WindowTextColor}" />
-                                                                    <Setter Property="CornerRadius" Value="5" />
-                                                                    <Setter Property="Width" Value="10" />
-                                                                    <Setter Property="Height" Value="{Binding $self.Width}" />
-                                                                </Style>
-                                                            </StackPanel.Styles>
-                                                            <Border Background="{DynamicResource WindowColor}" />
-                                                            <Border Background="{DynamicResource HotlightColor}" />
-                                                            <Border Background="{DynamicResource GrayTextColor}" />
-                                                            <Border Background="{DynamicResource HighlightTextColor}" />
-                                                            <Border Background="{DynamicResource HighlightColor}" />
-                                                        </StackPanel>
-                                                    </StackPanel>
-                                                    <Border
-                                                        BorderThickness="1"
-                                                        BorderBrush="{DynamicResource WindowTextColor}"
-                                                        CornerRadius="3"
-                                                        Padding="8">
-                                                        <Panel>
-                                                            <StackPanel Spacing="5">
-                                                                <Border
-                                                                    Width="50"
-                                                                    Height="1"
-                                                                    Background="{DynamicResource WindowTextColor}" />
-                                                                <Border
-                                                                    Height="1"
-                                                                    Background="{DynamicResource WindowTextColor}" />
-                                                                <Border
-                                                                    Height="1"
-                                                                    Background="{DynamicResource WindowTextColor}" />
-                                                            </StackPanel>
-                                                            <StackPanel
-                                                                HorizontalAlignment="Right"
-                                                                VerticalAlignment="Bottom"
-                                                                Orientation="Horizontal"
-                                                                Spacing="2">
-                                                                <Border
-                                                                    Width="20"
-                                                                    Height="5"
-                                                                    Background="{DynamicResource HighlightColor}"
-                                                                    CornerRadius="1" />
-                                                                <Border
-                                                                    Width="20"
-                                                                    Height="5"
-                                                                    BorderThickness="1"
-                                                                    BorderBrush="{DynamicResource ButtonTextColor}"
-                                                                    CornerRadius="1" />
-                                                            </StackPanel>
-                                                        </Panel>
-                                                    </Border>
-                                                </StackPanel>
-                                                <Border
-                                                    Height="1"
-                                                    Background="{DynamicResource WindowTextColor}" />
-                                            </StackPanel>
-                                        </Border>
-                                    </ThemeVariantScope>
-                                    <TextBlock Text="{Binding}" FontWeight="SemiBold" />
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-
-                    <ThemeVariantScope
-                        MinWidth="400"
-                        RequestedThemeVariant="{Binding SelectedThemeVariant}">
-                        <Border Padding="10" Background="{DynamicResource WindowColor}">
-                            <StackPanel Spacing="16">
-                                <StackPanel.Styles>
-                                    <Style Selector="TextBlock">
-                                        <Setter Property="HorizontalAlignment" Value="Left" />
-                                        <Setter Property="VerticalAlignment" Value="Center" />
-                                        <Setter Property="FontWeight" Value="SemiBold" />
-                                    </Style>
-                                    <Style Selector="controls|ColorItemControl.ColorBlock">
-                                        <Setter Property="Width" Value="44" />
-                                        <Setter Property="Height" Value="{Binding $self.Width}" />
-                                        <Setter Property="HorizontalAlignment" Value="Right" />
-                                        <Setter Property="BorderThickness" Value="1" />
-                                        <Setter Property="BorderBrush" Value="{DynamicResource WindowTextColor}" />
-                                        <Setter Property="CornerRadius" Value="3" />
-                                    </Style>
-                                </StackPanel.Styles>
-                                <Panel>
-                                    <TextBlock
-                                        Foreground="{DynamicResource WindowTextColor}"
-                                        Text="Background" />
-                                    <controls:ColorItemControl
-                                        Classes="ColorBlock"
-                                        DataContext="{Binding ColorResources[0]}"
-                                        Background="{DynamicResource  WindowColor}" />
-                                </Panel>
-                                <Panel>
-                                    <TextBlock
-                                        Foreground="{DynamicResource WindowTextColor}"
-                                        Text="Text" />
-                                    <controls:ColorItemControl
-                                        Classes="ColorBlock"
-                                        DataContext="{Binding ColorResources[1]}"
-                                        Background="{DynamicResource  WindowTextColor}" />
-                                </Panel>
-                                <Panel>
-                                    <TextBlock
-                                        Foreground="{DynamicResource HotlightColor}"
-                                        TextDecorations="Underline"
-                                        Text="Hyperlink" />
-                                    <controls:ColorItemControl
-                                        Classes="ColorBlock"
-                                        DataContext="{Binding ColorResources[2]}"
-                                        Background="{DynamicResource  HotlightColor}" />
-                                </Panel>
-                                <Panel>
-                                    <TextBlock
-                                        Foreground="{DynamicResource GrayTextColor}"
-                                        Text="Inactive Text" />
-                                    <controls:ColorItemControl
-                                        Classes="ColorBlock"
-                                        DataContext="{Binding ColorResources[3]}"
-                                        Background="{DynamicResource  GrayTextColor}" />
-                                </Panel>
-                                <Panel>
-                                    <TextBlock
-                                        Foreground="{DynamicResource HighlightTextColor}"
-                                        Background="{DynamicResource HighlightColor}"
-                                        Text="Selected text" />
-                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="4">
-                                        <controls:ColorItemControl
-                                            Classes="ColorBlock"
-                                            DataContext="{Binding ColorResources[4]}"
-                                            Background="{DynamicResource  HighlightTextColor}" />
-                                        <controls:ColorItemControl
-                                            Classes="ColorBlock"
-                                            DataContext="{Binding ColorResources[5]}"
-                                            Background="{DynamicResource  HighlightColor}" />
-                                    </StackPanel>
-                                </Panel>
-                                <Panel>
-                                    <Border
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        BorderBrush="{DynamicResource ButtonTextColor}"
-                                        Background="{DynamicResource ButtonFaceColor}"
-                                        BorderThickness="2"
-                                        CornerRadius="3">
-                                        <TextBlock
-                                            Foreground="{DynamicResource ButtonTextColor}"
-                                            Padding="16 6"
-                                            Text="Button text" />
-                                    </Border>
-                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="4">
-                                        <controls:ColorItemControl
-                                            Classes="ColorBlock"
-                                            DataContext="{Binding ColorResources[6]}"
-                                            Background="{DynamicResource  ButtonTextColor}" />
-                                        <controls:ColorItemControl
-                                            Classes="ColorBlock"
-                                            DataContext="{Binding ColorResources[7]}"
-                                            Background="{DynamicResource  ButtonFaceColor}" />
-                                    </StackPanel>
-                                </Panel>
-                            </StackPanel>
-                        </Border>
-                    </ThemeVariantScope>
-
-                    <DataGrid
-                        HorizontalAlignment="Left"
-                        CanUserSortColumns="False"
-                        AutoGenerateColumns="False"
-                        ItemsSource="{Binding ColorResources}"
-                        GridLinesVisibility="All"
-                        BorderBrush="{DynamicResource SemiColorBorder}"
-                        BorderThickness="1"
-                        Padding="5">
-                        <DataGrid.Columns>
-                            <DataGridTemplateColumn Header="Color">
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <controls:ColorItemControl
-                                            Width="40"
-                                            Height="20"
-                                            CornerRadius="3"
-                                            Background="{Binding Brush}" />
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-
-                            <DataGridTemplateColumn Header="ResourceKey">
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <SelectableTextBlock
-                                            Margin="12 0"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding ResourceKey}" />
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-
-                            <DataGridTemplateColumn Header="Hex">
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <SelectableTextBlock
-                                            Margin="12 0"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding Brush,
-                                                Converter={x:Static cvt:ColorConverter.ToHex},ConverterParameter={x:False}}" />
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-
-                            <DataGridTemplateColumn Header="Description">
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <SelectableTextBlock
-                                            Margin="12 0"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding Description}" />
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-
-                            <DataGridTemplateColumn Header="Pair With">
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <SelectableTextBlock
-                                            Margin="12 0"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding PairWith}" />
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-
-                            <DataGridTemplateColumn Width="100" Header="CopyText">
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate DataType="vm:ColorResource">
-                                        <Button
-                                            Command="{Binding $parent[pages:HighContrastDemo].Copy}"
-                                            CommandParameter="{Binding CopyText}"
-                                            Theme="{DynamicResource  IconBorderlessButton}"
-                                            Content="{StaticResource SemiIconCopy}" />
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-                        </DataGrid.Columns>
-                    </DataGrid>
-                </StackPanel>
-            </ScrollViewer>
-        </SplitView.Content>
-    </SplitView>
-</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/HighContrastDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/HighContrastDemo.axaml.cs
@@ -1,24 +0,0 @@
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Semi.Avalonia.Demo.ViewModels;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class HighContrastDemo : UserControl
-{
-    public HighContrastDemo()
-    {
-        InitializeComponent();
-        this.DataContext = new HighContrastDemoViewModel();
-    }
-
-    public async Task Copy(object? o)
-    {
-        if (o is null) return;
-        var toplevel = TopLevel.GetTopLevel(this);
-        if (toplevel?.Clipboard is { } c)
-        {
-            await c.SetTextAsync(o.ToString());
-        }
-    }
-}
--- a/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml
@@ -1,29 +0,0 @@
-<UserControl
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
-    x:Class="Semi.Avalonia.Demo.Pages.HyperlinkButtonDemo"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <HyperlinkButton
-            NavigateUri="https://www.irihi.tech/"
-            Content="IRIHI Homepage" />
-        <HyperlinkButton
-            Classes="Underline"
-            IsEnabled="False"
-            NavigateUri="https://www.irihi.tech/"
-            Content="Not Enabled" />
-        <HyperlinkButton
-            Classes="WithIcon Underline"
-            Height="20"
-            NavigateUri="https://www.irihi.tech/"
-            Content="带下划线的网页链接" />
-        <StackPanel Orientation="Horizontal">
-            <HyperlinkButton Classes="OnlyIcon" NavigateUri="https://www.irihi.tech/" />
-            <HyperlinkButton Classes="OnlyIcon" NavigateUri="https://www.irihi.tech/" />
-        </StackPanel>
-    </StackPanel>
-</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs
@@ -1,11 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class HyperlinkButtonDemo : UserControl
-{
-    public HyperlinkButtonDemo()
-    {
-        InitializeComponent();
-    }
-}
--- a/demo/Semi.Avalonia.Demo/Pages/IconDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/IconDemo.axaml
@@ -1,95 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:DataType="vm:IconDemoViewModel"
-             x:Class="Semi.Avalonia.Demo.Pages.IconDemo">
-    <Design.DataContext>
-        <vm:IconDemoViewModel />
-    </Design.DataContext>
-    <Grid RowDefinitions="Auto, *">
-        <TextBox
-            Grid.Row="0"
-            Width="600"
-            Margin="8"
-            Classes="ClearButton"
-            Text="{Binding SearchText}"
-            Watermark="Input Icon Name" />
-
-        <TabControl Grid.Row="1">
-            <TabItem Header="Filled Icons">
-                <ScrollViewer>
-                    <ItemsControl ItemsSource="{Binding FilteredFilledIcons}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <WrapPanel />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <Button Theme="{DynamicResource OutlineButton}"
-                                        Classes="Tertiary"
-                                        Padding="0"
-                                        Margin="10"
-                                        Width="200"
-                                        Height="120"
-                                        Click="Button_Clicked">
-                                    <StackPanel Spacing="8">
-                                        <PathIcon
-                                            Theme="{DynamicResource InnerPathIcon}"
-                                            HorizontalAlignment="Center"
-                                            Classes="ExtraLarge"
-                                            Data="{Binding Geometry}" />
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            FontSize="12"
-                                            FontWeight="Normal"
-                                            Text="{Binding ResourceKey}" />
-                                    </StackPanel>
-                                </Button>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                </ScrollViewer>
-            </TabItem>
-
-            <TabItem Header="Stroked Icons">
-                <ScrollViewer>
-                    <ItemsControl ItemsSource="{Binding FilteredStrokedIcons}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <WrapPanel />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <Button Theme="{DynamicResource OutlineButton}"
-                                        Classes="Tertiary"
-                                        Padding="0"
-                                        Margin="10"
-                                        Width="200"
-                                        Height="120"
-                                        Click="Button_Clicked">
-                                    <StackPanel Spacing="8">
-                                        <PathIcon
-                                            Theme="{DynamicResource InnerPathIcon}"
-                                            HorizontalAlignment="Center"
-                                            Classes="ExtraLarge"
-                                            Data="{Binding Geometry}" />
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            FontSize="12"
-                                            FontWeight="Normal"
-                                            Text="{Binding ResourceKey}" />
-                                    </StackPanel>
-                                </Button>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                </ScrollViewer>
-            </TabItem>
-        </TabControl>
-    </Grid>
-</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/IconDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/IconDemo.axaml.cs
@@ -1,47 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Notifications;
-using Avalonia.Controls.Primitives;
-using Avalonia.Input.Platform;
-using Avalonia.Interactivity;
-using Avalonia.Threading;
-using Semi.Avalonia.Demo.ViewModels;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class IconDemo : UserControl
-{
-    private IClipboard? _clipboard;
-    private WindowNotificationManager? _windowNotificationManager;
-
-    public IconDemo()
-    {
-        InitializeComponent();
-        this.DataContext = new IconDemoViewModel();
-    }
-
-    protected override async void OnApplyTemplate(TemplateAppliedEventArgs e)
-    {
-        base.OnApplyTemplate(e);
-        var vm = this.DataContext as IconDemoViewModel;
-        await Dispatcher.UIThread.InvokeAsync(() => { vm?.InitializeResources(); });
-    }
-
-    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
-    {
-        base.OnAttachedToVisualTree(e);
-        var topLevel = TopLevel.GetTopLevel(this);
-        _windowNotificationManager = new WindowNotificationManager(topLevel) { MaxItems = 3 };
-        _clipboard = topLevel?.Clipboard;
-    }
-
-    private async void Button_Clicked(object sender, RoutedEventArgs e)
-    {
-        if (_clipboard is null) return;
-        if (sender is not Button { DataContext: IconItem s }) return;
-        await _clipboard.SetTextAsync(s.ResourceKey);
-        _windowNotificationManager?.Show(
-            new Notification("Copied", s.ResourceKey),
-            NotificationType.Success);
-    }
-}
--- a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
@@ -4,7 +4,7 @@
    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="800"
+    d:DesignHeight="450"
    d:DesignWidth="800"
    mc:Ignorable="d">
    <ScrollViewer>
@@ -13,13 +13,15 @@
                <Style Selector="Label">
                    <Setter Property="Margin" Value="4" />
                </Style>
-                <Style Selector="Grid > TextBlock">
-                    <Setter Property="VerticalAlignment" Value="Center" />
-                    <Setter Property="Margin" Value="4" />
-                </Style>
            </StackPanel.Styles>
            <ScrollViewer HorizontalScrollBarVisibility="Auto">
                <StackPanel Orientation="Horizontal">
+                    <StackPanel.Styles>
+                        <Style Selector="Label, TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                            <Setter Property="Margin" Value="4" />
+                        </Style>
+                    </StackPanel.Styles>
                    <HeaderedContentControl
                        Width="400"
                        Height="400"
@@ -30,62 +32,62 @@
                        <Grid
                            VerticalAlignment="Top"
                            ColumnDefinitions="Auto, *"
-                            RowDefinitions="*,*,*,*,*,*,*,*,*,*,*">
-                            <TextBlock Grid.Row="0" Grid.Column="0">Classes</TextBlock>
-                            <TextBlock Grid.Row="1" Grid.Column="0">-</TextBlock>
-                            <TextBlock Grid.Row="2" Grid.Column="0">Secondary</TextBlock>
-                            <TextBlock Grid.Row="3" Grid.Column="0">Tertiary</TextBlock>
-                            <TextBlock Grid.Row="4" Grid.Column="0">Quaternary</TextBlock>
-                            <TextBlock Grid.Row="5" Grid.Column="0">Success</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">Mark</TextBlock>
-                            <TextBlock Grid.Row="9" Grid.Column="0">Code</TextBlock>
-                            <Label Grid.Row="1" Grid.Column="1">Text</Label>
+                            RowDefinitions="*,*,*,*,*,*,*,*,*,*,*,*">
+                            <TextBlock Grid.Row="1" Grid.Column="0">Classes</TextBlock>
+                            <TextBlock Grid.Row="2" Grid.Column="0">-</TextBlock>
+                            <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="9" Grid.Column="0">Mark</TextBlock>
+                            <TextBlock Grid.Row="10" Grid.Column="0">Code</TextBlock>
+                            <Label Grid.Row="2" Grid.Column="1">Text</Label>
                            <Label
-                                Grid.Row="2"
+                                Grid.Row="3"
                                Grid.Column="1"
                                Classes="Secondary">
                                Secondary
                            </Label>
                            <Label
-                                Grid.Row="3"
+                                Grid.Row="4"
                                Grid.Column="1"
                                Classes="Tertiary">
                                Tertiary
                            </Label>
                            <Label
-                                Grid.Row="4"
+                                Grid.Row="5"
                                Grid.Column="1"
                                Classes="Quaternary">
                                Quaternary
                            </Label>
                            <Label
-                                Grid.Row="5"
+                                Grid.Row="6"
                                Grid.Column="1"
                                Classes="Success">
                                Success
                            </Label>
                            <Label
-                                Grid.Row="6"
+                                Grid.Row="7"
                                Grid.Column="1"
                                Classes="Warning">
                                Warning
                            </Label>
                            <Label
-                                Grid.Row="7"
+                                Grid.Row="8"
                                Grid.Column="1"
                                Classes="Danger">
                                Danger
                            </Label>
                            <Label
-                                Grid.Row="8"
+                                Grid.Row="9"
                                Grid.Column="1"
                                Classes="Mark">
                                Default Mark
                            </Label>
                            <Label
-                                Grid.Row="9"
+                                Grid.Row="10"
                                Grid.Column="1"
                                Classes="Code">
                                Code
@@ -102,51 +104,51 @@
                        <Grid
                            VerticalAlignment="Top"
                            ColumnDefinitions="Auto, *"
-                            RowDefinitions="*,*,*,*,*,*,*">
-                            <TextBlock Grid.Row="0" Grid.Column="0">Classes</TextBlock>
-                            <TextBlock Grid.Row="1" Grid.Column="0">H1</TextBlock>
-                            <TextBlock Grid.Row="2" Grid.Column="0">H2</TextBlock>
-                            <TextBlock Grid.Row="3" Grid.Column="0">H3</TextBlock>
-                            <TextBlock Grid.Row="4" Grid.Column="0">H4</TextBlock>
-                            <TextBlock Grid.Row="5" Grid.Column="0">H5</TextBlock>
-                            <TextBlock Grid.Row="6" Grid.Column="0">H6</TextBlock>
+                            RowDefinitions="*,*,*,*,*,*,*,*">
+                            <TextBlock Grid.Row="1" Grid.Column="0">Classes</TextBlock>
+                            <TextBlock Grid.Row="2" Grid.Column="0">H1</TextBlock>
+                            <TextBlock Grid.Row="3" Grid.Column="0">H2</TextBlock>
+                            <TextBlock Grid.Row="4" Grid.Column="0">H3</TextBlock>
+                            <TextBlock Grid.Row="5" Grid.Column="0">H4</TextBlock>
+                            <TextBlock Grid.Row="6" Grid.Column="0">H5</TextBlock>
+                            <TextBlock Grid.Row="7" Grid.Column="0">H6</TextBlock>
                            <Label
-                                Grid.Row="1"
+                                Grid.Row="2"
                                Grid.Column="1"
                                Classes="H1"
                                Theme="{StaticResource TitleLabel}">
                                Header 1
                            </Label>
                            <Label
-                                Grid.Row="2"
+                                Grid.Row="3"
                                Grid.Column="1"
                                Classes="H2"
                                Theme="{StaticResource TitleLabel}">
                                Header 2
                            </Label>
                            <Label
-                                Grid.Row="3"
+                                Grid.Row="4"
                                Grid.Column="1"
                                Classes="H3"
                                Theme="{StaticResource TitleLabel}">
                                Header 3
                            </Label>
                            <Label
-                                Grid.Row="4"
+                                Grid.Row="5"
                                Grid.Column="1"
                                Classes="H4"
                                Theme="{StaticResource TitleLabel}">
                                Header 4
                            </Label>
                            <Label
-                                Grid.Row="5"
+                                Grid.Row="6"
                                Grid.Column="1"
                                Classes="H5"
                                Theme="{StaticResource TitleLabel}">
                                Header 5
                            </Label>
                            <Label
-                                Grid.Row="6"
+                                Grid.Row="7"
                                Grid.Column="1"
                                Classes="H6"
                                Theme="{StaticResource TitleLabel}">
@@ -221,4 +223,4 @@
            </WrapPanel>
        </StackPanel>
    </ScrollViewer>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml
@@ -16,7 +16,7 @@
                Header="Default">
                <ScrollViewer>
                    <StackPanel Spacing="20">
-                        <TextBlock Text="Theme: Default" />
+                        <TextBlock Text="Theme: Default"/>
                        <ListBox ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                        <ListBox IsEnabled="False">
                            <ListBoxItem IsSelected="True">Avalonia</ListBoxItem>
@@ -31,7 +31,7 @@
                Theme="{DynamicResource GroupBox}"
                Header="RadioGroupListBox">
                <StackPanel Spacing="20">
-                    <TextBlock Text="Theme: RadioGroupListBox" />
+                    <TextBlock Text="Theme: RadioGroupListBox"/>
                    <ListBox
                        Theme="{DynamicResource RadioGroupListBox}"
                        ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
@@ -40,7 +40,7 @@
                        <ListBoxItem IsSelected="True">WPF</ListBoxItem>
                    </ListBox>

-                    <TextBlock Text="Theme: ButtonRadioGroupListBox" />
+                    <TextBlock Text="Theme: ButtonRadioGroupListBox"/>
                    <StackPanel Orientation="Horizontal">
                        <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
                            <ListBox Theme="{DynamicResource ButtonRadioGroupListBox}">
@@ -93,7 +93,7 @@
                        </Border>
                    </StackPanel>

-                    <TextBlock Text="Theme: CardRadioGroupListBox" />
+                    <TextBlock Text="Theme: CardRadioGroupListBox"/>
                    <ListBox Theme="{DynamicResource CardRadioGroupListBox}"
                             ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                    <ListBox Theme="{DynamicResource CardRadioGroupListBox}" IsEnabled="False">
@@ -101,7 +101,7 @@
                        <ListBoxItem>WPF</ListBoxItem>
                    </ListBox>

-                    <TextBlock Text="Theme: PureCardRadioGroupListBox" />
+                    <TextBlock Text="Theme: PureCardRadioGroupListBox"/>
                    <ListBox Theme="{DynamicResource PureCardRadioGroupListBox}"
                             ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                    <ListBox Theme="{DynamicResource PureCardRadioGroupListBox}" IsEnabled="False">
@@ -117,25 +117,25 @@
                Header="CheckGroupListBox">
                <ScrollViewer>
                    <StackPanel Spacing="20">
-                        <TextBlock Text="Theme: CheckGroupListBox" />
+                        <TextBlock Text="Theme: CheckGroupListBox"/>
                        <ListBox
-                            SelectionMode="Multiple,Toggle"
+                            SelectionMode="Multiple"
                            Theme="{DynamicResource CheckGroupListBox}"
                            ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                        <ListBox Theme="{DynamicResource CheckGroupListBox}"
-                                 SelectionMode="Multiple,Toggle"
+                                 SelectionMode="Multiple"
                                 IsEnabled="False">
                            <ListBoxItem IsSelected="True">Avalonia</ListBoxItem>
                            <ListBoxItem>WPF</ListBoxItem>
                        </ListBox>

-                        <TextBlock Text="Theme: CardCheckGroupListBox" />
+                        <TextBlock Text="Theme: CardCheckGroupListBox"/>
                        <ListBox
-                            SelectionMode="Multiple,Toggle"
+                            SelectionMode="Multiple"
                            Theme="{DynamicResource CardCheckGroupListBox}"
                            ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                        <ListBox Theme="{DynamicResource CardCheckGroupListBox}"
-                                 SelectionMode="Multiple,Toggle"
+                                 SelectionMode="Multiple"
                                 IsEnabled="False">
                            <ListBoxItem>Avalonia</ListBoxItem>
                            <ListBoxItem IsSelected="True">WPF</ListBoxItem>
--- a/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml
@@ -8,13 +8,8 @@
    d:DesignWidth="800"
    mc:Ignorable="d">
    <StackPanel HorizontalAlignment="Left" Spacing="10">
-        <StackPanel.Styles>
-            <Style Selector="Button">
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-            </Style>
-        </StackPanel.Styles>
-        <Button Name="OpenFileButton" Content="Open File" />
-        <Button Name="SelectFolderButton" Content="Select Folder" />
-        <Button Name="SaveFileButton" Content="Save File" />
+        <Button Name="openFileDialog">Open File</Button>
+        <Button Name="selectFolderDialog">Select Folder</Button>
+        <Button Name="saveFileDialog">Save File</Button>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml.cs
@@ -1,6 +1,10 @@
+using System;
 using System.Collections.Generic;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Dialogs;
 using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;

 namespace Semi.Avalonia.Demo.Pages;
@@ -10,14 +14,14 @@ public partial class ManagedFileChooserDemo : UserControl
    public ManagedFileChooserDemo()
    {
        InitializeComponent();
-        OpenFileButton.Click += OpenFileDialog;
-        SelectFolderButton.Click += SelectFolderDialog;
-        SaveFileButton.Click += SaveFileDialog;
+        openFileDialog.Click += OpenFileDialog;
+        selectFolderDialog.Click += SelectFolderDialog;
+        saveFileDialog.Click += SaveFileDialog;
    }

-    private async void OpenFileDialog(object? sender, RoutedEventArgs args)
+    private async void OpenFileDialog(object sender, RoutedEventArgs args)
    {
-        var sp = GetStorageProvider();
+        IStorageProvider? sp = GetStorageProvider();
        if (sp is null) return;
        var result = await sp.OpenFilePickerAsync(new FilePickerOpenOptions()
        {
@@ -26,10 +30,9 @@ public partial class ManagedFileChooserDemo : UserControl
            AllowMultiple = true,
        });
    }
-
-    private async void SelectFolderDialog(object? sender, RoutedEventArgs args)
+    private async void SelectFolderDialog(object sender, RoutedEventArgs args)
    {
-        var sp = GetStorageProvider();
+        IStorageProvider? sp = GetStorageProvider();
        if (sp is null) return;
        var result = await sp.OpenFolderPickerAsync(new FolderPickerOpenOptions()
        {
@@ -37,17 +40,16 @@ public partial class ManagedFileChooserDemo : UserControl
            AllowMultiple = true,
        });
    }
-
-    private async void SaveFileDialog(object? sender, RoutedEventArgs args)
+    private async void SaveFileDialog(object sender, RoutedEventArgs args)
    {
-        var sp = GetStorageProvider();
+        IStorageProvider? sp = GetStorageProvider();
        if (sp is null) return;
        var result = await sp.SaveFilePickerAsync(new FilePickerSaveOptions()
        {
-            Title = "Save File",
+            Title = "Open File",
        });
    }
-
+    
    private IStorageProvider? GetStorageProvider()
    {
        var topLevel = TopLevel.GetTopLevel(this);
@@ -56,10 +58,10 @@ public partial class ManagedFileChooserDemo : UserControl

    List<FilePickerFileType>? GetFileTypes()
    {
-        return
-        [
+        return new List<FilePickerFileType>
+        {
            FilePickerFileTypes.All,
            FilePickerFileTypes.TextPlain
-        ];
+        };
    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml
@@ -25,30 +25,14 @@
                        <MenuItem Header="Submenu Level 2" />
                    </MenuItem>
                </MenuItem>
-                <MenuItem Header="Menu Item with _Icon">
+                <MenuItem Header="Menu Item with _Checkbox">
                    <MenuItem.Icon>
                        <TextBlock>😊</TextBlock>
                    </MenuItem.Icon>
                </MenuItem>
-                <MenuItem Header="Menu Item with _Checkbox" ToggleType="CheckBox" />
            </MenuItem>
            <MenuItem Header="_Second">
                <MenuItem Header="Second _Menu Item" />
-                <MenuItem IsChecked="True" Header="Second Menu toggle item" ToggleType="CheckBox" />
-                <Separator />
-                <MenuItem GroupName="A" Header="Radio 1 - group" ToggleType="Radio" />
-                <MenuItem IsChecked="True" GroupName="A" Header="Radio 2 - group" ToggleType="Radio" />
-                <MenuItem GroupName="A" Header="Radio 3 - group" ToggleType="Radio">
-                    <MenuItem Header="Radio 4 - group" ToggleType="Radio" GroupName="A" />
-                    <MenuItem Header="Radio 5 - group" ToggleType="Radio" GroupName="A" />
-                </MenuItem>
-                <Separator />
-                <MenuItem Header="Radio 1" ToggleType="Radio" />
-                <MenuItem IsChecked="True" Header="Radio 2" ToggleType="Radio" />
-                <MenuItem Header="Radio 3" ToggleType="Radio">
-                    <MenuItem Header="Radio 4" ToggleType="Radio" />
-                    <MenuItem Header="Radio 5" ToggleType="Radio" />
-                </MenuItem>
            </MenuItem>
            <MenuItem Header="Parent">
                <MenuItem Header="Child 1" />
@@ -102,7 +86,7 @@
                        <MenuItem Header="Submenu _1" />
                        <MenuItem Header="Submenu _2" />
                    </MenuItem>
-                    <MenuItem Header="Menu Item with _Icon">
+                    <MenuItem Header="Menu Item with _Checkbox">
                        <MenuItem.Icon>
                            <CheckBox
                                Padding="0"
@@ -111,7 +95,6 @@
                                IsHitTestVisible="False" />
                        </MenuItem.Icon>
                    </MenuItem>
-                    <MenuItem Header="Menu Item with _Checkbox" ToggleType="CheckBox" />
                    <MenuItem Header="Menu Item that won't close on click" StaysOpenOnClick="True" />
                </ContextMenu>
            </Border.ContextMenu>
@@ -130,7 +113,7 @@
                        <MenuItem Header="Submenu _1" />
                        <MenuItem Header="Submenu _2" />
                    </MenuItem>
-                    <MenuItem Header="Menu Item with _Icon">
+                    <MenuItem Header="Menu Item with _Checkbox">
                        <MenuItem.Icon>
                            <CheckBox
                                Padding="0"
@@ -139,10 +122,9 @@
                                IsHitTestVisible="False" />
                        </MenuItem.Icon>
                    </MenuItem>
-                    <MenuItem Header="Menu Item with _Checkbox" ToggleType="CheckBox" />
                </MenuFlyout>
            </Border.ContextFlyout>
            <TextBlock Text="Right Click to show Context Flyout" />
        </Border>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dong Bin	2a363edeee	Merge pull request #399 from irihitech/upgrade Upgrade to 11.0.7.5	2024-08-01 20:53:48 +08:00
Zhang Dian	72ed2d442d	misc: Semi.Avalonia.TreeDataGrid upgrade to 11.0.10.	2024-08-01 20:47:02 +08:00
Zhang Dian	5a095a9321	misc: Semi.Avalonia upgrade to 11.0.7.5.	2024-08-01 20:46:25 +08:00
Zhang Dian	b0f4777aff	fix: remove NumericUpDown ContextFlyout redundant arrow buttons. (cherry picked from commit `2957521ef8`)	2024-08-01 20:01:58 +08:00
MakesYT	7347aff7f9	独立背景颜色为资源 (cherry picked from commit `e1bef9fd04`) (cherry picked from commit `d90d7b9fe1`)	2024-08-01 20:01:33 +08:00
Dong Bin	e2ca3f31b1	Merge pull request #390 from irihitech/release/11.0.x-temp Backport: 11.1.0-rc2.1 to 11.0.x	2024-07-30 00:53:05 +08:00
Zhang Dian	d759570259	misc: version, trim, web demo.	2024-07-23 11:36:19 +08:00
Zhang Dian	2b37df580f	feat: Button Outline theme & colors. * add Outline Theme to Button. * :disabled, Tertiary Classes Button color.	2024-07-23 11:33:36 +08:00
Zhang Dian	d41d1ff9d4	feat: CheckBox :pressed Background. (cherry picked from commit `ccc25b4801`)	2024-07-19 12:03:47 +08:00
Zhang Dian	c127544bc7	feat: Typography. (cherry picked from commit `d7fce5c180`)	2024-07-19 10:33:27 +08:00
Zhang Dian	a614002ead	feat: add size Classes to ToggleSwitch. (cherry picked from commit `d3c909a83c`)	2024-07-19 10:30:20 +08:00
Zhang Dian	fe5c51599f	feat: unify Calendar MinHeight/Width in default Theme. (cherry picked from commit `8afe3a87bd`)	2024-07-19 10:27:36 +08:00
Zhang Dian	d318975d73	feat: extract DataGrid & TreeDataGrid Margin. (cherry picked from commit `b5f4bacece`)	2024-07-19 10:27:34 +08:00
Zhang Dian	504d6a1927	feat: add Danger Classes to replace Error Classes in ProgressBar. (cherry picked from commit `2da1ecf5a0`)	2024-07-19 10:27:09 +08:00
Zhang Dian	253f88d982	feat: add active colors to palette (cherry picked from commit `694dd863fa`)	2024-07-19 10:26:15 +08:00
rabbitism	8005997332	misc: bump 11.0.x package version.	2024-06-28 22:47:35 +08:00
Gehongyan	ae0375f194	fix: fix CheckBoxGlyphDisabledFill does not work Issue #368 (cherry picked from commit `57646f5390`)	2024-06-28 22:45:56 +08:00
Zhang Dian	28b04705aa	fix: fix TopLevelMenuItem HeaderTemplate. (cherry picked from commit `0fb1e585db`)	2024-06-28 22:01:58 +08:00
Zhang Dian	84a255656b	fix: add ContentTemplate to MenuItem Header. (cherry picked from commit `ec070d2f67`)	2024-05-30 12:46:58 +08:00
rabbitism	11c3109ae1	misc: bump 11.0.x package version.	2024-05-18 14:09:00 +08:00
Zhang Dian	34674599ec	feat: add AdornerLayer control. (cherry picked from commit `f65ec4bb05`)	2024-05-18 14:05:38 +08:00
rabbitism	004067d10b	misc: bump version.	2024-03-29 19:46:12 +08:00
Zhang Dian	afacdf2c56	Merge pull request #334 from irihitech/20240329-backport 20240329 backport	2024-03-29 19:37:21 +08:00
Zhang Dian	047c9f953e	fix: fix SplitViewDemo PanePlacement Binding mode, revert DatePicker locale.	2024-03-29 19:35:04 +08:00
Zhang Dian	ef3d40bc6d	feat: add TopCenter and BottomCenter position. (cherry picked from commit `627aa65e1f`)	2024-03-29 18:23:00 +08:00
Zhang Dian	7bd6c08e94	feat: update package info. (cherry picked from commit `41662706ab`)	2024-03-29 18:07:51 +08:00
Zhang Dian	e484dbfd21	feat: redesign SplitViewDemo. (cherry picked from commit `38958c1326`)	2024-03-29 18:04:03 +08:00
rabbitism	c2bf03c337	feat: backport localization from #332	2024-03-29 17:51:40 +08:00
rabbitism	7df583b81c	feat: backport combobox placeholder fix from #329 .	2024-03-29 17:42:07 +08:00
Soar360	efc7870554	TextBox.TextArea (cherry picked from commit `48235b63a2`)	2024-03-27 22:18:13 +08:00
Zhang Dian	99184b49ee	misc: reset branches. (cherry picked from commit `166490195f`)	2024-03-16 18:15:55 +08:00
rabbitism	6a1d5b2bd1	misc: Update package version.	2024-03-16 18:05:00 +08:00
				`@@ -1 +0,0 @@`
				`[assembly: System.Runtime.Versioning.SupportedOSPlatform("browser")]`