Merge pull request #489 from irihitech/backport

upgrade to 11.1.0.5
misc: bump version.
2026-03-03 00:00:55 +08:00 · 2024-12-13 00:04:56 +08:00 · 2024-12-12 23:56:32 +08:00 · 2024-12-12 23:50:05 +08:00 · 2024-12-08 16:25:30 +08:00 · 2024-12-03 01:13:21 +08:00
490 changed files with 7686 additions and 15051 deletions
--- a/.editorconfig
+++ b/.editorconfig
--- 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
@@ -2,22 +2,24 @@ name: Deploy to GitHub Pages

 env:
  PROJECT_PATH: demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
-  OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Release/net10.0-browser/publish/wwwroot
+  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:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4.1.1

-      - name: Setup dotnet
-        uses: actions/setup-dotnet@v5
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@v4
        with:
-          dotnet-version: |
-            10.0.x
+          dotnet-version: 8.0.x

      - name: Install wasm-tools
        run: dotnet workload install wasm-tools
@@ -25,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

@@ -34,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@v5
-
-      - 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-tree.yml
+++ b/.github/workflows/pack-tree.yml
@@ -0,0 +1,26 @@
+name: Pack TreeDataGrid Nuget
+
+on:
+  push:
+    branches: [ "action/pack-tree" ]
+  pull_request:
+    branches: [ "action/pack-tree" ]
+
+jobs:
+  nuget:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+
+      - name: Nuget Semi.Avalonia.TreeDataGrid
+        run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid  -o ./nugets
+
+      - name: Publish NuGet package
+        run: dotnet nuget push "./nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: nugets
+          path: ./nugets
--- a/.github/workflows/pack.yml
+++ b/.github/workflows/pack.yml
@@ -1,77 +1,32 @@
-name: Pack to NuGet
+name: Pack Nuget

 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:
+  nuget:
    runs-on: ubuntu-latest
-
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        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: 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: Publish NuGet package
+        run: dotnet nuget push "./nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

      - 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()
+          path: ./nugets
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,225 +1,92 @@
 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
+  push:
+    branches: [ "action/publish" ]
+  pull_request:
+    branches: [ "action/publish" ]

 jobs:
-  win-x64:
-    if: ${{inputs.win-x64}}
+  windows:
    runs-on: windows-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4.1.1
+
+      - name: Make upload directory
+        run: mkdir upload
+
      - 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
+        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/win64
+
+      - name: Zip win-x64
+        run: |
+          $files = Get-ChildItem -Path ./publish/win64/* -Recurse -Exclude *.pdb
+          Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.zip

-  win-x64-aot:
-    if: ${{inputs.win-x64-aot}}
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
      - 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
+        run: |
+          sed -i 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
+          sed -i 's#<!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->#<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>#' 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
+        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o ./publish/win64-aot

-  linux-x64:
-    if: ${{inputs.linux-x64}}
+      - name: Zip win-x64 AOT
+        run: |
+          $files = Get-ChildItem -Path ./publish/win64-aot/* -Recurse -Exclude *.pdb
+          Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: windows
+          path: ./upload
+
+  linux:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4.1.1
+
+      - name: Make upload directory
+        run: mkdir upload
+
      - 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
+        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/linux64

-  linux-x64-aot:
-    if: ${{inputs.linux-x64-aot}}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-      - 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
+      - name: Zip linux-x64
+        run: zip -j -r ./upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip ./publish/linux64 -x "*.pdb"

-  drm-linux-x64:
-    if: ${{inputs.drm-linux-x64}}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
      - 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
+        run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/drm

-  drm-linux-x64-aot:
-    if: ${{inputs.drm-linux-x64-aot}}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-      - 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
+      - name: Zip linux-x64 DRM
+        run: zip -j -r ./upload/Semi.Avalonia.Demo.Drm.linux-x64.zip ./publish/drm -x "*.pdb"

-  osx-arm64:
-    if: ${{inputs.osx-arm64}}
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-      - 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
+        uses: actions/upload-artifact@v4.3.1
        with:
-          name: Semi.Avalonia.Demo.Desktop.osx-arm64
-          path: |
-            publish
-            !publish/*.pdb
+          name: linux
+          path: ./upload

-  osx-arm64-aot:
-    if: ${{inputs.osx-arm64-aot}}
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-      - 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 }}
+  android:
    runs-on: windows-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
-      - name: Install Android workload
-        run: dotnet workload install android
+        uses: actions/checkout@v4.1.1
+
+      - name: CD Android
+        run: cd ./demo/Semi.Avalonia.Demo.Android
+
      - name: Restore Dependencies
-        run: dotnet restore demo/Semi.Avalonia.Demo.Android
+        run: dotnet restore
+
      - name: Publish Android
-        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net10.0-android --no-restore -o publish /p:RuntimeIdentifier=android-arm64
+        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o ./publish
+
      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v4.3.1
        with:
-          name: android-arm64
-          path: publish/*Signed.apk
+          name: android
+          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
@@ -2,7 +2,6 @@

 [![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)

@@ -38,30 +37,22 @@ Include Semi Design Styles in application:

 That's all.

-ColorPicker, DataGrid, TreeDataGrid, Dock, Tabalonia and AvaloniaEdit are distributed in separated packages. Please install if you need.
+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.
@@ -71,16 +62,15 @@ You can always download demo executable to play around with Semi Avalonia Themes

 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)
+![FeiShu](./docs/community-support.png) 

 ## Version compatibility

-| Semi Avalonia Version | Avalonia Version |
-|:----------------------|:-----------------|
-| 11.3.7                | >=11.3.7         |
-| 11.2.1                | >=11.2.1         |
-| 11.2.0                | End of Life      |
-| 11.1.x                | End of Life      |
+| Semi Design Version | Avalonia Version |
+|:--------------------|:-----------------|
+| 11.1.0              | >=11.1.0         |
+| 11.0.7              | >=11.0.7         |
+| 11.0.1              | <=11.0.6         |

 ## Credits

--- a/README_CN.md
+++ b/README_CN.md
@@ -2,7 +2,6 @@

 [![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)

@@ -38,33 +37,26 @@ dotnet add package Semi.Avalonia

 这样就可以了。

-ColorPicker、DataGrid、TreeDataGrid、Dock、Tabalonia 和 AvaloniaEdit 的样式单独分发，如果需要请安装并引用。
+ColorPicker、DataGrid 和 TreeDataGrid 的样式单独分发，如果需要请安装并引用。

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

-注意：Dock、Tabalonia 和 AvaloniaEdit 是通过 NuGet 免费分发的，但不是开源的。请阅读许可协议并同意后继续使用这些包。如果您需要源代码，请通过电子邮件联系我们：[contact@irihi.tech](contact@irihi.tech)
-
 ## 示例

 您可以从 Semi Avalonia 的 release 页下载并试用 Semi Avalonia 的展示应用。
+
 <https://github.com/irihitech/Semi.Avalonia/releases>

 ## 社区支持
@@ -73,14 +65,14 @@ dotnet add package Semi.Avalonia.AvaloniaEdit

 ![FeiShu](./docs/community-support.png)

+
 ## 版本兼容性

-| Semi Avalonia Version | Avalonia Version |
-|:----------------------|:-----------------|
-| 11.3.7                | >=11.3.7         |
-| 11.2.1                | >=11.2.1         |
-| 11.2.0                | End of Life      |
-| 11.1.x                | End of Life      |
+| Semi Design Version | Avalonia Version |
+|:--------------------|:-----------------|
+| 11.1.0              | >=11.1.0         |
+| 11.0.7              | >=11.0.7         |
+| 11.0.1              | <=11.0.6         |

 ## 致谢

--- a/Semi.Avalonia.sln
+++ b/Semi.Avalonia.sln
@@ -0,0 +1,105 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32929.385
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia", "src\Semi.Avalonia\Semi.Avalonia.csproj", "{90D0B063-BC64-40AB-A56C-AC11909CF410}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{B1E6A7D4-0AFB-4D32-9969-5FBDAC0CFF3E}"
+	ProjectSection(SolutionItems) = preProject
+		demo\Directory.Build.props = demo\Directory.Build.props
+		demo\global.json = demo\global.json
+		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-tree.yml = .github\workflows\pack-tree.yml
+		.github\workflows\publish.yml = .github\workflows\publish.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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo.Web", "demo\Semi.Avalonia.Demo.Web\Semi.Avalonia.Demo.Web.csproj", "{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo", "demo\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj", "{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.DataGrid", "src\Semi.Avalonia.DataGrid\Semi.Avalonia.DataGrid.csproj", "{8A90C292-8761-4F70-8E1F-EFC097FEADB3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.ColorPicker", "src\Semi.Avalonia.ColorPicker\Semi.Avalonia.ColorPicker.csproj", "{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo.Android", "demo\Semi.Avalonia.Demo.Android\Semi.Avalonia.Demo.Android.csproj", "{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.Demo.Drm", "demo\Semi.Avalonia.Demo.Drm\Semi.Avalonia.Demo.Drm.csproj", "{86D93406-412A-4429-93B2-92AAD0407784}"
+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
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86D93406-412A-4429-93B2-92AAD0407784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86D93406-412A-4429-93B2-92AAD0407784}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86D93406-412A-4429-93B2-92AAD0407784}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86D93406-412A-4429-93B2-92AAD0407784}.Release|Any CPU.Build.0 = Release|Any CPU
+		{398D2998-0835-41F5-99A3-608CAB8051E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{2ADCA724-2B6D-46EC-87F7-604D7918B89A} = {43091528-9509-43CB-A003-9C5C11E96DD6}
+		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0} = {43091528-9509-43CB-A003-9C5C11E96DD6}
+		{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}
+	EndGlobalSection
+EndGlobal
--- a/Semi.Avalonia.slnx
+++ b/Semi.Avalonia.slnx
@@ -1,28 +0,0 @@
-<Solution>
-    <Folder Name="/Demo/">
-        <Project Path="demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj"/>
-        <Project Path="demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj"/>
-        <Project Path="demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj"/>
-        <Project Path="demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj"/>
-        <Project Path="demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj"/>
-    </Folder>
-    <Folder Name="/GitHub Action/">
-        <File Path=".github/workflows/deploy.yml"/>
-        <File Path=".github/workflows/pack-nightly.yml"/>
-        <File Path=".github/workflows/pack.yml"/>
-        <File Path=".github/workflows/publish.yml"/>
-        <File Path=".github/workflows/release-tag.yml"/>
-    </Folder>
-    <Folder Name="/Solution Items/Demo/">
-        <File Path="demo/Directory.Packages.props"/>
-        <File Path="demo/global.json"/>
-    </Folder>
-    <Folder Name="/Solution Items/Package/">
-        <File Path="src/Directory.Packages.props"/>
-        <File Path="src/Directory.Build.props"/>
-    </Folder>
-    <Project Path="src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj"/>
-    <Project Path="src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj"/>
-    <Project Path="src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj"/>
-    <Project Path="src/Semi.Avalonia/Semi.Avalonia.csproj"/>
-</Solution>
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <Nullable>enable</Nullable>
+    <AvaloniaVersion>11.1.5</AvaloniaVersion>
+    <CommunityToolkitVersion>8.3.2</CommunityToolkitVersion>
+  </PropertyGroup>
+</Project>
--- a/demo/Directory.Packages.props
+++ b/demo/Directory.Packages.props
@@ -1,27 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>11.3.10</AvaloniaVersion>
-        <DataGridVersion>11.3.10</DataGridVersion>
-        <SkiaSharpVersion>3.119.1</SkiaSharpVersion>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
-        <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-        <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <PackageVersion Include="Avalonia.LinuxFramebuffer" Version="$(AvaloniaVersion)"/>
-        <PackageVersion Include="Avalonia.iOS" Version="$(AvaloniaVersion)" />
-        <PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
-        <PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
-        <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
-        <PackageVersion Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
-
-        <PackageVersion Include="SkiaSharp" Version="$(SkiaSharpVersion)"/>
-        <PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="$(SkiaSharpVersion)"/>
-
-        <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0"/>
-
-        <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
-        <PackageVersion Include="Irihi.Avalonia.Shared" Version="0.3.1"/>
-    </ItemGroup>
-</Project>
--- a/demo/Semi.Avalonia.Demo.Android/AvaloniaAppBuilderExtensions.cs
+++ b/demo/Semi.Avalonia.Demo.Android/AvaloniaAppBuilderExtensions.cs
@@ -1,16 +0,0 @@
-using Avalonia;
-using Avalonia.Media;
-
-namespace Semi.Avalonia.Demo.Android;
-
-public static class AvaloniaAppBuilderExtensions
-{
-    private static string DefaultFontFamily => "avares://Semi.Avalonia.Demo.Android/Assets#Source Han Sans CN";
-
-    public static AppBuilder WithSourceHanSansCNFont(this AppBuilder builder) =>
-        builder.With(new FontManagerOptions
-        {
-            DefaultFamilyName = DefaultFontFamily,
-            FontFallbacks = [new FontFallback { FontFamily = new FontFamily(DefaultFontFamily) }]
-        });
-}
--- a/demo/Semi.Avalonia.Demo.Android/Icon.png
+++ b/demo/Semi.Avalonia.Demo.Android/Icon.png
--- a/demo/Semi.Avalonia.Demo.Android/MainActivity.cs
+++ b/demo/Semi.Avalonia.Demo.Android/MainActivity.cs
@@ -1,6 +1,5 @@
 using Android.App;
 using Android.Content.PM;
-using Avalonia;
 using Avalonia.Android;

 namespace Semi.Avalonia.Demo.Android;
@@ -14,9 +13,4 @@ namespace Semi.Avalonia.Demo.Android;
    ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
 public class MainActivity : AvaloniaMainActivity<App>
 {
-    protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
-    {
-        return base.CustomizeAppBuilder(builder)
-            .WithSourceHanSansCNFont();
-    }
 }
--- a/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
+++ b/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net10.0-android</TargetFramework>
+        <TargetFramework>net8.0-android</TargetFramework>
        <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
        <Nullable>enable</Nullable>
        <ApplicationId>com.irihitech.Semi.Avalonia</ApplicationId>
@@ -14,13 +14,14 @@
    </PropertyGroup>

    <ItemGroup>
-        <AndroidResource Include="Icon.png" Link="Resources\drawable\Icon.png"/>
-        <AvaloniaResource Include="..\Fonts\*" Link="Assets\Fonts\%(Filename)%(Extension)" />
+        <AndroidResource Include="Icon.png">
+            <Link>Resources\drawable\Icon.png</Link>
+        </AndroidResource>
    </ItemGroup>

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

    <ItemGroup>
--- 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
@@ -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
@@ -4,9 +4,9 @@
        <TargetFramework>net8.0</TargetFramework>
        <Nullable>enable</Nullable>
        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-        <ApplicationIcon>..\Semi.Avalonia.Demo\Assets\irihi.ico</ApplicationIcon>
        <!-- Uncomment below to enable Native AOT compilation-->
        <!--<PublishAot>true</PublishAot>-->
+        <!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->
    </PropertyGroup>

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

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

    <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop"/>
+        <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.Drm/Program.cs
+++ b/demo/Semi.Avalonia.Demo.Drm/Program.cs
@@ -7,7 +7,7 @@ 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
--- a/demo/Semi.Avalonia.Demo.Drm/README.md
+++ b/demo/Semi.Avalonia.Demo.Drm/README.md
@@ -63,7 +63,7 @@ private static void SilenceConsole()
 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
+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
--- a/demo/Semi.Avalonia.Demo.Drm/README_CN.md
+++ b/demo/Semi.Avalonia.Demo.Drm/README_CN.md
@@ -63,7 +63,7 @@ private static void SilenceConsole()
 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
+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文件中添加以下代码
--- a/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
+++ b/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
@@ -4,9 +4,9 @@
        <TargetFramework>net8.0</TargetFramework>
        <Nullable>enable</Nullable>
        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-        <ApplicationIcon>..\Semi.Avalonia.Demo\Assets\irihi.ico</ApplicationIcon>
        <!-- Uncomment below to enable Native AOT compilation-->
        <!--<PublishAot>true</PublishAot>-->
+        <!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
@@ -19,15 +19,17 @@
    </PropertyGroup>

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

    <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop"/>
-        <PackageReference Include="Avalonia.LinuxFramebuffer"/>
+        <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>
-        <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.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/Semi.Avalonia.Demo.Web.csproj
+++ b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
@@ -1,19 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.WebAssembly">
    <PropertyGroup>
-        <TargetFramework>net10.0-browser</TargetFramework>
+        <TargetFramework>net8.0-browser</TargetFramework>
        <OutputType>Exe</OutputType>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Nullable>enable</Nullable>
    </PropertyGroup>

    <ItemGroup>
-        <AvaloniaResource Include="..\Fonts\*" Link="Assets\Fonts\%(Filename)%(Extension)" />
+        <AvaloniaResource Include="Assets\**"/>
    </ItemGroup>

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

    <ItemGroup>
--- 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
@@ -6,7 +6,6 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <link rel="stylesheet" href="./app.css" />
-    <link rel="icon" type="image/x-icon" href="/favicon.ico">
 </head>

 <body style="margin: 0; overflow: hidden">
--- a/demo/Semi.Avalonia.Demo/App.axaml
+++ b/demo/Semi.Avalonia.Demo/App.axaml
@@ -1,52 +1,13 @@
 <Application
-    Name="Semi Avalonia Demo"
    x:Class="Semi.Avalonia.Demo.App"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:semi="https://irihi.tech/semi"
-    xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-    x:DataType="vm:ApplicationViewModel">
+    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>
-    <NativeMenu.Menu>
-        <NativeMenu>
-            <NativeMenuItem
-                Header="About Us"
-                Command="{Binding JumpToCommand}"
-                CommandParameter="{Binding $self.Header}" />
-        </NativeMenu>
-    </NativeMenu.Menu>
-    <TrayIcon.Icons>
-        <TrayIcons>
-            <TrayIcon
-                Icon="{OnPlatform Default=/Assets/irihi.ico, macOS=/Assets/irihi2.ico}"
-                MacOSProperties.IsTemplateIcon="true"
-                Command="{Binding ActivateCommand}"
-                ToolTipText="Semi Avalonia Demo">
-                <TrayIcon.Menu>
-                    <NativeMenu>
-                        <NativeMenuItem
-                            Header="About Us"
-                            Command="{Binding JumpToCommand}"
-                            CommandParameter="{Binding $self.Header}" />
-                        <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
@@ -2,7 +2,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 +11,6 @@ public partial class App : Application
    public override void Initialize()
    {
        AvaloniaXamlLoader.Load(this);
-        this.DataContext = new ApplicationViewModel();
    }

    public override void OnFrameworkInitializationCompleted()
@@ -30,7 +28,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/Assets/irihi2.ico
+++ b/demo/Semi.Avalonia.Demo/Assets/irihi2.ico
--- a/demo/Semi.Avalonia.Demo/Constant/ColorTokens.cs
+++ b/demo/Semi.Avalonia.Demo/Constant/ColorTokens.cs
@@ -1,169 +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>> AIGeneralTokens { get; } =
-    [
-        new("SemiColorAIGeneral", "AI General"),
-        new("SemiColorAIGeneralPointerover", "AI General Pointerover"),
-        new("SemiColorAIGeneralActive", "AI General Active"),
-        new("SemiColorAIGeneralDisabled", "AI General Disabled")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> AIPurpleTokens { get; } =
-    [
-        new("SemiColorAIPurple", "AI Purple"),
-        new("SemiColorAIPurplePointerover", "AI Purple Pointerover"),
-        new("SemiColorAIPurpleActive", "AI Purple Active"),
-        new("SemiColorAIPurpleDisabled", "AI Purple Disabled")
-    ];
-
-    public static IReadOnlyList<Tuple<string, string>> AIBackgroundTokens { get; } =
-    [
-        new("SemiColorAIBackgroundBottom", "AI Bottom Background"),
-        new("SemiColorAIBackgroundBottomPointerover", "AI Bottom Background Pointerover"),
-        new("SemiColorAIBackgroundBottomActive", "AI Bottom Background Active"),
-        new("SemiColorAIBackgroundTop", "AI Top Background"),
-        new("SemiColorAIBackgroundTopPointerover", "AI Top Background Pointerover"),
-        new("SemiColorAIBackgroundTopActive", "AI Top Background 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
@@ -1,9 +1,14 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Semi.Avalonia.Demo.Controls">
+    xmlns:controls="clr-namespace:Semi.Avalonia.Demo.Controls"
+    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
@@ -16,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"
@@ -33,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"
@@ -60,7 +77,7 @@
                            Margin="4,8,0,0"
                            VerticalAlignment="Center"
                            Classes="Tertiary"
-                            Text="Hex" />
+                            Text="ARGB" />
                        <SelectableTextBlock
                            Grid.Row="4"
                            Grid.Column="0"
@@ -69,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"
@@ -96,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,42 +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);
-        }
-        else
-        {
-            Hex = null;
-            Hex2 = null;
-            OpacityNumber = null;
+            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
@@ -1,23 +1,25 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Semi.Avalonia.Demo.Controls">
+    xmlns:controls="using:Semi.Avalonia.Demo.Controls"
+    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
@@ -40,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,7 +3,7 @@
    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">
    <ControlTheme x:Key="{x:Type controls:FunctionalColorGroupControl}" TargetType="controls:FunctionalColorGroupControl">
        <Setter Property="Template">
@@ -30,21 +30,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="{Binding 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>
@@ -54,29 +60,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>
@@ -94,21 +84,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="{Binding 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>
@@ -118,29 +114,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>
--- a/demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.axaml
+++ b/demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.axaml
@@ -3,7 +3,7 @@
    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:ShadowGroupViewModel">
    <ControlTheme x:Key="{x:Type controls:ShadowGroupControl}" TargetType="controls:ShadowGroupControl">
        <Setter Property="Template">
@@ -19,40 +19,29 @@
                        <TabItem Header="Light">
                            <DataGrid IsReadOnly="True" ItemsSource="{TemplateBinding LightShadows}">
                                <DataGrid.Columns>
-                                    <DataGridTemplateColumn Width="300" Header="ResourceKey">
+                                    <DataGridTemplateColumn Width="*" Header="ResourceKey">
                                        <DataGridTemplateColumn.CellTemplate>
                                            <DataTemplate DataType="viewModels:ShadowItemViewModel">
                                                <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                    VerticalAlignment="Center"
                                                    Text="{Binding ResourceKey}" />
                                            </DataTemplate>
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>
-                                    <DataGridTemplateColumn Width="300" Header="BoxShadows">
-                                        <DataGridTemplateColumn.CellTemplate>
-                                            <DataTemplate DataType="viewModels:ShadowItemViewModel">
-                                                <SelectableTextBlock
-                                                    Margin="12,0"
-                                                    VerticalAlignment="Center"
-                                                    Text="{Binding BoxShadowValue}" />
-                                            </DataTemplate>
-                                        </DataGridTemplateColumn.CellTemplate>
-                                    </DataGridTemplateColumn>
                                    <DataGridTextColumn
                                        Width="*"
                                        x:DataType="viewModels:ShadowItemViewModel"
                                        Binding="{Binding ShadowDisplayName}"
                                        CanUserSort="False"
-                                        Header="Description" />
-                                    <DataGridTemplateColumn Width="100" Header="CopyText">
+                                        Header="Name" />
+                                    <DataGridTemplateColumn Width="300" Header="BoxShadows">
                                        <DataGridTemplateColumn.CellTemplate>
                                            <DataTemplate DataType="viewModels:ShadowItemViewModel">
-                                                <Button
-                                                    Command="{Binding $parent[pages:PaletteDemo].Copy}"
-                                                    CommandParameter="{Binding CopyText}"
-                                                    Theme="{DynamicResource  IconBorderlessButton}"
-                                                    Content="{StaticResource SemiIconCopy}" />
+                                                <SelectableTextBlock
+                                                    Margin="12,0,12,0"
+                                                    VerticalAlignment="Center"
+                                                    Text="{Binding BoxShadowValue}" />
                                            </DataTemplate>
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>
@@ -62,40 +51,29 @@
                        <TabItem Header="Dark">
                            <DataGrid IsReadOnly="True" ItemsSource="{TemplateBinding DarkShadows}">
                                <DataGrid.Columns>
-                                    <DataGridTemplateColumn Width="300" Header="ResourceKey">
+                                    <DataGridTemplateColumn Width="*" Header="ResourceKey">
                                        <DataGridTemplateColumn.CellTemplate>
                                            <DataTemplate DataType="viewModels:ShadowItemViewModel">
                                                <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                    VerticalAlignment="Center"
                                                    Text="{Binding ResourceKey}" />
                                            </DataTemplate>
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>
-                                    <DataGridTemplateColumn Width="300" Header="BoxShadows">
-                                        <DataGridTemplateColumn.CellTemplate>
-                                            <DataTemplate DataType="viewModels:ShadowItemViewModel">
-                                                <SelectableTextBlock
-                                                    Margin="12,0"
-                                                    VerticalAlignment="Center"
-                                                    Text="{Binding BoxShadowValue}" />
-                                            </DataTemplate>
-                                        </DataGridTemplateColumn.CellTemplate>
-                                    </DataGridTemplateColumn>
                                    <DataGridTextColumn
                                        Width="*"
                                        x:DataType="viewModels:ShadowItemViewModel"
                                        Binding="{Binding ShadowDisplayName}"
                                        CanUserSort="False"
-                                        Header="Description" />
-                                    <DataGridTemplateColumn Width="100" Header="CopyText">
+                                        Header="Name" />
+                                    <DataGridTemplateColumn Width="300" Header="BoxShadows">
                                        <DataGridTemplateColumn.CellTemplate>
                                            <DataTemplate DataType="viewModels:ShadowItemViewModel">
-                                                <Button
-                                                    Command="{Binding $parent[pages:PaletteDemo].Copy}"
-                                                    CommandParameter="{Binding CopyText}"
-                                                    Theme="{DynamicResource  IconBorderlessButton}"
-                                                    Content="{StaticResource SemiIconCopy}" />
+                                                <SelectableTextBlock
+                                                    Margin="12,0,12,0"
+                                                    VerticalAlignment="Center"
+                                                    Text="{Binding BoxShadowValue}" />
                                            </DataTemplate>
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>
--- 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,236 +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"
-    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,14 +3,15 @@
    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:DataType="vm:AutoCompleteBoxDemoViewModel"
+    x:CompileBindings="False"
+    x:DataType="local:AutoCompleteBoxDemoViewModel"
    mc:Ignorable="d">
    <Design.DataContext>
-        <vm:AutoCompleteBoxDemoViewModel />
+        <local:AutoCompleteBoxDemoViewModel />
    </Design.DataContext>
    <StackPanel HorizontalAlignment="Left" Spacing="20">
        <StackPanel.Styles>
@@ -20,7 +21,7 @@
                    <Binding Path="States" />
                </Setter>
                <Setter Property="ItemTemplate">
-                    <DataTemplate DataType="vm:StateData">
+                    <DataTemplate DataType="local:StateData">
                        <TextBlock Text="{Binding Name}" />
                    </DataTemplate>
                </Setter>
@@ -29,40 +30,40 @@

        <AutoCompleteBox
            Watermark="Please select a State"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{Binding Name}" />
        <AutoCompleteBox
            Classes="Large"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{ReflectionBinding Name}" />
        <AutoCompleteBox
            Classes="Small"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{ReflectionBinding Name}" />
        <AutoCompleteBox
            Classes="Bordered"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{ReflectionBinding Name}" />
        <AutoCompleteBox
            IsEnabled="False"
            Watermark="Disabled"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{ReflectionBinding Name}" />
        <AutoCompleteBox
            InnerLeftContent="https://"
            InnerRightContent=".com"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{ReflectionBinding Name}" />

        <StackPanel Orientation="Horizontal">
            <AutoCompleteBox
                Width="100"
                Classes="Large"
                Watermark="Large"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{ReflectionBinding Name}" />
            <AutoCompleteBox
                Width="100"
                Watermark="Default"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{ReflectionBinding Name}" />
            <AutoCompleteBox
                Width="100"
                Classes="Small"
                Watermark="Small"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{ReflectionBinding Name}" />
        </StackPanel>

        <StackPanel Orientation="Horizontal">
@@ -70,17 +71,17 @@
                Width="100"
                IsEnabled="False"
                Watermark="Disabled"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{ReflectionBinding Name}" />
            <AutoCompleteBox
                Width="100"
                Classes="Bordered"
                Watermark="Bordered"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{ReflectionBinding Name}" />
            <AutoCompleteBox
                Width="100"
                Classes="Bordered"
                IsEnabled="False"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{ReflectionBinding Name}" />
        </StackPanel>

    </StackPanel>
--- 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
@@ -6,369 +6,174 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    mc:Ignorable="d">
    <ScrollViewer>
-        <StackPanel HorizontalAlignment="Left" Spacing="8">
+        <StackPanel HorizontalAlignment="Left" Spacing="20">
            <StackPanel.Styles>
-                <Style Selector="SplitButton,DropDownButton,ToggleSplitButton">
-                    <Setter Property="Button.Flyout">
-                        <MenuFlyout>
+                <Style Selector="SplitButton">
+                    <Setter Property="Flyout">
+                        <MenuFlyout Placement="BottomEdgeAlignedRight">
+                            <MenuItem Header="Submit All" />
+                            <MenuItem Header="Submit Updated" />
+                        </MenuFlyout>
+                    </Setter>
+                </Style>
+                <Style Selector="DropDownButton">
+                    <Setter Property="Flyout">
+                        <MenuFlyout Placement="BottomEdgeAlignedRight">
+                            <MenuItem Header="Submit All" />
+                            <MenuItem Header="Submit Updated" />
+                        </MenuFlyout>
+                    </Setter>
+                </Style>
+                <Style Selector="ToggleSplitButton">
+                    <Setter Property="Flyout">
+                        <MenuFlyout Placement="BottomEdgeAlignedRight">
                            <MenuItem Header="Submit All" />
                            <MenuItem Header="Submit Updated" />
                        </MenuFlyout>
                    </Setter>
                </Style>
            </StackPanel.Styles>
-            <HeaderedContentControl
-                Theme="{StaticResource GroupBox}">
-                <HeaderedContentControl.Header>
-                    <StackPanel Spacing="8">
-                        <TextBlock Text="Button/RepeatButton Theme" />
-                        <WrapPanel ItemSpacing="4">
-                            <TextBlock Text="Theme:" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue Solid" Content="Light" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue Solid" Content="Solid" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue Solid" Content="Outline" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue Solid" Content="Borderless" />
-                        </WrapPanel>
-                        <WrapPanel ItemSpacing="4">
-                            <TextBlock Text="Classes:" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue" Content="Primary" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue" Content="Secondary" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue" Content="Tertiary" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue" Content="Success" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue" Content="Warning" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue" Content="Danger" />
-                        </WrapPanel>
-                    </StackPanel>
-                </HeaderedContentControl.Header>
-                <StackPanel HorizontalAlignment="Left" Spacing="16">
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <Button Content="Default" />
-                        <Button Content="Primary" Classes="Primary" />
-                        <Button Content="Secondary" Classes="Secondary" />
-                        <Button Content="Tertiary" Classes="Tertiary" />
-                        <Button Content="Success" Classes="Success" />
-                        <Button Content="Warning" Classes="Warning" />
-                        <Button Content="Danger" Classes="Danger" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <Button Content="Default" Theme="{StaticResource SolidButton}" />
-                        <Button Content="Primary" Classes="Primary" Theme="{StaticResource SolidButton}" />
-                        <Button Content="Secondary" Classes="Secondary" Theme="{StaticResource SolidButton}" />
-                        <Button Content="Tertiary" Classes="Tertiary" Theme="{StaticResource SolidButton}" />
-                        <Button Content="Success" Classes="Success" Theme="{StaticResource SolidButton}" />
-                        <Button Content="Warning" Classes="Warning" Theme="{StaticResource SolidButton}" />
-                        <Button Content="Danger" Classes="Danger" Theme="{StaticResource SolidButton}" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <Button Content="Default" Theme="{StaticResource OutlineButton}" />
-                        <Button Content="Primary" Classes="Primary" Theme="{StaticResource OutlineButton}" />
-                        <Button Content="Secondary" Classes="Secondary" Theme="{StaticResource OutlineButton}" />
-                        <Button Content="Tertiary" Classes="Tertiary" Theme="{StaticResource OutlineButton}" />
-                        <Button Content="Success" Classes="Success" Theme="{StaticResource OutlineButton}" />
-                        <Button Content="Warning" Classes="Warning" Theme="{StaticResource OutlineButton}" />
-                        <Button Content="Danger" Classes="Danger" Theme="{StaticResource OutlineButton}" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <Button Content="Default" Theme="{StaticResource BorderlessButton}" />
-                        <Button Content="Primary" Classes="Primary" Theme="{StaticResource BorderlessButton}" />
-                        <Button Content="Secondary" Classes="Secondary" Theme="{StaticResource BorderlessButton}" />
-                        <Button Content="Tertiary" Classes="Tertiary" Theme="{StaticResource BorderlessButton}" />
-                        <Button Content="Success" Classes="Success" Theme="{StaticResource BorderlessButton}" />
-                        <Button Content="Warning" Classes="Warning" Theme="{StaticResource BorderlessButton}" />
-                        <Button Content="Danger" Classes="Danger" Theme="{StaticResource BorderlessButton}" />
-                    </WrapPanel>
-                </StackPanel>
-            </HeaderedContentControl>

-            <HeaderedContentControl
-                Theme="{StaticResource GroupBox}"
-                Header="Prohibited Status">
-                <WrapPanel ItemSpacing="16" LineSpacing="16">
-                    <Button Content="Light" IsEnabled="False" />
-                    <Button Content="Solid" IsEnabled="False" Theme="{StaticResource SolidButton}" />
-                    <Button Content="Outline" IsEnabled="False" Theme="{StaticResource OutlineButton}" />
-                    <Button Content="Borderless" IsEnabled="False" Theme="{StaticResource BorderlessButton}" />
-                </WrapPanel>
-            </HeaderedContentControl>
+            <TextBlock>Light (Default)</TextBlock>
+            <StackPanel Orientation="Horizontal" Spacing="20">
+                <Button Classes="Primary">Primary</Button>
+                <Button Classes="Secondary">Secondary</Button>
+                <Button Classes="Tertiary">Tertiary</Button>
+                <Button Classes="Success">Success</Button>
+                <Button Classes="Warning">Warning</Button>
+                <Button Classes="Danger">Danger</Button>
+                <Button Classes="Danger" IsEnabled="False">Disabled</Button>
+            </StackPanel>
+            <TextBlock>Solid</TextBlock>
+            <StackPanel Orientation="Horizontal" Spacing="20">
+                <Button Classes="Primary" Theme="{DynamicResource SolidButton}">Primary</Button>
+                <Button Classes="Secondary" Theme="{DynamicResource SolidButton}">Secondary</Button>
+                <Button Classes="Tertiary" Theme="{DynamicResource SolidButton}">Tertiary</Button>
+                <Button Classes="Success" Theme="{DynamicResource SolidButton}">Success</Button>
+                <Button Classes="Warning" Theme="{DynamicResource SolidButton}">Warning</Button>
+                <Button Classes="Danger" Theme="{DynamicResource SolidButton}">Danger</Button>
+                <Button
+                    Classes="Danger"
+                    IsEnabled="False"
+                    Theme="{DynamicResource SolidButton}">
+                    Disabled
+                </Button>
+            </StackPanel>
+            <TextBlock>Outline</TextBlock>
+            <StackPanel Orientation="Horizontal" Spacing="20">
+                <Button Classes="Primary" Theme="{DynamicResource OutlineButton}">Primary</Button>
+                <Button Classes="Secondary" Theme="{DynamicResource OutlineButton}">Secondary</Button>
+                <Button Classes="Tertiary" Theme="{DynamicResource OutlineButton}">Tertiary</Button>
+                <Button Classes="Success" Theme="{DynamicResource OutlineButton}">Success</Button>
+                <Button Classes="Warning" Theme="{DynamicResource OutlineButton}">Warning</Button>
+                <Button Classes="Danger" Theme="{DynamicResource OutlineButton}">Danger</Button>
+                <Button Classes="Danger" Theme="{DynamicResource OutlineButton}" IsEnabled="False">Disabled</Button>
+            </StackPanel>
+            <TextBlock>Borderless</TextBlock>
+            <StackPanel Orientation="Horizontal" Spacing="20">
+                <Button Classes="Primary" Theme="{DynamicResource BorderlessButton}">Primary</Button>
+                <Button Classes="Secondary" Theme="{DynamicResource BorderlessButton}">Secondary</Button>
+                <Button Classes="Tertiary" Theme="{DynamicResource BorderlessButton}">Tertiary</Button>
+                <Button Classes="Success" Theme="{DynamicResource BorderlessButton}">Success</Button>
+                <Button Classes="Warning" Theme="{DynamicResource BorderlessButton}">Warning</Button>
+                <Button Classes="Danger" Theme="{DynamicResource BorderlessButton}">Danger</Button>
+                <Button
+                    Classes="Danger"
+                    IsEnabled="False"
+                    Theme="{DynamicResource BorderlessButton}">
+                    Disabled
+                </Button>
+            </StackPanel>
+            <TextBlock>Disabled</TextBlock>
+            <StackPanel Background="{DynamicResource SemiColorBackground1}" Orientation="Horizontal" Spacing="20">
+                <Button IsEnabled="False">Light</Button>
+                <Button IsEnabled="False" Theme="{DynamicResource SolidButton}">Solid</Button>
+                <Button IsEnabled="False" Theme="{DynamicResource OutlineButton}">Outline</Button>
+                <Button IsEnabled="False" Theme="{DynamicResource BorderlessButton}">Borderless</Button>
+            </StackPanel>
+            <TextBlock>Size Classes</TextBlock>
+            <StackPanel Orientation="Horizontal" Spacing="20">
+                <Button Classes="Primary Small">Small</Button>
+                <Button Classes="Primary">Default</Button>
+                <Button Classes="Primary Large">Large</Button>
+            </StackPanel>

-            <HeaderedContentControl
-                Theme="{StaticResource GroupBox}">
-                <HeaderedContentControl.Header>
-                    <StackPanel Spacing="8">
-                        <WrapPanel ItemSpacing="4">
-                            <TextBlock Text="Size Classes:" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue" Content="Large" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Blue" Content="Small" />
-                        </WrapPanel>
-                    </StackPanel>
-                </HeaderedContentControl.Header>
-                <WrapPanel ItemSpacing="16" LineSpacing="16">
-                    <Button Content="Large" Classes="Large" />
-                    <Button Content="Default" />
-                    <Button Content="Small" Classes="Small" />
-                </WrapPanel>
-            </HeaderedContentControl>
+            <TextBlock>DropDownButton</TextBlock>
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <DropDownButton Content="Primary" />
+                <DropDownButton Classes="Secondary" Content="Secondary" />
+                <DropDownButton Classes="Tertiary" Content="Tertiary" />
+                <DropDownButton Classes="Success" Content="Success" />
+                <DropDownButton Classes="Warning" Content="Warning" />
+                <DropDownButton Classes="Danger" Content="Danger" />
+                <DropDownButton
+                    Classes="Danger"
+                    Content="Disabled"
+                    IsEnabled="False" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <DropDownButton Content="Default" Classes="Success"/>
+                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success"/>
+                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success"/>
+                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success"/>
+                <DropDownButton Content="Default" Classes="Success" IsEnabled="False"/>
+                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success" IsEnabled="False"/>
+                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success" IsEnabled="False"/>
+                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success" IsEnabled="False"/>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <DropDownButton Classes="Small" Content="Small" />
+                <DropDownButton Content="Default" />
+                <DropDownButton Classes="Large" Content="Large" />
+            </StackPanel>

-            <HeaderedContentControl
-                Theme="{StaticResource GroupBox}">
-                <HeaderedContentControl.Header>
-                    <StackPanel Spacing="8">
-                        <TextBlock Text="AI style - Colorful Button" />
-                        <WrapPanel ItemSpacing="4">
-                            <TextBlock Text="Theme:" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Colorful Gradient Solid" Content="Light" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Colorful Gradient Solid" Content="Solid" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Colorful Gradient Solid" Content="Outline" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Colorful Gradient Solid" Content="Borderless" />
-                        </WrapPanel>
-                        <WrapPanel ItemSpacing="4">
-                            <TextBlock Text="Classes:" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Colorful Gradient" Content="Colorful Primary" />
-                            <Label Theme="{StaticResource TagLabel}" Classes="Colorful Gradient" Content="Colorful Tertiary" />
-                        </WrapPanel>
-                    </StackPanel>
-                </HeaderedContentControl.Header>
-                <StackPanel HorizontalAlignment="Left" Spacing="16">
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <Button Content="Primary" Classes="Colorful Primary" />
-                        <Button Content="Tertiary" Classes="Colorful Tertiary" />
-                        <Button Content="Disabled" Classes="Colorful Primary" IsEnabled="False" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <Button Content="Primary" Classes="Colorful Primary" Theme="{StaticResource SolidButton}" />
-                        <Button Content="Tertiary" Classes="Colorful Tertiary" Theme="{StaticResource SolidButton}" />
-                        <Button Content="Disabled" Classes="Colorful Primary" Theme="{StaticResource SolidButton}" IsEnabled="False" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <Button Content="Primary" Classes="Colorful Primary" Theme="{StaticResource OutlineButton}" />
-                        <Button Content="Tertiary" Classes="Colorful Tertiary" Theme="{StaticResource OutlineButton}" />
-                        <Button Content="Disabled" Classes="Colorful Primary" Theme="{StaticResource OutlineButton}" IsEnabled="False" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <Button Content="Primary" Classes="Colorful Primary" Theme="{StaticResource BorderlessButton}" />
-                        <Button Content="Tertiary" Classes="Colorful Tertiary" Theme="{StaticResource BorderlessButton}" />
-                        <Button Content="Disabled" Classes="Colorful Primary" Theme="{StaticResource BorderlessButton}" IsEnabled="False" />
-                    </WrapPanel>
-                </StackPanel>
-            </HeaderedContentControl>
+            <TextBlock>SplitButton</TextBlock>
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <SplitButton Content="Primary" />
+                <SplitButton Classes="Secondary" Content="Secondary" />
+                <SplitButton Classes="Tertiary" Content="Tertiary" />
+                <SplitButton Classes="Success" Content="Success" />
+                <SplitButton Classes="Warning" Content="Warning" />
+                <SplitButton Classes="Danger" Content="Danger" />
+                <SplitButton Classes="Danger" Content="Disabled" IsEnabled="False" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <SplitButton Content="Default" Classes="Success" />
+                <SplitButton Content="Solid" Theme="{DynamicResource SolidSplitButton}"  Classes="Success" />
+                <SplitButton Content="Outline" Theme="{DynamicResource OutlineSplitButton}" Classes="Success" />
+                <SplitButton Content="Borderless" Theme="{DynamicResource BorderlessSplitButton}" Classes="Success" />
+                <SplitButton Content="Default" Classes="Success" IsEnabled="False" />
+                <SplitButton Content="Solid" Theme="{DynamicResource SolidSplitButton}" Classes="Success" IsEnabled="False" />
+                <SplitButton Content="Outline" Theme="{DynamicResource OutlineSplitButton}" Classes="Success" IsEnabled="False" />
+                <SplitButton Content="Borderless" Theme="{DynamicResource BorderlessSplitButton}" Classes="Success" IsEnabled="False" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <SplitButton Classes="Small" Content="Small" />
+                <SplitButton Content="Default" />
+                <SplitButton Classes="Large" Content="Large" />
+            </StackPanel>

-            <HeaderedContentControl
-                Theme="{StaticResource GroupBox}" Header="DropDownButton">
-                <StackPanel HorizontalAlignment="Left" Spacing="16">
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <DropDownButton Content="Default" />
-                        <DropDownButton Content="Primary" Classes="Primary" />
-                        <DropDownButton Content="Secondary" Classes="Secondary" />
-                        <DropDownButton Content="Tertiary" Classes="Tertiary" />
-                        <DropDownButton Content="Success" Classes="Success" />
-                        <DropDownButton Content="Warning" Classes="Warning" />
-                        <DropDownButton Content="Danger" Classes="Danger" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <DropDownButton Content="Default" Theme="{StaticResource SolidDropDownButton}" />
-                        <DropDownButton Content="Primary" Classes="Primary" Theme="{StaticResource SolidDropDownButton}" />
-                        <DropDownButton Content="Secondary" Classes="Secondary" Theme="{StaticResource SolidDropDownButton}" />
-                        <DropDownButton Content="Tertiary" Classes="Tertiary" Theme="{StaticResource SolidDropDownButton}" />
-                        <DropDownButton Content="Success" Classes="Success" Theme="{StaticResource SolidDropDownButton}" />
-                        <DropDownButton Content="Warning" Classes="Warning" Theme="{StaticResource SolidDropDownButton}" />
-                        <DropDownButton Content="Danger" Classes="Danger" Theme="{StaticResource SolidDropDownButton}" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <DropDownButton Content="Default" Theme="{StaticResource OutlineDropDownButton}" />
-                        <DropDownButton Content="Primary" Classes="Primary" Theme="{StaticResource OutlineDropDownButton}" />
-                        <DropDownButton Content="Secondary" Classes="Secondary" Theme="{StaticResource OutlineDropDownButton}" />
-                        <DropDownButton Content="Tertiary" Classes="Tertiary" Theme="{StaticResource OutlineDropDownButton}" />
-                        <DropDownButton Content="Success" Classes="Success" Theme="{StaticResource OutlineDropDownButton}" />
-                        <DropDownButton Content="Warning" Classes="Warning" Theme="{StaticResource OutlineDropDownButton}" />
-                        <DropDownButton Content="Danger" Classes="Danger" Theme="{StaticResource OutlineDropDownButton}" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <DropDownButton Content="Default" Theme="{StaticResource BorderlessDropDownButton}" />
-                        <DropDownButton Content="Primary" Classes="Primary" Theme="{StaticResource BorderlessDropDownButton}" />
-                        <DropDownButton Content="Secondary" Classes="Secondary" Theme="{StaticResource BorderlessDropDownButton}" />
-                        <DropDownButton Content="Tertiary" Classes="Tertiary" Theme="{StaticResource BorderlessDropDownButton}" />
-                        <DropDownButton Content="Success" Classes="Success" Theme="{StaticResource BorderlessDropDownButton}" />
-                        <DropDownButton Content="Warning" Classes="Warning" Theme="{StaticResource BorderlessDropDownButton}" />
-                        <DropDownButton Content="Danger" Classes="Danger" Theme="{StaticResource BorderlessDropDownButton}" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <DropDownButton Content="Light" IsEnabled="False" />
-                        <DropDownButton Content="Solid" IsEnabled="False" Theme="{StaticResource SolidDropDownButton}" />
-                        <DropDownButton Content="Outline" IsEnabled="False" Theme="{StaticResource OutlineDropDownButton}" />
-                        <DropDownButton Content="Borderless" IsEnabled="False" Theme="{StaticResource BorderlessDropDownButton}" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <DropDownButton Content="Large" Classes="Large" />
-                        <DropDownButton Content="Default" />
-                        <DropDownButton Content="Small" Classes="Small" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <DropDownButton Content="Primary" Classes="Colorful Primary" />
-                        <DropDownButton Content="Tertiary" Classes="Colorful Tertiary" />
-                        <DropDownButton Content="Disabled" Classes="Colorful Primary" IsEnabled="False" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <DropDownButton Content="Primary" Classes="Colorful Primary" Theme="{StaticResource SolidDropDownButton}" />
-                        <DropDownButton Content="Tertiary" Classes="Colorful Tertiary" Theme="{StaticResource SolidDropDownButton}" />
-                        <DropDownButton Content="Disabled" Classes="Colorful Primary" Theme="{StaticResource SolidDropDownButton}" IsEnabled="False" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <DropDownButton Content="Primary" Classes="Colorful Primary" Theme="{StaticResource OutlineDropDownButton}" />
-                        <DropDownButton Content="Tertiary" Classes="Colorful Tertiary" Theme="{StaticResource OutlineDropDownButton}" />
-                        <DropDownButton Content="Disabled" Classes="Colorful Primary" Theme="{StaticResource OutlineDropDownButton}" IsEnabled="False" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <DropDownButton Content="Primary" Classes="Colorful Primary" Theme="{StaticResource BorderlessDropDownButton}" />
-                        <DropDownButton Content="Tertiary" Classes="Colorful Tertiary" Theme="{StaticResource BorderlessDropDownButton}" />
-                        <DropDownButton Content="Disabled" Classes="Colorful Primary" Theme="{StaticResource BorderlessDropDownButton}" IsEnabled="False" />
-                    </WrapPanel>
-                </StackPanel>
-            </HeaderedContentControl>
-
-            <HeaderedContentControl
-                Theme="{StaticResource GroupBox}" Header="SplitButton">
-                <StackPanel HorizontalAlignment="Left" Spacing="16">
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <SplitButton Content="Default" />
-                        <SplitButton Content="Primary" Classes="Primary" />
-                        <SplitButton Content="Secondary" Classes="Secondary" />
-                        <SplitButton Content="Tertiary" Classes="Tertiary" />
-                        <SplitButton Content="Success" Classes="Success" />
-                        <SplitButton Content="Warning" Classes="Warning" />
-                        <SplitButton Content="Danger" Classes="Danger" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <SplitButton Content="Default" Theme="{StaticResource SolidSplitButton}" />
-                        <SplitButton Content="Primary" Classes="Primary" Theme="{StaticResource SolidSplitButton}" />
-                        <SplitButton Content="Secondary" Classes="Secondary" Theme="{StaticResource SolidSplitButton}" />
-                        <SplitButton Content="Tertiary" Classes="Tertiary" Theme="{StaticResource SolidSplitButton}" />
-                        <SplitButton Content="Success" Classes="Success" Theme="{StaticResource SolidSplitButton}" />
-                        <SplitButton Content="Warning" Classes="Warning" Theme="{StaticResource SolidSplitButton}" />
-                        <SplitButton Content="Danger" Classes="Danger" Theme="{StaticResource SolidSplitButton}" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <SplitButton Content="Default" Theme="{StaticResource OutlineSplitButton}" />
-                        <SplitButton Content="Primary" Classes="Primary" Theme="{StaticResource OutlineSplitButton}" />
-                        <SplitButton Content="Secondary" Classes="Secondary" Theme="{StaticResource OutlineSplitButton}" />
-                        <SplitButton Content="Tertiary" Classes="Tertiary" Theme="{StaticResource OutlineSplitButton}" />
-                        <SplitButton Content="Success" Classes="Success" Theme="{StaticResource OutlineSplitButton}" />
-                        <SplitButton Content="Warning" Classes="Warning" Theme="{StaticResource OutlineSplitButton}" />
-                        <SplitButton Content="Danger" Classes="Danger" Theme="{StaticResource OutlineSplitButton}" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <SplitButton Content="Default" Theme="{StaticResource BorderlessSplitButton}" />
-                        <SplitButton Content="Primary" Classes="Primary" Theme="{StaticResource BorderlessSplitButton}" />
-                        <SplitButton Content="Secondary" Classes="Secondary" Theme="{StaticResource BorderlessSplitButton}" />
-                        <SplitButton Content="Tertiary" Classes="Tertiary" Theme="{StaticResource BorderlessSplitButton}" />
-                        <SplitButton Content="Success" Classes="Success" Theme="{StaticResource BorderlessSplitButton}" />
-                        <SplitButton Content="Warning" Classes="Warning" Theme="{StaticResource BorderlessSplitButton}" />
-                        <SplitButton Content="Danger" Classes="Danger" Theme="{StaticResource BorderlessSplitButton}" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <SplitButton Content="Light" IsEnabled="False" />
-                        <SplitButton Content="Solid" IsEnabled="False" Theme="{StaticResource SolidSplitButton}" />
-                        <SplitButton Content="Outline" IsEnabled="False" Theme="{StaticResource OutlineSplitButton}" />
-                        <SplitButton Content="Borderless" IsEnabled="False" Theme="{StaticResource BorderlessSplitButton}" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <SplitButton Content="Large" Classes="Large" />
-                        <SplitButton Content="Default" />
-                        <SplitButton Content="Small" Classes="Small" />
-                    </WrapPanel>
-                </StackPanel>
-            </HeaderedContentControl>
-
-            <HeaderedContentControl
-                Theme="{StaticResource GroupBox}"
-                Header="ToggleSplitButton">
-                <StackPanel HorizontalAlignment="Left" Spacing="24">
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleSplitButton Content="Default" />
-                        <ToggleSplitButton Classes="Primary" Content="Primary" />
-                        <ToggleSplitButton Classes="Secondary" Content="Secondary" />
-                        <ToggleSplitButton Classes="Tertiary" Content="Tertiary" />
-                        <ToggleSplitButton Classes="Success" Content="Success" />
-                        <ToggleSplitButton Classes="Warning" Content="Warning" />
-                        <ToggleSplitButton Classes="Danger" Content="Danger" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleSplitButton Content="Default" IsChecked="True" />
-                        <ToggleSplitButton Classes="Primary" Content="Primary" IsChecked="True" />
-                        <ToggleSplitButton Classes="Secondary" Content="Secondary" IsChecked="True" />
-                        <ToggleSplitButton Classes="Tertiary" Content="Tertiary" IsChecked="True" />
-                        <ToggleSplitButton Classes="Success" Content="Success" IsChecked="True" />
-                        <ToggleSplitButton Classes="Warning" Content="Warning" IsChecked="True" />
-                        <ToggleSplitButton Classes="Danger" Content="Danger" IsChecked="True" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleSplitButton Content="Unchecked" Classes="Success" IsEnabled="False" />
-                        <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True" IsEnabled="False" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleSplitButton Content="Large" Classes="Large" />
-                        <ToggleSplitButton Content="Default" />
-                        <ToggleSplitButton Content="Small" Classes="Small" />
-                    </WrapPanel>
-                </StackPanel>
-            </HeaderedContentControl>
-
-            <HeaderedContentControl
-                Theme="{StaticResource GroupBox}" Header="ToggleButton">
-                <StackPanel HorizontalAlignment="Left" Spacing="16">
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleButton Content="Default" />
-                        <ToggleButton Content="Primary" Classes="Primary" />
-                        <ToggleButton Content="Secondary" Classes="Secondary" />
-                        <ToggleButton Content="Tertiary" Classes="Tertiary" />
-                        <ToggleButton Content="Success" Classes="Success" />
-                        <ToggleButton Content="Warning" Classes="Warning" />
-                        <ToggleButton Content="Danger" Classes="Danger" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleButton Content="Default" IsChecked="True" />
-                        <ToggleButton Content="Primary" Classes="Primary" IsChecked="True" />
-                        <ToggleButton Content="Secondary" Classes="Secondary" IsChecked="True" />
-                        <ToggleButton Content="Tertiary" Classes="Tertiary" IsChecked="True" />
-                        <ToggleButton Content="Success" Classes="Success" IsChecked="True" />
-                        <ToggleButton Content="Warning" Classes="Warning" IsChecked="True" />
-                        <ToggleButton Content="Danger" Classes="Danger" IsChecked="True" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleButton Content="Default" IsChecked="{x:Null}" IsThreeState="True" />
-                        <ToggleButton Content="Primary" Classes="Primary" IsChecked="{x:Null}" IsThreeState="True" />
-                        <ToggleButton Content="Secondary" Classes="Secondary" IsChecked="{x:Null}" IsThreeState="True" />
-                        <ToggleButton Content="Tertiary" Classes="Tertiary" IsChecked="{x:Null}" IsThreeState="True" />
-                        <ToggleButton Content="Success" Classes="Success" IsChecked="{x:Null}" IsThreeState="True" />
-                        <ToggleButton Content="Warning" Classes="Warning" IsChecked="{x:Null}" IsThreeState="True" />
-                        <ToggleButton Content="Danger" Classes="Danger" IsChecked="{x:Null}" IsThreeState="True" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleButton Content="Unchecked" IsEnabled="False" />
-                        <ToggleButton Content="Checked" IsEnabled="False" IsChecked="True" />
-                        <ToggleButton Content="Indeterminate" IsEnabled="False" IsChecked="{x:Null}" IsThreeState="True" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleButton Content="Large" Classes="Large" />
-                        <ToggleButton Content="Default" />
-                        <ToggleButton Content="Small" Classes="Small" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleButton Content="Primary" Classes="Colorful Primary" />
-                        <ToggleButton Content="Tertiary" Classes="Colorful Tertiary" />
-                        <ToggleButton Content="Disabled" Classes="Colorful Primary" IsEnabled="False" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleButton Content="Primary" Classes="Colorful Primary" IsChecked="True" />
-                        <ToggleButton Content="Tertiary" Classes="Colorful Tertiary" IsChecked="True" />
-                        <ToggleButton Content="Disabled" Classes="Colorful Primary" IsChecked="True" IsEnabled="False" />
-                    </WrapPanel>
-                    <WrapPanel ItemSpacing="16" LineSpacing="16">
-                        <ToggleButton Content="Primary" Classes="Colorful Primary" IsChecked="{x:Null}" IsThreeState="True" />
-                        <ToggleButton Content="Tertiary" Classes="Colorful Tertiary" IsChecked="{x:Null}" IsThreeState="True" />
-                        <ToggleButton Content="Disabled" Classes="Colorful Primary" IsChecked="{x:Null}" IsThreeState="True" IsEnabled="False" />
-                    </WrapPanel>
-                </StackPanel>
-            </HeaderedContentControl>
+            <TextBlock>ToggleSplitButton</TextBlock>
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <ToggleSplitButton Content="Primary" />
+                <ToggleSplitButton Classes="Secondary" Content="Secondary" />
+                <ToggleSplitButton Classes="Tertiary" Content="Tertiary" />
+                <ToggleSplitButton Classes="Success" Content="Success" />
+                <ToggleSplitButton Classes="Warning" Content="Warning" />
+                <ToggleSplitButton Classes="Danger" Content="Danger" />
+                <ToggleSplitButton Classes="Danger" Content="Disabled" IsEnabled="False" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <ToggleSplitButton Content="Default" Classes="Success" />
+                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True"  />
+                <ToggleSplitButton Content="Default" Classes="Success" IsEnabled="False" />
+                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True" IsEnabled="False" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <ToggleSplitButton Classes="Small" Content="Small" />
+                <ToggleSplitButton Content="Default" />
+                <ToggleSplitButton Classes="Large" Content="Large" />
+            </StackPanel>
        </StackPanel>
    </ScrollViewer>
 </UserControl>
--- 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
@@ -8,10 +8,6 @@
    d:DesignWidth="800"
    mc:Ignorable="d">
    <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <StackPanel Orientation="Horizontal">
-            <ToggleSwitch Name="showSpinCheck" IsChecked="True" Content="Show Button Spinner" />
-            <ToggleSwitch Name="allowSpinCheck" IsChecked="True" Content="Allow Spin" />
-        </StackPanel>
        <ButtonSpinner
            Height="30"
            AllowSpin="{Binding #allowSpinCheck.IsChecked}"
@@ -36,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.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.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,7 +2,8 @@
    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"
@@ -10,15 +11,18 @@
    mc:Ignorable="d">
    <ScrollViewer>
        <StackPanel Spacing="20">
-            <StackPanel Orientation="Horizontal" Spacing="20">
+            <StackPanel
+                VerticalAlignment="Top"
+                Orientation="Horizontal"
+                Spacing="20">
                <ColorView Name="Test" ColorSpectrumShape="Ring" />
                <ColorView ColorSpectrumShape="Box" />
                <ColorView Palette="{DynamicResource SemiColorPalette}" />
            </StackPanel>
-            <StackPanel Orientation="Horizontal">
+            <StackPanel VerticalAlignment="Top" Orientation="Horizontal">
                <ColorView
                    Name="SimpleColorViewTest"
-                    HsvColor="hsv(180,80%,70%)"
+                    HsvColor="hsv(120,11%,10%)"
                    IsAlphaVisible="True"
                    Theme="{StaticResource SimpleColorView}" />
                <StackPanel>
@@ -26,55 +30,63 @@
                    <TextBlock Text="{Binding #SimpleColorViewTest.Color}" />
                </StackPanel>
            </StackPanel>
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <ColorPicker ColorSpectrumShape="Ring">
+            <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
+                <ColorPicker Margin="8" ColorSpectrumShape="Ring">
                    <ColorPicker.Palette>
-                        <FlatHalfColorPalette />
+                        <controls:FlatHalfColorPalette />
                    </ColorPicker.Palette>
                </ColorPicker>
-                <ColorPicker ColorSpectrumShape="Box">
+                <ColorPicker Margin="8" ColorSpectrumShape="Box">
                    <ColorPicker.Palette>
-                        <semi:SemiColorLightPalette />
+                        <colorPicker:SemiColorLightPalette />
                    </ColorPicker.Palette>
                </ColorPicker>
+
                <ColorPicker
-                    Theme="{DynamicResource HexColorPicker}"
-                    ColorSpectrumShape="Box">
+                    Margin="8"
+                    ColorSpectrumShape="Box"
+                    Theme="{DynamicResource HexColorPicker}">
                    <ColorPicker.Palette>
-                        <semi:SemiColorLightPalette />
+                        <colorPicker:SemiColorLightPalette />
                    </ColorPicker.Palette>
                </ColorPicker>
            </StackPanel>
-            <StackPanel HorizontalAlignment="Left">
-                <TextBlock Text="Use Style to customize button" />
+            <StackPanel HorizontalAlignment="Left" >
+                <TextBlock Text="Use Style to customize button"></TextBlock>
                <ColorPicker
                    Margin="8"
-                    MinWidth="32"
-                    HsvColor="hsv(180,80%,70%)">
+                    Width="32"
+                    HsvColor="hsv(120,11%,10%)"
+                    >
                    <ColorPicker.Content>
                        <Border
                            Margin="1"
-                            Background="{Binding $parent[ColorPicker].HsvColor, Converter={StaticResource ToBrushConverter}}"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Background="{Binding $parent[ColorPicker].HsvColor, 
+                                                     Converter={StaticResource ToBrushConverter}}"
                            CornerRadius="1" />
                    </ColorPicker.Content>
                    <ColorPicker.Styles>
                        <Style Selector="DropDownButton">
-                            <Setter Property="Padding" Value="0" />
+                            <Setter Property="Padding" Value="0"/>
                            <Style Selector="^ /template/ PathIcon">
-                                <Setter Property="IsVisible" Value="False" />
+                                <Setter Property="IsVisible" Value="False"/>
                            </Style>
                        </Style>
                    </ColorPicker.Styles>
                </ColorPicker>
-            </StackPanel>

-            <StackPanel Orientation="Horizontal" Spacing="8">
+            </StackPanel>
+            <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                <ColorPicker
-                    Theme="{StaticResource SimpleColorPicker}"
-                    HsvColor="hsv(180,80%,70%)" />
+                    Margin="8"
+                    HsvColor="hsv(120,11%,10%)"
+                    Theme="{StaticResource SimpleColorPicker}" />
                <ColorPicker
-                    Theme="{StaticResource HexSimpleColorPicker}"
-                    HsvColor="hsv(180,80%,70%)" />
+                    Margin="8"
+                    HsvColor="hsv(120,11%,10%)"
+                    Theme="{StaticResource HexSimpleColorPicker}" />
            </StackPanel>
        </StackPanel>
    </ScrollViewer>
--- 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,54 +4,49 @@
    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:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
    d:DesignHeight="800"
    d:DesignWidth="800"
-    mc:Ignorable="d"
-    x:DataType="vm:ComboBoxDemoViewModel">
+    mc:Ignorable="d">
    <Design.DataContext>
-        <vm:ComboBoxDemoViewModel />
+        <pages:ComboBoxDemoViewModel />
    </Design.DataContext>
-    <ScrollViewer>
-        <StackPanel Spacing="20">
-            <StackPanel.Styles>
-                <Style Selector="ComboBox">
-                    <Setter Property="Width" Value="300" />
-                    <Setter Property="ItemsSource" Value="{Binding Items}" />
-                </Style>
-            </StackPanel.Styles>
+    <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>
+        <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>

-            <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>
-            <ToggleSwitch Name="toggle" IsChecked="True" Content="IsEditable" />
-            <ComboBox IsEditable="{Binding #toggle.IsChecked}" />
+        <StackPanel Orientation="Horizontal">
+            <ComboBox Width="100" Classes="Large" PlaceholderText="Large" />
+            <ComboBox Width="100" PlaceholderText="Default" />
+            <ComboBox Width="100" Classes="Small" PlaceholderText="Small" />
        </StackPanel>
-    </ScrollViewer>
-</UserControl>
+
+        <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>
--- a/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml.cs
@@ -1,5 +1,6 @@
+using System.Collections.ObjectModel;
 using Avalonia.Controls;
-using Semi.Avalonia.Demo.ViewModels;
+using CommunityToolkit.Mvvm.ComponentModel;

 namespace Semi.Avalonia.Demo.Pages;

@@ -10,4 +11,9 @@ public partial class ComboBoxDemo : UserControl
        InitializeComponent();
        this.DataContext = new ComboBoxDemoViewModel();
    }
+}
+
+public class ComboBoxDemoViewModel : ObservableObject
+{
+    public ObservableCollection<string> Items { get; set; } = ["Ding", "Otter", "Husky", "Mr.17", "Cass"];
 }
--- a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
@@ -3,62 +3,62 @@
    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"
    d:DesignWidth="800"
+    x:CompileBindings="True"
    x:DataType="vm:DataGridDemoViewModel"
    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, *">
+               <StackPanel Grid.Row="0" Orientation="Horizontal">
+                   <ToggleSwitch Content="Disable" Name="DisableToggle" />
+                   <ToggleSwitch Content="ScrollViewerHide" Name="ScrollViewerHide" />
+               </StackPanel>
+               <DataGrid Grid.Row="1"
+                         Margin="8"
+                         CanUserReorderColumns="True"
+                         CanUserResizeColumns="True"
+                         CanUserSortColumns="True"
+                         HeadersVisibility="All"
+                         IsReadOnly="True"
+                         ScrollViewer.AllowAutoHide="{Binding #ScrollViewerHide.IsChecked}"
+                         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
@@ -176,4 +176,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
@@ -26,4 +26,4 @@
        </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.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.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
@@ -14,13 +14,13 @@
            RowDefinitions="*, Auto, *">
            <Border
                HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiGrey0Color}"
+                Background="{DynamicResource SemiYellow3Color}"
                CornerRadius="10" />
            <GridSplitter Grid.Row="1" ShowsPreview="True" />
            <Border
                Grid.Row="2"
                HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiGrey0Color}"
+                Background="{DynamicResource SemiYellow3Color}"
                CornerRadius="10" />
        </Grid>
        <Grid
@@ -29,14 +29,14 @@
            ColumnDefinitions="*, Auto, *">
            <Border
                HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiGrey0Color}"
+                Background="{DynamicResource SemiYellow3Color}"
                CornerRadius="10" />
            <GridSplitter Grid.Column="1" ShowsPreview="True" />
            <Border
                Grid.Column="2"
                HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiGrey0Color}"
+                Background="{DynamicResource SemiYellow3Color}"
                CornerRadius="10" />
        </Grid>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +9,9 @@ public partial class GridSplitterDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/HighContrastDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/HighContrastDemo.axaml
@@ -1,327 +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: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.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs
@@ -1,4 +1,7 @@
+using System;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/IconDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/IconDemo.axaml
@@ -1,84 +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"
-            Theme="{StaticResource LineTabControl}"
-            ItemsSource="{Binding IconTabs}">
-            <TabControl.ItemTemplate>
-                <DataTemplate>
-                    <WrapPanel ItemSpacing="5">
-                        <TextBlock Text="{Binding Header}" />
-                        <Label 
-                            Theme="{StaticResource TagLabel}"
-                            Classes="Purple"
-                            IsVisible="{Binding Header, 
-                                Converter={x:Static ObjectConverters.Equal},
-                                ConverterParameter='AI Icons'}"
-                            Content="New" />
-                    </WrapPanel>
-                </DataTemplate>
-            </TabControl.ItemTemplate>
-
-            <TabControl.ContentTemplate>
-                <DataTemplate DataType="vm:IconTab">
-                    <ScrollViewer>
-                        <ItemsControl
-                            Margin="0 10"
-                            ItemsSource="{Binding IconItems}">
-                            <ItemsControl.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <WrapPanel
-                                        ItemWidth="200"
-                                        ItemHeight="120"
-                                        ItemSpacing="10"
-                                        LineSpacing="10" />
-                                </ItemsPanelTemplate>
-                            </ItemsControl.ItemsPanel>
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate>
-                                    <Button Theme="{DynamicResource OutlineButton}"
-                                            Classes="Tertiary"
-                                            Padding="0"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            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>
-                </DataTemplate>
-            </TabControl.ContentTemplate>
-        </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
@@ -8,11 +8,14 @@
    d:DesignWidth="800"
    mc:Ignorable="d">
    <ScrollViewer>
-        <StackPanel>
+        <StackPanel HorizontalAlignment="Left" Spacing="20">
            <StackPanel.Styles>
-                <Style Selector="Grid > TextBlock,Grid > Label">
-                    <Setter Property="Layoutable.VerticalAlignment" Value="Center" />
-                    <Setter Property="Layoutable.Margin" Value="4" />
+                <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">
@@ -28,7 +31,7 @@
                            VerticalAlignment="Top"
                            ColumnDefinitions="Auto, *"
                            RowDefinitions="*,*,*,*,*,*,*,*,*,*,*">
-                            <TextBlock Grid.Row="0" Grid.Column="0">Classes</TextBlock>
+                            <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>
@@ -153,89 +156,69 @@
                    </HeaderedContentControl>
                </StackPanel>
            </ScrollViewer>
-
-            <HeaderedContentControl
-                Margin="16"
-                Header="Theme: TagLabel"
-                Theme="{DynamicResource GroupBox}">
-                <ScrollViewer HorizontalScrollBarVisibility="Auto">
-                    <StackPanel Orientation="Horizontal" Spacing="8">
-                        <StackPanel Spacing="4">
-                            <Label Classes="Red" Theme="{StaticResource TagLabel}">Red</Label>
-                            <Label Classes="Pink" Theme="{StaticResource TagLabel}">Pink</Label>
-                            <Label Classes="Purple" Theme="{StaticResource TagLabel}">Purple</Label>
-                            <Label Classes="Violet" Theme="{StaticResource TagLabel}">Violet</Label>
-                            <Label Classes="Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
-                            <Label Classes="Blue" Theme="{StaticResource TagLabel}">Blue</Label>
-                            <Label Classes="LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
-                            <Label Classes="Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
-                            <Label Classes="Teal" Theme="{StaticResource TagLabel}">Teal</Label>
-                            <Label Classes="Green" Theme="{StaticResource TagLabel}">Green</Label>
-                            <Label Classes="LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
-                            <Label Classes="Lime" Theme="{StaticResource TagLabel}">Lime</Label>
-                            <Label Classes="Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
-                            <Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
-                            <Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
-                            <Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
-                            <Label Classes="White" Theme="{StaticResource TagLabel}">White</Label>
-                        </StackPanel>
-                        <StackPanel Spacing="4">
-                            <Label Classes="Ghost Red" Theme="{StaticResource TagLabel}">Red</Label>
-                            <Label Classes="Ghost Pink" Theme="{StaticResource TagLabel}">Pink</Label>
-                            <Label Classes="Ghost Purple" Theme="{StaticResource TagLabel}">Purple</Label>
-                            <Label Classes="Ghost Violet" Theme="{StaticResource TagLabel}">Violet</Label>
-                            <Label Classes="Ghost Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
-                            <Label Classes="Ghost Blue" Theme="{StaticResource TagLabel}">Blue</Label>
-                            <Label Classes="Ghost LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
-                            <Label Classes="Ghost Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
-                            <Label Classes="Ghost Teal" Theme="{StaticResource TagLabel}">Teal</Label>
-                            <Label Classes="Ghost Green" Theme="{StaticResource TagLabel}">Green</Label>
-                            <Label Classes="Ghost LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
-                            <Label Classes="Ghost Lime" Theme="{StaticResource TagLabel}">Lime</Label>
-                            <Label Classes="Ghost Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
-                            <Label Classes="Ghost Amber" Theme="{StaticResource TagLabel}">Amber</Label>
-                            <Label Classes="Ghost Orange" Theme="{StaticResource TagLabel}">Orange</Label>
-                            <Label Classes="Ghost Grey" Theme="{StaticResource TagLabel}">Grey</Label>
-                            <Label Classes="Ghost White" Theme="{StaticResource TagLabel}">White</Label>
-                        </StackPanel>
-                        <StackPanel Spacing="4">
-                            <Label Classes="Solid Red" Theme="{StaticResource TagLabel}">Red</Label>
-                            <Label Classes="Solid Pink" Theme="{StaticResource TagLabel}">Pink</Label>
-                            <Label Classes="Solid Purple" Theme="{StaticResource TagLabel}">Purple</Label>
-                            <Label Classes="Solid Violet" Theme="{StaticResource TagLabel}">Violet</Label>
-                            <Label Classes="Solid Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
-                            <Label Classes="Solid Blue" Theme="{StaticResource TagLabel}">Blue</Label>
-                            <Label Classes="Solid LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
-                            <Label Classes="Solid Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
-                            <Label Classes="Solid Teal" Theme="{StaticResource TagLabel}">Teal</Label>
-                            <Label Classes="Solid Green" Theme="{StaticResource TagLabel}">Green</Label>
-                            <Label Classes="Solid LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
-                            <Label Classes="Solid Lime" Theme="{StaticResource TagLabel}">Lime</Label>
-                            <Label Classes="Solid Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
-                            <Label Classes="Solid Amber" Theme="{StaticResource TagLabel}">Amber</Label>
-                            <Label Classes="Solid Orange" Theme="{StaticResource TagLabel}">Orange</Label>
-                            <Label Classes="Solid Grey" Theme="{StaticResource TagLabel}">Grey</Label>
-                            <Label Classes="Solid White" Theme="{StaticResource TagLabel}">White</Label>
-                        </StackPanel>
-                        <StackPanel Spacing="4">
-                            <Label Classes="Colorful Gradient" Theme="{DynamicResource TagLabel}">Light</Label>
-                            <Label Classes="Colorful Gradient Ghost" Theme="{DynamicResource TagLabel}">Ghost</Label>
-                            <Label Classes="Colorful Gradient Solid" Theme="{DynamicResource TagLabel}">Solid</Label>
-                        </StackPanel>
-                        <StackPanel Spacing="4">
-                            <Label Classes="Colorful" Theme="{DynamicResource TagLabel}">Light</Label>
-                            <Label Classes="Colorful Ghost" Theme="{DynamicResource TagLabel}">Ghost</Label>
-                            <Label Classes="Colorful Solid" Theme="{DynamicResource TagLabel}">Solid</Label>
-                        </StackPanel>
-                        <StackPanel Spacing="4">
-                            <Label Theme="{StaticResource TagLabel}">Label</Label>
-                            <Label Classes="Large" Theme="{StaticResource TagLabel}">Large Label</Label>
-                            <Label Classes="Circle" Theme="{StaticResource TagLabel}">Circle Label</Label>
-                            <Label Classes="Large Circle" Theme="{StaticResource TagLabel}">Large Circle Label</Label>
-                        </StackPanel>
-                    </StackPanel>
-                </ScrollViewer>
-            </HeaderedContentControl>
+            <WrapPanel>
+                <Label Theme="{StaticResource TagLabel}">Label</Label>
+                <Label Classes="Large" Theme="{StaticResource TagLabel}">Large Label</Label>
+                <Label Classes="Circle" Theme="{StaticResource TagLabel}">Circle Label</Label>
+                <Label Classes="Large Circle" Theme="{StaticResource TagLabel}">Large Circle Label</Label>
+            </WrapPanel>
+            <WrapPanel>
+                <Label Classes="Red" Theme="{StaticResource TagLabel}">Red</Label>
+                <Label Classes="Pink" Theme="{StaticResource TagLabel}">Pink</Label>
+                <Label Classes="Purple" Theme="{StaticResource TagLabel}">Purple</Label>
+                <Label Classes="Violet" Theme="{StaticResource TagLabel}">Violet</Label>
+                <Label Classes="Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
+                <Label Classes="Blue" Theme="{StaticResource TagLabel}">Blue</Label>
+                <Label Classes="LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
+                <Label Classes="Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
+                <Label Classes="Teal" Theme="{StaticResource TagLabel}">Teal</Label>
+                <Label Classes="Green" Theme="{StaticResource TagLabel}">Green</Label>
+                <Label Classes="LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
+                <Label Classes="Lime" Theme="{StaticResource TagLabel}">Lime</Label>
+                <Label Classes="Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
+                <Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
+                <Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
+                <Label Classes="White" Theme="{StaticResource TagLabel}">White</Label>
+            </WrapPanel>
+            <WrapPanel>
+                <Label Classes="Ghost Red" Theme="{StaticResource TagLabel}">Red</Label>
+                <Label Classes="Ghost Pink" Theme="{StaticResource TagLabel}">Pink</Label>
+                <Label Classes="Ghost Purple" Theme="{StaticResource TagLabel}">Purple</Label>
+                <Label Classes="Ghost Violet" Theme="{StaticResource TagLabel}">Violet</Label>
+                <Label Classes="Ghost Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
+                <Label Classes="Ghost Blue" Theme="{StaticResource TagLabel}">Blue</Label>
+                <Label Classes="Ghost LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
+                <Label Classes="Ghost Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
+                <Label Classes="Ghost Teal" Theme="{StaticResource TagLabel}">Teal</Label>
+                <Label Classes="Ghost Green" Theme="{StaticResource TagLabel}">Green</Label>
+                <Label Classes="Ghost LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
+                <Label Classes="Ghost Lime" Theme="{StaticResource TagLabel}">Lime</Label>
+                <Label Classes="Ghost Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
+                <Label Classes="Ghost Amber" Theme="{StaticResource TagLabel}">Amber</Label>
+                <Label Classes="Ghost Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Ghost Grey" Theme="{StaticResource TagLabel}">Grey</Label>
+                <Label Classes="Ghost White" Theme="{StaticResource TagLabel}">White</Label>
+            </WrapPanel>
+            <WrapPanel>
+                <Label Classes="Solid Red" Theme="{StaticResource TagLabel}">Red</Label>
+                <Label Classes="Solid Pink" Theme="{StaticResource TagLabel}">Pink</Label>
+                <Label Classes="Solid Purple" Theme="{StaticResource TagLabel}">Purple</Label>
+                <Label Classes="Solid Violet" Theme="{StaticResource TagLabel}">Violet</Label>
+                <Label Classes="Solid Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
+                <Label Classes="Solid Blue" Theme="{StaticResource TagLabel}">Blue</Label>
+                <Label Classes="Solid LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
+                <Label Classes="Solid Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
+                <Label Classes="Solid Teal" Theme="{StaticResource TagLabel}">Teal</Label>
+                <Label Classes="Solid Green" Theme="{StaticResource TagLabel}">Green</Label>
+                <Label Classes="Solid LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
+                <Label Classes="Solid Lime" Theme="{StaticResource TagLabel}">Lime</Label>
+                <Label Classes="Solid Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
+                <Label Classes="Solid Amber" Theme="{StaticResource TagLabel}">Amber</Label>
+                <Label Classes="Solid Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Solid Grey" Theme="{StaticResource TagLabel}">Grey</Label>
+                <Label Classes="Solid White" Theme="{StaticResource TagLabel}">White</Label>
+            </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
@@ -17,4 +17,4 @@
        <Button Name="SelectFolderButton" Content="Select Folder" />
        <Button Name="SaveFileButton" Content="Save File" />
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml
@@ -145,4 +145,4 @@
            <TextBlock Text="Right Click to show Context Flyout" />
        </Border>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -9,4 +11,8 @@ public partial class MenuDemo : UserControl
        InitializeComponent();
    }

+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml.cs
@@ -27,8 +27,7 @@ public partial class NotificationDemo : UserControl
        if (sender is RadioButton b && b.Content is string s)
        {
            Enum.TryParse<NotificationPosition>(s, out var t);
-            if (_manager is not null)
-                _manager.Position = t;
+            _manager.Position = t;
        }
    }

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

 namespace Semi.Avalonia.Demo.Pages;

@@ -9,4 +11,8 @@ public partial class NumericUpDownDemo : UserControl
        InitializeComponent();
    }

+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
@@ -31,19 +31,19 @@
                <PathIcon
                    Width="32"
                    Height="32"
-                    Data="{StaticResource SemiIconSemiLogo}" />
+                    Data="M10.6201 17.5C6.06377 17.5 2.37012 13.8063 2.37012 9.25C2.37012 4.69365 6.06377 1 10.6201 1V17.5ZM13.3701 6.5C17.9265 6.5 21.6201 10.1936 21.6201 14.75C21.6201 19.3063 17.9265 23 13.3701 23V6.5Z" />
                <PathIcon
                    Width="10"
                    Height="10"
                    Margin="20,0"
-                    Data="{StaticResource SemiIconPlus}" />
+                    Data="M20.5 13.5C21.3284 13.5 22 12.8284 22 12C22 11.1716 21.3284 10.5 20.5 10.5L13.5 10.5L13.5 3.5C13.5 2.67157 12.8284 2 12 2C11.1716 2 10.5 2.67157 10.5 3.5L10.5 10.5L3.5 10.5C2.67157 10.5 2 11.1716 2 12C2 12.8284 2.67157 13.5 3.5 13.5L10.5 13.5V20.5C10.5 21.3284 11.1716 22 12 22C12.8284 22 13.5 21.3284 13.5 20.5V13.5L20.5 13.5Z" />
                <Image Width="32" Height="32">
                    <Image.Source>
                        <DrawingImage>
                            <DrawingGroup>
-                                <GeometryDrawing Brush="#0D6EFD" Geometry="M74.8535 85.8231C75.0263 85.8231 75.1954 85.8231 75.3679 85.8231C80.7347 85.8231 85.1439 81.8027 85.7614 76.6019L85.8357 41.7604C85.2255 18.5931 66.2537 0 42.9393 0C19.2399 0 0.02771 19.2122 0.02771 42.9116C0.02771 66.3573 18.8309 85.418 42.18 85.8231H74.8535Z" />
-                                <GeometryDrawing Brush="White" Geometry="M43.0585 14.6143C29.5513 14.6143 18.2555 24.082 15.4454 36.7432C18.1357 37.4975 20.1087 39.9679 20.1087 42.8992C20.1087 45.8305 18.1357 48.301 15.4454 49.0552C18.2555 61.7164 29.5513 71.1842 43.0585 71.1842C47.9754 71.1842 52.5993 69.9296 56.6276 67.723V70.9926H71.3435V44.0716C71.3569 43.7138 71.3435 43.2603 71.3435 42.8992C71.3435 27.2779 58.6799 14.6143 43.0585 14.6143ZM29.5096 42.8992C29.5096 35.4164 35.5757 29.3503 43.0585 29.3503C50.5414 29.3503 56.6074 35.4164 56.6074 42.8992C56.6074 50.3821 50.5414 56.4481 43.0585 56.4481C35.5757 56.4481 29.5096 50.3821 29.5096 42.8992Z" />
-                                <GeometryDrawing Brush="White" Geometry="M18.105 42.8805C18.105 45.3803 16.0785 47.4068 13.5787 47.4068C11.0789 47.4068 9.05237 45.3803 9.05237 42.8805C9.05237 40.3807 11.0789 38.3542 13.5787 38.3542C16.0785 38.3542 18.105 40.3807 18.105 42.8805Z" />
+                                <GeometryDrawing Brush="#8B44AC" Geometry="M74.8535 85.8231C75.0263 85.8231 75.1954 85.8231 75.3679 85.8231C80.7347 85.8231 85.1439 81.8027 85.7614 76.6019L85.8357 41.7604C85.2255 18.5931 66.2537 0 42.9393 0C19.2399 0 0.02771 19.2122 0.02771 42.9116C0.02771 66.3573 18.8309 85.418 42.18 85.8231H74.8535Z" />
+                                <GeometryDrawing Brush="#F9F9FB" Geometry="M43.0585 14.6143C29.5513 14.6143 18.2555 24.082 15.4454 36.7432C18.1357 37.4975 20.1087 39.9679 20.1087 42.8992C20.1087 45.8305 18.1357 48.301 15.4454 49.0552C18.2555 61.7164 29.5513 71.1842 43.0585 71.1842C47.9754 71.1842 52.5993 69.9296 56.6276 67.723V70.9926H71.3435V44.0716C71.3569 43.7138 71.3435 43.2603 71.3435 42.8992C71.3435 27.2779 58.6799 14.6143 43.0585 14.6143ZM29.5096 42.8992C29.5096 35.4164 35.5757 29.3503 43.0585 29.3503C50.5414 29.3503 56.6074 35.4164 56.6074 42.8992C56.6074 50.3821 50.5414 56.4481 43.0585 56.4481C35.5757 56.4481 29.5096 50.3821 29.5096 42.8992Z" />
+                                <GeometryDrawing Brush="#F9F9FB" Geometry="M18.105 42.8805C18.105 45.3803 16.0785 47.4068 13.5787 47.4068C11.0789 47.4068 9.05237 45.3803 9.05237 42.8805C9.05237 40.3807 11.0789 38.3542 13.5787 38.3542C16.0785 38.3542 18.105 40.3807 18.105 42.8805Z" />
                            </DrawingGroup>
                        </DrawingImage>
                    </Image.Source>
@@ -234,7 +234,7 @@
                            VerticalAlignment="Top"
                            Palette="{DynamicResource SemiColorPalette}"
                            SelectedIndex="2"
-                            Color="#0D6EFD" />
+                            Color="#8B44AC" />
                        <StackPanel Width="300" Margin="8">
                            <StackPanel Orientation="Horizontal">
                                <Slider
@@ -348,7 +348,7 @@
                    Classes="H5"
                    Text="Start to install"
                    Theme="{DynamicResource TitleTextBlock}" />
-                <TabControl Theme="{StaticResource LineTabControl}">
+                <TabControl Padding="8">
                    <TabItem Header="Main">
                        <StackPanel>
                            <TextBlock Text="Install via nuget: " />
@@ -409,51 +409,6 @@
                            </Border>
                        </StackPanel>
                    </TabItem>
-                    <TabItem Header="Dock">
-                        <StackPanel>
-                            <TextBlock Text="Install via nuget: " />
-                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].DockInstall}" />
-                            </Border>
-                            <TextBlock Text="Reference styles: " />
-                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock
-                                    FontFamily="Consolas"
-                                    Text="{Binding $parent[local:Overview].DockStyle}"
-                                    TextWrapping="Wrap" />
-                            </Border>
-                        </StackPanel>
-                    </TabItem>
-                    <TabItem Header="Tabalonia">
-                        <StackPanel>
-                            <TextBlock Text="Install via nuget: " />
-                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].TabaloniaInstall}" />
-                            </Border>
-                            <TextBlock Text="Reference styles: " />
-                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock
-                                    FontFamily="Consolas"
-                                    Text="{Binding $parent[local:Overview].TabaloniaStyle}"
-                                    TextWrapping="Wrap" />
-                            </Border>
-                        </StackPanel>
-                    </TabItem>
-                    <TabItem Header="AvaloniaEdit">
-                        <StackPanel>
-                            <TextBlock Text="Install via nuget: " />
-                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].AvaloniaEditInstall}" />
-                            </Border>
-                            <TextBlock Text="Reference styles: " />
-                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock
-                                    FontFamily="Consolas"
-                                    Text="{Binding $parent[local:Overview].AvaloniaEditStyle}"
-                                    TextWrapping="Wrap" />
-                            </Border>
-                        </StackPanel>
-                    </TabItem>
                </TabControl>
            </StackPanel>
        </StackPanel>
--- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
@@ -9,66 +9,41 @@ public partial class Overview : UserControl
        InitializeComponent();
    }

-    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia";
+    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.1.0";

    public string MainStyle { get; set; } =
        """
        <Application.Styles>
-            <semi:SemiTheme Locale="zh-CN" />
+        <!-- You can still reference in old way.  -->
+        <!-- <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" /> -->
+            <semi:SemiTheme Locale="zh-cn" />
        </Application.Styles>
        """;

-    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker";
+    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.1.0";

    public string ColorPickerStyle { get; set; } =
        """
        <Application.Styles>
-            <semi:ColorPickerSemiTheme />
+            <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
        </Application.Styles>
        """;

-    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid";
+    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.1.0";

    public string DataGridStyle { get; set; } =
        """
        <Application.Styles>
-            <semi:DataGridSemiTheme />
+            <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
        </Application.Styles>
        """;

-    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid";
+    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.1.0";

    public string TreeDataGridStyle { get; set; } =
        """
        <Application.Styles>
-            <semi:TreeDataGridSemiTheme />
-        </Application.Styles>
-        """;
-
-    public string DockInstall { get; set; } = "dotnet add package Semi.Avalonia.Dock";
-
-    public string DockStyle { get; set; } =
-        """
-        <Application.Styles>
-            <semi:DockSemiTheme />
-        </Application.Styles>
-        """;
-
-    public string TabaloniaInstall { get; set; } = "dotnet add package Semi.Avalonia.Tabalonia";
-
-    public string TabaloniaStyle { get; set; } =
-        """
-        <Application.Styles>
-            <semi:TabaloniaSemiTheme />
-        </Application.Styles>
-        """;
-
-    public string AvaloniaEditInstall { get; set; } = "dotnet add package Semi.Avalonia.AvaloniaEdit";
-
-    public string AvaloniaEditStyle { get; set; } =
-        """
-        <Application.Styles>
-            <semi:AvaloniaEditSemiTheme />
+            <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
        </Application.Styles>
        """;
 }
--- a/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml
@@ -8,11 +8,23 @@
    xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels"
    d:DesignHeight="450"
    d:DesignWidth="800"
+    x:CompileBindings="True"
    x:DataType="viewModels:PaletteDemoViewModel"
    mc:Ignorable="d">
    <Design.DataContext>
        <viewModels:PaletteDemoViewModel />
    </Design.DataContext>
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="../Themes/ToggleSwitch.axaml" />
+                <ResourceInclude Source="../Controls/ColorItemControl.axaml" />
+                <ResourceInclude Source="../Controls/ColorDetailControl.axaml" />
+                <ResourceInclude Source="../Controls/FunctionalColorGroupControl.axaml" />
+                <ResourceInclude Source="../Controls/ShadowGroupControl.axaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
    <SplitView
        Name="splitView"
        CompactPaneLength="50"
@@ -26,8 +38,7 @@
                    Name="toggle"
                    HorizontalAlignment="Right"
                    IsChecked="True"
-                    Theme="{DynamicResource IconBorderlessToggleSwitch}"
-                    Content="{StaticResource SemiIconSidebar}" />
+                    Theme="{DynamicResource SplitViewToggleSwitch}" />
                <Border IsVisible="{Binding #splitView.IsPaneOpen}" Theme="{DynamicResource CardBorder}">
                    <Panel>
                        <TextBlock
--- a/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml.cs
@@ -1,6 +1,8 @@
 using System.Threading.Tasks;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Markup.Xaml;
 using Avalonia.Threading;
 using Semi.Avalonia.Demo.ViewModels;

@@ -14,20 +16,13 @@ public partial class PaletteDemo : UserControl
        this.DataContext = new PaletteDemoViewModel();
    }

-    protected override async void OnApplyTemplate(TemplateAppliedEventArgs e)
+    protected override async  void OnApplyTemplate(TemplateAppliedEventArgs e)
    {
        base.OnApplyTemplate(e);
        PaletteDemoViewModel? vm = this.DataContext as PaletteDemoViewModel;
-        await Dispatcher.UIThread.InvokeAsync(() => { vm?.InitializeResources(); });
-    }
-
-    public async Task Copy(object? o)
-    {
-        if (o is null) return;
-        var toplevel = TopLevel.GetTopLevel(this);
-        if (toplevel?.Clipboard is { } c)
+        await Dispatcher.UIThread.InvokeAsync(() =>
        {
-            await c.SetTextAsync(o.ToString());
-        }
+            vm?.InitializeResources();
+        });
    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml
@@ -12,7 +12,7 @@
            <StackPanel.Styles>
                <Style Selector="PathIcon">
                    <Setter Property="Theme" Value="{DynamicResource InnerPathIcon}" />
-                    <Setter Property="Data" Value="{StaticResource SemiIconSearch}" />
+                    <Setter Property="Data" Value="M10.5 2C5.80558 2 2 5.80558 2 10.5C2 15.1944 5.80558 19 10.5 19C12.3054 19 13.9794 18.4371 15.356 17.4773L19.4393 21.5606C20.0251 22.1464 20.9749 22.1464 21.5606 21.5606C22.1464 20.9749 22.1464 20.0251 21.5606 19.4393L17.4773 15.356C18.4371 13.9794 19 12.3054 19 10.5C19 5.80558 15.1944 2 10.5 2ZM5 10.5C5 7.46243 7.46243 5 10.5 5C13.5376 5 16 7.46243 16 10.5C16 13.5376 13.5376 16 10.5 16C7.46243 16 5 13.5376 5 10.5Z" />
                </Style>
            </StackPanel.Styles>
            <PathIcon Classes="ExtraSmall" />
@@ -31,6 +31,6 @@
            Height="{Binding #width.Value}"
            Foreground="{DynamicResource SemiBlue6}"
            BorderBrush="{DynamicResource SemiRed6}"
-            Data="{StaticResource SemiIconHome}" />
+            Data="M12 3L2 12H5V20H19V12H22L12 3M13 18H11V16H13V18M13 14H11V8H13V14Z" />
    </StackPanel>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml.cs
@@ -1,4 +1,6 @@
-using Avalonia.Controls;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
@@ -20,16 +20,15 @@
                    Minimum="{Binding #slider.Minimum}"
                    Theme="{DynamicResource ProgressRing}"
                    Value="{Binding #slider.Value}"
-                    ShowProgressText="True" />
+                    ShowProgressText="True"/>
                <ProgressBar
                    Width="100"
                    Height="100"
                    IsIndeterminate="True"
-                    BorderThickness="16"
                    Maximum="{Binding #slider.Maximum}"
                    Minimum="{Binding #slider.Minimum}"
                    Theme="{DynamicResource ProgressRing}"
-                    ShowProgressText="True" />
+                    ShowProgressText="True"/>
            </StackPanel>
            <Slider
                Name="slider"
--- a/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.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 ProgressBarDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.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/RefreshContainerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml
@@ -4,10 +4,11 @@
    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:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
    d:DesignHeight="450"
    d:DesignWidth="800"
-    x:DataType="vm:RefreshContainerDemoViewModel"
+    x:DataType="pages:RefreshContainerDemoViewModel"
+    x:CompileBindings="True"
    mc:Ignorable="d">
    <DockPanel HorizontalAlignment="Stretch" VerticalAlignment="Top">
        <Label DockPanel.Dock="Top">A control that supports pull to refresh</Label>
@@ -23,4 +24,4 @@
                     ItemsSource="{Binding Items}" />
        </RefreshContainer>
    </DockPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml.cs
@@ -1,5 +1,8 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
 using Avalonia.Controls;
-using Semi.Avalonia.Demo.ViewModels;
+using CommunityToolkit.Mvvm.ComponentModel;

 namespace Semi.Avalonia.Demo.Pages;

@@ -10,14 +13,34 @@ public partial class RefreshContainerDemo : UserControl
    public RefreshContainerDemo()
    {
        InitializeComponent();
+
        _viewModel = new RefreshContainerDemoViewModel();
+
        DataContext = _viewModel;
    }

    private async void RefreshContainerPage_RefreshRequested(object? sender, RefreshRequestedEventArgs e)
    {
        var deferral = e.GetDeferral();
+
        await _viewModel.AddToTop();
+
        deferral.Complete();
    }
+}
+
+public class RefreshContainerDemoViewModel : ObservableObject
+{
+    public ObservableCollection<string> Items { get; }
+
+    public RefreshContainerDemoViewModel()
+    {
+        Items = new ObservableCollection<string>(Enumerable.Range(1, 200).Select(i => $"Item {i}"));
+    }
+
+    public async Task AddToTop()
+    {
+        await Task.Delay(1000);
+        Items.Insert(0, $"Item {200 - Items.Count}");
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml
@@ -0,0 +1,80 @@
+<UserControl
+    x:Class="Semi.Avalonia.Demo.Pages.RepeatButtonDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <StackPanel HorizontalAlignment="Left" Spacing="20">
+        <TextBlock>Light (Default)</TextBlock>
+        <StackPanel Orientation="Horizontal" Spacing="20">
+            <RepeatButton Classes="Primary">Primary</RepeatButton>
+            <RepeatButton Classes="Secondary">Secondary</RepeatButton>
+            <RepeatButton Classes="Tertiary">Tertiary</RepeatButton>
+            <RepeatButton Classes="Success">Success</RepeatButton>
+            <RepeatButton Classes="Warning">Warning</RepeatButton>
+            <RepeatButton Classes="Danger">Danger</RepeatButton>
+            <RepeatButton Classes="Danger" IsEnabled="False">Disabled</RepeatButton>
+        </StackPanel>
+        <TextBlock>Solid</TextBlock>
+        <StackPanel Orientation="Horizontal" Spacing="20">
+            <RepeatButton Classes="Primary" Theme="{DynamicResource SolidRepeatButton}">Primary</RepeatButton>
+            <RepeatButton Classes="Secondary" Theme="{DynamicResource SolidRepeatButton}">Secondary</RepeatButton>
+            <RepeatButton Classes="Tertiary" Theme="{DynamicResource SolidRepeatButton}">Tertiary</RepeatButton>
+            <RepeatButton Classes="Success" Theme="{DynamicResource SolidRepeatButton}">Success</RepeatButton>
+            <RepeatButton Classes="Warning" Theme="{DynamicResource SolidRepeatButton}">Warning</RepeatButton>
+            <RepeatButton Classes="Danger" Theme="{DynamicResource SolidRepeatButton}">Danger</RepeatButton>
+            <RepeatButton
+                Classes="Danger"
+                IsEnabled="False"
+                Theme="{DynamicResource SolidRepeatButton}">
+                Disabled
+            </RepeatButton>
+        </StackPanel>
+        <TextBlock>Outline</TextBlock>
+        <StackPanel Orientation="Horizontal" Spacing="20">
+            <RepeatButton Classes="Primary" Theme="{DynamicResource OutlineRepeatButton}">Primary</RepeatButton>
+            <RepeatButton Classes="Secondary" Theme="{DynamicResource OutlineRepeatButton}">Secondary</RepeatButton>
+            <RepeatButton Classes="Tertiary" Theme="{DynamicResource OutlineRepeatButton}">Tertiary</RepeatButton>
+            <RepeatButton Classes="Success" Theme="{DynamicResource OutlineRepeatButton}">Success</RepeatButton>
+            <RepeatButton Classes="Warning" Theme="{DynamicResource OutlineRepeatButton}">Warning</RepeatButton>
+            <RepeatButton Classes="Danger" Theme="{DynamicResource OutlineRepeatButton}">Danger</RepeatButton>
+            <RepeatButton
+                Classes="Danger"
+                IsEnabled="False"
+                Theme="{DynamicResource OutlineRepeatButton}">
+                Disabled
+            </RepeatButton>
+        </StackPanel>
+        <TextBlock>Borderless</TextBlock>
+        <StackPanel Orientation="Horizontal" Spacing="20">
+            <RepeatButton Classes="Primary" Theme="{DynamicResource BorderlessRepeatButton}">Primary</RepeatButton>
+            <RepeatButton Classes="Secondary" Theme="{DynamicResource BorderlessRepeatButton}">Secondary</RepeatButton>
+            <RepeatButton Classes="Tertiary" Theme="{DynamicResource BorderlessRepeatButton}">Tertiary</RepeatButton>
+            <RepeatButton Classes="Success" Theme="{DynamicResource BorderlessRepeatButton}">Success</RepeatButton>
+            <RepeatButton Classes="Warning" Theme="{DynamicResource BorderlessRepeatButton}">Warning</RepeatButton>
+            <RepeatButton Classes="Danger" Theme="{DynamicResource BorderlessRepeatButton}">Danger</RepeatButton>
+            <RepeatButton
+                Classes="Danger"
+                IsEnabled="False"
+                Theme="{DynamicResource BorderlessRepeatButton}">
+                Disabled
+            </RepeatButton>
+        </StackPanel>
+        <TextBlock>Disabled</TextBlock>
+        <StackPanel Background="{DynamicResource SemiColorBackground1}" Orientation="Horizontal" Spacing="20">
+            <Button IsEnabled="False">Light</Button>
+            <Button IsEnabled="False" Theme="{DynamicResource SolidButton}">Solid</Button>
+            <Button IsEnabled="False" Theme="{DynamicResource OutlineButton}">Outline</Button>
+            <Button IsEnabled="False" Theme="{DynamicResource BorderlessButton}">Borderless</Button>
+        </StackPanel>
+        <TextBlock>Size Classes</TextBlock>
+        <StackPanel Orientation="Horizontal" Spacing="20">
+            <RepeatButton Classes="Small">Small</RepeatButton>
+            <RepeatButton>Default</RepeatButton>
+            <RepeatButton Classes="Large">Large</RepeatButton>
+        </StackPanel>
+    </StackPanel>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class RepeatButtonDemo : UserControl
+{
+    public RepeatButtonDemo()
+    {
+        InitializeComponent();
+    }
+}
--- a/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml
@@ -9,22 +9,66 @@
    mc:Ignorable="d">
    <ScrollViewer>
        <StackPanel HorizontalAlignment="Left" Spacing="20">
-            <ToggleSwitch Name="inset" Content="Inset Content" />
-            <ToggleSwitch Name="autohide" Content="Allow AutoHide" />
            <ScrollViewer
+                Width="200"
+                Height="200"
                Margin="10"
-                Width="200" Height="200"
-                AllowAutoHide="{Binding #autohide.IsChecked}"
-                Classes.InsetContent="{Binding #inset.IsChecked}"
                HorizontalScrollBarVisibility="Auto">
-                <UniformGrid
-                    Rows="2" Columns="2"
-                    Width="300" Height="300">
-                    <Rectangle Fill="{DynamicResource SemiYellow2}" />
-                    <Rectangle Fill="{DynamicResource SemiBlue2}" />
-                    <Rectangle Fill="{DynamicResource SemiPink2}" />
-                    <Rectangle Fill="{DynamicResource SemiGreen2}" />
-                </UniformGrid>
+                <Grid RowDefinitions="Auto,Auto"
+                      ColumnDefinitions="Auto,Auto"
+                      Width="300" Height="300">
+                    <Rectangle
+                        Grid.Row="0" Grid.Column="0"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiYellow2}" />
+                    <Rectangle
+                        Grid.Row="0" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiBlue2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="0"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiPink2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiGreen2}" />
+                </Grid>
+            </ScrollViewer>
+            <ScrollViewer
+                Width="200"
+                Height="200"
+                Margin="10"
+                HorizontalScrollBarVisibility="Auto"
+                Theme="{DynamicResource StaticScrollViewer}">
+                <Grid RowDefinitions="Auto,Auto"
+                      ColumnDefinitions="Auto,Auto"
+                      Width="300" Height="300">
+                    <Rectangle
+                        Grid.Row="0" Grid.Column="0"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiYellow2}" />
+                    <Rectangle
+                        Grid.Row="0" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiBlue2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="0"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiPink2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiGreen2}" />
+                </Grid>
            </ScrollViewer>
        </StackPanel>
    </ScrollViewer>
--- a/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.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 ScrollViewerDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dong Bin	af52cdb122	Merge pull request #489 from irihitech/backport upgrade to 11.1.0.5	2024-12-13 00:04:56 +08:00
Zhang Dian	d6031a3062	misc: bump version.	2024-12-12 23:56:32 +08:00
metaone	7e303c33d2	bugfix:Demo crashes when changing SplitView's PanePlacement (cherry picked from commit `f318d33764`)	2024-12-12 23:50:05 +08:00
Ge	c6dab36743	feat: ComboBox respects SelectionBoxItemTemplate (cherry picked from commit `f3c4714372`)	2024-12-08 16:25:30 +08:00
Dong Bin	45001d7576	Merge pull request #484 from irihitech/backport Backport the lastest features to 11.1.x	2024-12-03 01:13:21 +08:00
Zhang Dian	bb85123884	feat: remove Calendar BorderThickness. (cherry picked from commit `a909b6da6e`)	2024-12-02 21:41:22 +08:00
Zhang Dian	6c2c7ef846	feat: align with the part of TextBox. (cherry picked from commit `2ce8bcdc1b`)	2024-12-02 21:41:22 +08:00
Zhang Dian	a9526fbbb5	fix: fix popup Padding. (cherry picked from commit `50b5159d17`)	2024-12-02 21:41:22 +08:00
Zhang Dian	8563ad93c1	feat: redesign ButtonToggleSwitch. (cherry picked from commit `3c8854f9de`)	2024-12-02 21:41:21 +08:00
Zhang Dian	ee3fa830f0	fix: fix Switch BorderThickness issue. (cherry picked from commit `147d4fd968`)	2024-12-02 21:41:21 +08:00
Zhang Dian	f3aad8d0d4	misc: enhance Switch. (cherry picked from commit `142abbf3da`)	2024-12-02 21:41:21 +08:00
Zhang Dian	52738987f7	misc: swap SimpleToggleSwitch & ButtonToggleSwitch. (cherry picked from commit `b4d5a3f932`)	2024-12-02 21:41:21 +08:00
Zhang Dian	483a9093aa	feat: add new Theme - ThemeToggleSwitch. (cherry picked from commit `cc001e951e`)	2024-12-02 21:41:21 +08:00
Zhang Dian	eb1748aa2a	feat: simplify MainView. (cherry picked from commit `faee95f12f`)	2024-12-02 21:41:21 +08:00
Zhang Dian	237fe72475	feat: enhance Carousel. (cherry picked from commit `fa8b2d1f21`)	2024-12-02 21:41:21 +08:00
Zhang Dian	3bc7383931	fix: fix DatePicker & TimePicker icon Margin. (cherry picked from commit `e4ecbfd1e8`)	2024-12-02 21:41:21 +08:00
Zhang Dian	ed0e256756	feat: adjust the rest of PathIcon. (cherry picked from commit `bc050308fc`)	2024-12-02 21:41:21 +08:00
Zhang Dian	0404111e76	feat: redesign inner PathIcon. (cherry picked from commit `904b7caa75`)	2024-12-02 21:41:21 +08:00
Zhang Dian	ea895c900d	misc: add Version markup to TreeDataGrid.csproj. (cherry picked from commit `5742412cb9`)	2024-12-02 21:41:21 +08:00
Zhang Dian	0ecb6e5581	feat: add pack&publish scripts to workflow. (cherry picked from commit `99d928ea15`)	2024-12-02 21:41:21 +08:00
Zhang Dian	c30f8d2456	fix: fix font issue in WASM demo. (cherry picked from commit `b31b622a2e`)	2024-12-02 21:41:20 +08:00
Zhang Dian	8e88f79c90	misc: unify BoxShadows resources. (cherry picked from commit `8cdac330a4`)	2024-12-02 21:41:20 +08:00
Zhang Dian	d039440008	feat: add Shadow part to PaletteDemo. (cherry picked from commit `8484d6ad86`)	2024-12-02 21:41:20 +08:00
Zhang Dian	ebdb0b1b93	misc: format codes. (cherry picked from commit `d1d235a120`)	2024-12-02 21:41:20 +08:00
Zhang Dian	c87f6a8112	fix: fix popup BoxShadow and unclosed corner issues. (cherry picked from commit `3a31924c6b`)	2024-12-02 21:41:20 +08:00
Zhang Dian	b23f79fc39	fix: fix BoxShadows. (cherry picked from commit `46b1c5d1cc`)	2024-12-02 21:41:20 +08:00
Zhang Dian	45b33bb9fd	feat: add basic BoxShadows. (cherry picked from commit `a4ee27778e`)	2024-12-02 21:41:20 +08:00
Zhang Dian	cd2c4bdda0	feat: resolve AOT issue. (cherry picked from commit `2437df392b`)	2024-12-02 21:41:20 +08:00
Zhang Dian	26549f09a9	feat: extract CommunityToolkit version. (cherry picked from commit `580e780e58`)	2024-12-02 21:41:20 +08:00
Zhang Dian	590d14117d	feat: extract ComboBox resources. (cherry picked from commit `3ce4067c3f`)	2024-12-02 21:41:20 +08:00
Zhang Dian	ffbfe959f9	feat: adjust ComboBox, ListBox, DatePicker & TimePicker item Padding. (cherry picked from commit `d3f297730b`)	2024-12-02 21:41:20 +08:00
Zhang Dian	d1c38db678	misc: Restore > to >. (cherry picked from commit `dfcb3579b4`)	2024-12-02 21:41:19 +08:00
Zhang Dian	4da2467047	feat: redesign GroupBox theme for HeaderedContentControl. Header & Content are now invisible when set to null. SeparatorBorder is now influenced by BorderThickness. Background is no longer transparent. (cherry picked from commit `021ca97865`)	2024-12-02 21:41:19 +08:00
Zhang Dian	7fcedf11a8	feat: redesign HyperlinkButton. add OnlyIcon & Underline Classes to HyperlinkButton. (cherry picked from commit `5451495c5c`)	2024-12-02 21:40:42 +08:00
Zhang Dian	ab3d88a6d1	feat: design an AdornerLayer for Solid Button. (cherry picked from commit `1250d45ad8`)	2024-12-02 17:21:55 +08:00
Zhang Dian	3a6fe152ae	feat: using RadioButton & CheckBox Resources instead of creating newly ListBox resources. (cherry picked from commit `8ba8ec69ca`)	2024-12-02 17:18:53 +08:00
Zhang Dian	782749f0dc	fix: unify RadioButton & CheckBox themes of ListBox. (cherry picked from commit `4b53300909`)	2024-12-02 17:17:58 +08:00
Zhang Dian	f1836b0892	misc: replace x:Name to Name. (cherry picked from commit `0858f01fec`)	2024-12-02 17:14:23 +08:00
Zhang Dian	0ced8e62a6	misc: clean prefix Control. (cherry picked from commit `fd68cad375`)	2024-12-02 17:12:43 +08:00
rabbitism	6b72dfabfb	feat: make colorpicker dropdown button customizable. (cherry picked from commit `33f266f48d`)	2024-12-02 17:11:29 +08:00
rabbitism	53cdfec729	feat: make group header customizable. (cherry picked from commit `2de1c40295`)	2024-12-02 17:11:09 +08:00
Zhang Dian	8f649e261d	feat: add missing translation.	2024-12-02 17:09:12 +08:00
Zhang Dian	12f3a63495	fix: fix the issue of Ukrainian abbreviation errors causing it to not work on Win7. (cherry picked from commit `f83dbafe7a`)	2024-12-02 17:02:50 +08:00
Zhang Dian	9bb9aa2491	feat: add the Second text to ja-jp. (cherry picked from commit `36d140ae4d`)	2024-12-02 17:01:15 +08:00
kYaRick	9fc2457b98	[Update] - Add Ukrainian localization and make minimal stylistic adjustments to other localization files. (cherry picked from commit `4447ffcb94`)	2024-12-02 16:58:11 +08:00
rabbitism	f7ef821538	fix: fix palette demo initial data context issue. (cherry picked from commit `30754a160d`)	2024-12-02 16:57:47 +08:00
Zhang Dian	62935eee6a	misc: revert high-contrast Theme feat.	2024-12-02 16:55:08 +08:00