diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 670628b..09cce67 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,6 +25,7 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
+          8.0.x
           10.0.x
 
     - name: Restore dependencies
@@ -221,6 +222,20 @@ jobs:
         grep -Fq 'state=open' "$BUNDLE" || (echo "ERROR: bundle missing data-[state=open] arbitrary-value modifier"; exit 1)
         grep -Fq 'px-2\.5' "$BUNDLE" || (echo "ERROR: bundle missing Badge padding — .cs variant scan regression?"; exit 1)
 
+        # The package also ships net8.0 and net9.0 builds.
+        for fw in net8.0 net9.0; do
+          cd "$TMPDIR/app"
+          dotnet new blazor -o "NuGetSmoke-$fw" -f "$fw" --no-restore
+          cd "NuGetSmoke-$fw"
+          cp ../NuGetSmoke/NuGet.config .
+          dotnet add package ShellUI.Components --prerelease
+          echo '@using ShellUI.Components' >> Components/_Imports.razor
+          echo '@page "/shellui"' > Components/Pages/ShellUISmoke.razor
+          echo '<Button>Save</Button> <Card><CardContent>ok</CardContent></Card>' >> Components/Pages/ShellUISmoke.razor
+          dotnet build -c Debug
+          test -f wwwroot/shellui-classes.txt
+        done
+
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a3e9d1a..b332542 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,9 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '10.0.x'
+        dotnet-version: |
+          8.0.x
+          10.0.x
 
     - name: Check package version matches tag
       run: |
diff --git a/README.md b/README.md
index 9ec8fce..8c03f85 100644
--- a/README.md
+++ b/README.md
@@ -24,18 +24,18 @@
 
 | Channel | Version | Notes |
 |---|---|---|
-| Latest stable (recommended) | `0.3.4` | Tailwind CSS `4.3.2` |
+| Latest stable (recommended) | `0.3.5` | Tailwind CSS `4.3.2` |
 | Prerelease | `0.4.0-alpha.3` | This branch; install with `--version 0.4.0-alpha.3` |
 
-The CLI needs the .NET 10 SDK and works in Blazor projects on .NET 8, 9 and 10. The `ShellUI.Components` NuGet package targets .NET 10 only; on .NET 8 or 9, use the CLI.
+The CLI runs on .NET 8 or later and works in Blazor projects on .NET 8, 9 and 10. The `ShellUI.Components` NuGet package targets .NET 8, 9 and 10. (`0.4.0-alpha.3` and the 0.3 line need .NET 10 for both.)
 
-`main` is the 0.4 line, so this README and `docs/` describe `0.4.0-alpha.3`, including features that are not in a stable release yet, such as `shellui init --dashboard` and the auth blocks. For the stable version, read the [v0.3.4 docs](https://github.com/shellui-dev/shellui/tree/v0.3.4). Prereleases need `--version` to install.
+`main` is the 0.4 line, so this README and `docs/` describe `0.4.0-alpha.3`, including features that are not in a stable release yet, such as `shellui init --dashboard` and the auth blocks. For the stable version, read the [v0.3.5 docs](https://github.com/shellui-dev/shellui/tree/v0.3.5). Prereleases need `--version` to install.
 
 ShellUI is pre-1.0, so APIs and generated output can still change between minor versions. Validate it in your target Blazor and hosting environments before relying on it.
 
 ## Capabilities
 
-- The CLI commands are `init`, `add`, `list`, `remove`, and `update`, plus `theme init`, `theme apply`, and `theme update`.
+- The CLI commands are `init`, `add`, `list`, `remove`, `update` and `doctor`, plus `theme init`, `theme apply`, and `theme update`.
 - The component registry has **243 entries**: **93 direct install targets** and **150 hidden dependency entries**. `list` shows direct targets; `add` resolves hidden dependencies.
 - `0.4.0-alpha.1` adds `kbd`, `aspect-ratio`, `button-group`, `toggle-group`, `input-group`, `number-input`, `stat-card`, `timeline`, `tree-view`, `qr-code`, `image-viewer`, `chat`, `chat-message`, `chat-input`, and the `auth-01`, `auth-02` and `auth-03` blocks.
 - `0.3.0` added `typed-select`, `command-palette`, `data-picker`, `multi-select`, `tag-input`, `donut-chart`, `radar-chart`, and `radial-chart`.
@@ -45,8 +45,8 @@ ShellUI is pre-1.0, so APIs and generated output can still change between minor
 
 ## Requirements
 
-- The .NET 10 SDK
-- A Blazor project on .NET 8, 9 or 10 with the CLI, or on .NET 10 with the NuGet package
+- The .NET 8 SDK or later
+- A Blazor project on .NET 8, 9 or 10, with the CLI or the NuGet package
 - Tailwind CSS `4.3.2` via either:
   - the standalone CLI, which does not require Node.js; or
   - npm, which requires Node.js and npm
diff --git a/ShellUI.Tests/AddAllTests.cs b/ShellUI.Tests/AddAllTests.cs
new file mode 100644
index 0000000..55e5a50
--- /dev/null
+++ b/ShellUI.Tests/AddAllTests.cs
@@ -0,0 +1,33 @@
+using ShellUI.CLI.Services;
+using ShellUI.Templates;
+
+namespace ShellUI.Tests;
+
+public class AddAllTests
+{
+    [Fact]
+    public void LibraryComponents_IsEveryListedTargetExceptLayoutBlocks()
+    {
+        var all = ComponentInstaller.LibraryComponents().ToList();
+        var listed = ComponentRegistry.Components.Values.Where(m => m.IsAvailable).ToList();
+
+        Assert.Equal(listed.Count(m => !m.IsLayoutBlock), all.Count);
+        Assert.Contains("button", all);
+        Assert.Contains("chart", all);
+        Assert.DoesNotContain("dashboard-02", all);
+        Assert.DoesNotContain("auth-01", all);
+        Assert.DoesNotContain("sidebar-account", all);
+        Assert.DoesNotContain("tab-models", all);
+    }
+
+    [Theory]
+    [InlineData("bar-chart", "chart", true)]
+    [InlineData("multi-series-chart", "chart", true)]
+    [InlineData("button", "chart", false)]
+    [InlineData("dialog", "button", false)]
+    public void DependsOnAny_FollowsDependenciesTransitively(string name, string excluded, bool expected)
+    {
+        var names = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { excluded };
+        Assert.Equal(expected, ComponentInstaller.DependsOnAny(name, names));
+    }
+}
diff --git a/ShellUI.Tests/DoctorTests.cs b/ShellUI.Tests/DoctorTests.cs
new file mode 100644
index 0000000..b24202f
--- /dev/null
+++ b/ShellUI.Tests/DoctorTests.cs
@@ -0,0 +1,115 @@
+using System.Text.Json;
+using ShellUI.CLI.Services;
+using ShellUI.Core.Models;
+
+namespace ShellUI.Tests;
+
+public class DoctorTests : IDisposable
+{
+    private readonly string _root = Path.Combine(Path.GetTempPath(), $"doctor-{Guid.NewGuid():N}");
+
+    public DoctorTests()
+    {
+        Directory.CreateDirectory(Path.Combine(_root, "Components", "UI", "Variants"));
+        Directory.CreateDirectory(Path.Combine(_root, "wwwroot"));
+        Directory.CreateDirectory(Path.Combine(_root, "Build"));
+        File.WriteAllText(Path.Combine(_root, "MyApp.csproj"), "<Project Sdk=\"Microsoft.NET.Sdk.Web\"></Project>");
+        File.WriteAllText(Path.Combine(_root, "Build", "ShellUI.targets"), "<Project />");
+        File.WriteAllText(Path.Combine(_root, "Components", "UI", "Button.razor"), "");
+        File.WriteAllText(Path.Combine(_root, "Components", "UI", "Variants", "ButtonVariants.cs"), "");
+        File.WriteAllText(Path.Combine(_root, "Components", "_Imports.razor"), "@using MyApp.Components.UI\n@using MyApp.Components.UI.Variants\n");
+        File.WriteAllText(Path.Combine(_root, "Components", "App.razor"),
+            "<head><link rel=\"stylesheet\" href=\"app.css\" /><script>// ShellUI theme bootstrap</script><HeadOutlet @rendermode=\"InteractiveServer\" /></head>\n" +
+            "<body><Routes @rendermode=\"InteractiveServer\" /><script src=\"shellui.js\"></script></body>");
+        File.WriteAllText(Path.Combine(_root, "wwwroot", "input.css"), "@import \"tailwindcss\";");
+        File.WriteAllText(Path.Combine(_root, "wwwroot", "app.css"), "");
+        File.SetLastWriteTimeUtc(Path.Combine(_root, "wwwroot", "app.css"), DateTime.UtcNow.AddMinutes(1));
+        WriteConfig("button", "button-variants");
+    }
+
+    public void Dispose()
+    {
+        try { Directory.Delete(_root, recursive: true); } catch (IOException) { }
+    }
+
+    private void WriteConfig(params string[] installed)
+    {
+        var config = new ShellUIConfig { InstalledComponents = installed.Select(n => new InstalledComponent { Name = n, Version = "0.4.0" }).ToList() };
+        File.WriteAllText(Path.Combine(_root, "shellui.json"), JsonSerializer.Serialize(config));
+    }
+
+    private List<DoctorFinding> Errors() => DoctorService.Diagnose(_root).Where(f => f.Severity == DoctorSeverity.Error).ToList();
+
+    [Fact]
+    public void HealthyProject_HasNoErrors()
+    {
+        Assert.Empty(Errors());
+    }
+
+    [Fact]
+    public void MissingShelluiJson_IsReported()
+    {
+        File.Delete(Path.Combine(_root, "shellui.json"));
+
+        Assert.Contains(Errors(), f => f.Message.Contains("shellui.json"));
+    }
+
+    [Fact]
+    public void NoRenderMode_IsReported()
+    {
+        var app = Path.Combine(_root, "Components", "App.razor");
+        File.WriteAllText(app, File.ReadAllText(app).Replace(" @rendermode=\"InteractiveServer\"", ""));
+
+        Assert.Contains(Errors(), f => f.Message.Contains("render mode"));
+    }
+
+    [Fact]
+    public void HostPageWithoutShelluiJs_IsReported()
+    {
+        var app = Path.Combine(_root, "Components", "App.razor");
+        File.WriteAllText(app, File.ReadAllText(app).Replace("<script src=\"shellui.js\"></script>", ""));
+
+        Assert.Contains(Errors(), f => f.Message.Contains("shellui.js"));
+    }
+
+    [Fact]
+    public void MissingDependency_IsReported()
+    {
+        WriteConfig("button");
+
+        Assert.Contains(Errors(), f => f.Message.Contains("button-variants"));
+    }
+
+    [Fact]
+    public void DeletedComponentFile_IsReported()
+    {
+        File.Delete(Path.Combine(_root, "Components", "UI", "Button.razor"));
+
+        Assert.Contains(Errors(), f => f.Message.Contains("file is gone") && f.Message.Contains("button"));
+    }
+
+    [Fact]
+    public void MissingUsing_IsReported()
+    {
+        File.WriteAllText(Path.Combine(_root, "Components", "_Imports.razor"), "@using MyApp.Components.UI\n");
+
+        Assert.Contains(Errors(), f => f.Message.Contains("MyApp.Components.UI.Variants"));
+    }
+
+    [Fact]
+    public void PackageAndCliTogether_IsAWarning()
+    {
+        File.WriteAllText(Path.Combine(_root, "MyApp.csproj"),
+            "<Project Sdk=\"Microsoft.NET.Sdk.Web\"><ItemGroup><PackageReference Include=\"ShellUI.Components\" Version=\"0.4.0\" /></ItemGroup></Project>");
+
+        Assert.Contains(DoctorService.Diagnose(_root), f => f.Severity == DoctorSeverity.Warning && f.Message.Contains("ShellUI.Components package"));
+    }
+
+    [Fact]
+    public void StaleAppCss_IsAWarning()
+    {
+        File.SetLastWriteTimeUtc(Path.Combine(_root, "wwwroot", "app.css"), DateTime.UtcNow.AddHours(-1));
+
+        Assert.Contains(DoctorService.Diagnose(_root), f => f.Severity == DoctorSeverity.Warning && f.Message.Contains("older than"));
+    }
+}
diff --git a/ShellUI.Tests/PackageBehaviorTests.cs b/ShellUI.Tests/PackageBehaviorTests.cs
index 39dfce5..ab4b685 100644
--- a/ShellUI.Tests/PackageBehaviorTests.cs
+++ b/ShellUI.Tests/PackageBehaviorTests.cs
@@ -1,6 +1,7 @@
 using Bunit;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
+using Microsoft.Extensions.DependencyInjection;
 using ShellUI.Components;
 using ShellUI.Components.Models;
 
@@ -218,4 +219,47 @@ public void TimePicker_ShowsASetValue()
 
         Assert.Contains("09:05", picker.Markup);
     }
+
+    [Fact]
+    public async Task Sonner_ClearFadesEveryToastThenRemovesIt()
+    {
+        using var ctx = new BunitContext();
+        ctx.Services.AddShellUISonner();
+        var service = ctx.Services.GetRequiredService<ShellUI.Components.Services.SonnerService>();
+        var sonner = ctx.Render<Sonner>();
+
+        await sonner.InvokeAsync(() => service.Show("Saved", duration: TimeSpan.Zero));
+        await sonner.InvokeAsync(() => service.Error("Failed", duration: TimeSpan.Zero));
+        await sonner.InvokeAsync(service.Clear);
+
+        Assert.All(service.Toasts, t => Assert.True(t.Dismissing));
+        Assert.Equal(2, sonner.FindAll(".opacity-0").Count);
+        sonner.WaitForAssertion(() => Assert.Empty(service.Toasts));
+        Assert.DoesNotContain("Saved", sonner.Markup);
+    }
+
+    [Fact]
+    public void ContextMenuOption_Destructive_ReplacesTheAccentColours()
+    {
+        using var ctx = new BunitContext();
+        var option = ctx.Render<ContextMenuOption>(p => p.Add(c => c.Destructive, true).Add(c => c.ChildContent, "Delete"));
+
+        var classes = option.Find("button").ClassList;
+        Assert.Contains("text-destructive", classes);
+        Assert.Contains("hover:bg-destructive/10", classes);
+        Assert.DoesNotContain("hover:bg-accent", classes);
+    }
+
+    [Fact]
+    public void ContextMenu_DestructiveItem_IsRed()
+    {
+        using var ctx = new BunitContext();
+        var menu = ctx.Render<ContextMenu>(p => p
+            .Add(c => c.IsOpen, true)
+            .Add(c => c.Items, new List<ContextMenuItem> { new() { Label = "Edit" }, new() { Label = "Delete", Destructive = true } }));
+
+        var buttons = menu.FindAll("button");
+        Assert.DoesNotContain("text-destructive", buttons[0].ClassList);
+        Assert.Contains("text-destructive", buttons[1].ClassList);
+    }
 }
diff --git a/ShellUI.Tests/SafelistDriftTests.cs b/ShellUI.Tests/SafelistDriftTests.cs
index 3f3ae50..f55f69c 100644
--- a/ShellUI.Tests/SafelistDriftTests.cs
+++ b/ShellUI.Tests/SafelistDriftTests.cs
@@ -39,6 +39,28 @@ public void Safelist_MatchesGeneratedFromCurrentSources()
             BuildDiffMessage(addedSinceCommit, removedSinceCommit));
     }
 
+    [Fact]
+    public void Generator_HarvestsClassesInRazorExpressions()
+    {
+        var file = Path.Combine(Path.GetTempPath(), $"safelist-{Guid.NewGuid():N}.razor");
+        File.WriteAllLines(file, new[]
+        {
+            "<div class=\"@Shell.Cn(\"fixed translate-y-[-50%] sm:rounded-lg\", Class)\"></div>",
+            "<span class=\"flex @(Active ? \"text-destructive\" : \"text-muted-foreground\")\"></span>",
+            "@code { string Tone(string v) => v switch { \"ok\" => \"bg-green-500/20\", _ => \"bg-background\" }; }",
+        });
+        try
+        {
+            var classes = Program.GenerateSafelist(new[] { file });
+            foreach (var expected in new[] { "translate-y-[-50%]", "sm:rounded-lg", "text-destructive", "text-muted-foreground", "bg-green-500/20", "bg-background" })
+                Assert.Contains(expected, classes);
+        }
+        finally
+        {
+            File.Delete(file);
+        }
+    }
+
     [Fact]
     public void GeneratedTargetsFile_IsValidXml()
     {
diff --git a/ShellUI.Tests/ShellUI.Tests.csproj b/ShellUI.Tests/ShellUI.Tests.csproj
index f7fee2a..0fda3c1 100644
--- a/ShellUI.Tests/ShellUI.Tests.csproj
+++ b/ShellUI.Tests/ShellUI.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
diff --git a/VERSIONING_STRATEGY.md b/VERSIONING_STRATEGY.md
index 33221b5..6ab7987 100644
--- a/VERSIONING_STRATEGY.md
+++ b/VERSIONING_STRATEGY.md
@@ -6,8 +6,8 @@ ShellUI uses one centralized version for the source templates, CLI tool, and pac
 
 | Scope | Value |
 |---|---|
-| Version | `0.4.0-alpha.3` (prerelease; latest stable `0.3.4`) |
-| Target framework | .NET 10 |
+| Version | `0.4.0-alpha.3` (prerelease; latest stable `0.3.5`) |
+| Target framework | .NET 8 and .NET 10 (`ShellUI.Components` also .NET 9) |
 | Tailwind version | `4.3.2` |
 
 `0.3.0-rc.1` was the last release targeting .NET 9.
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 5ea66e5..df6d89c 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -7,7 +7,7 @@ This document describes the ShellUI source tree.
 | Area | Current value |
 |---|---|
 | Version | See `Directory.Build.props` |
-| Target framework | .NET 10 (`net10.0`) |
+| Target framework | .NET 8 and .NET 10 (`net8.0;net10.0`); `ShellUI.Components` also `net9.0` |
 | Tailwind CSS | `4.3.2` |
 | Solution | `ShellUI.slnx` |
 | Solution projects | 6 |
@@ -30,7 +30,7 @@ flowchart LR
         Safelist[ShellUI.SafelistGenerator<br/>internal build utility]
     end
 
-    Project[Consumer project<br/>net10.0]
+    Project[Consumer project<br/>net8.0 to net10.0]
     Demo[NET10/BlazorInteractiveServer<br/>demo outside the solution]
 
     Developer --> CLI
diff --git a/docs/CLI_INSTALLATION.md b/docs/CLI_INSTALLATION.md
index b6e52c8..b4bd853 100644
--- a/docs/CLI_INSTALLATION.md
+++ b/docs/CLI_INSTALLATION.md
@@ -4,12 +4,12 @@
 
 | Context | Version |
 |---|---|
-| Latest stable (recommended) | `0.3.4`, needs the .NET 10 runtime |
+| Latest stable (recommended) | `0.3.5`, needs the .NET 10 runtime |
 | Prerelease | `0.4.0-alpha.3`, install with `--version 0.4.0-alpha.3` |
 | Previous stable | `0.2.1` |
 | Tailwind | `4.3.2` |
 
-The tool needs the .NET 10 runtime. The projects it sets up can target .NET 8, 9 or 10.
+The tool runs on .NET 8 or later (`0.4.0-alpha.3` and the 0.3 line need the .NET 10 runtime). The projects it sets up can target .NET 8, 9 or 10.
 
 ## Global installation
 
@@ -44,7 +44,7 @@ The manifest is `.config/dotnet-tools.json` and uses the installed package versi
   "isRoot": true,
   "tools": {
     "shellui.cli": {
-      "version": "0.3.4",
+      "version": "0.3.5",
       "commands": ["shellui"]
     }
   }
@@ -65,7 +65,7 @@ Commit the manifest so every developer and CI job uses the same tool version.
 
 ## Building from source
 
-The repository targets `net10.0`. Build it with the .NET 10 SDK:
+The repository targets `net8.0` and `net10.0`. Build it with the .NET 10 SDK; running the tests on both frameworks also needs the .NET 8 runtime:
 
 ```bash
 dotnet --version
diff --git a/docs/CLI_SYNTAX.md b/docs/CLI_SYNTAX.md
index e5b937c..b776b02 100644
--- a/docs/CLI_SYNTAX.md
+++ b/docs/CLI_SYNTAX.md
@@ -1,6 +1,6 @@
 # ShellUI CLI Syntax
 
-This reference covers CLI `0.4.0-alpha.3` (prerelease): it runs on .NET 10, sets up Blazor projects on .NET 8, 9 and 10, uses Tailwind CSS `4.3.2`, and has 93 direct component targets. Some options, such as `--dashboard`, are not in the stable 0.3.4; see the [v0.3.4 reference](https://github.com/shellui-dev/shellui/blob/v0.3.4/docs/CLI_SYNTAX.md) for that version.
+This reference covers CLI `0.4.0-alpha.3` (prerelease): it runs on .NET 8 or later (`0.4.0-alpha.3` itself needs .NET 10), sets up Blazor projects on .NET 8, 9 and 10, uses Tailwind CSS `4.3.2`, and has 93 direct component targets. Some options, such as `--dashboard`, are not in the stable 0.3.4; see the [v0.3.4 reference](https://github.com/shellui-dev/shellui/blob/v0.3.4/docs/CLI_SYNTAX.md) for that version.
 
 ## Command prefix
 
@@ -17,10 +17,11 @@ shellui --version
 
 ```text
 shellui init [--force] [--style <style>] [--tailwind standalone|npm] [--yes] [--dashboard 01|02|none] [--replace-layout]
-shellui add <name...> [--force] [--replace-layout]
+shellui add <name...>|all [--force] [--replace-layout] [--except <name...>]
 shellui list [--installed|--available]
 shellui remove <name...>
 shellui update [name...] [--all] [--force]
+shellui doctor
 shellui theme init <url-or-id> [--force] [--style <style>] [--tailwind standalone|npm] [--yes] [--dashboard 01|02|none] [--replace-layout]
 shellui theme apply <url-or-id> [--emit-override <path>]
 shellui theme update
@@ -79,12 +80,16 @@ shellui add button card dialog
 shellui add button,card,dialog
 shellui add button,card dialog
 shellui add button --force
+shellui add all
+shellui add all --except chart,qr-code
 ```
 
 `add` accepts space-separated names, comma-separated names, and a mixture of both. Use the exact target names printed by `shellui list`.
 
 `--force` overwrites an existing component file. Dependencies are installed automatically; there is no separate dependency option.
 
+`shellui add all` installs the whole component library: every target `shellui list` shows except the layout blocks (`dashboard-01`, `dashboard-02`, `auth-01`, `auth-02`, `auth-03`), which rewire the app and are added by name. Components already installed are skipped. `--except` leaves components out (space or comma-separated), along with anything that needs them: `--except chart` also leaves out `bar-chart`, `line-chart` and the other charts, so `Blazor-ApexCharts` isn't added.
+
 Some components need a NuGet package (`chart` needs `Blazor-ApexCharts`, `data-table` needs `System.Linq.Dynamic.Core`, `qr-code` needs `QRCoder`). `add` references it if the project doesn't, and raises an older version to the one ShellUI needs. A version that is already the same or newer is left as it is (including one set in `Directory.Packages.props`), as are floating versions such as `7.*`, ranges, and references whose version ShellUI can't find.
 
 ### Dashboard layouts
@@ -165,6 +170,24 @@ Names are separated by spaces. With no names, or with `--all`, every installed c
 
 `update` has no diff or merge. Commit before updating so you can review the changes.
 
+## `doctor`
+
+Checks the project's ShellUI setup and prints a fix for each problem it finds:
+
+```bash
+shellui doctor
+```
+
+- `shellui.json` is valid and `ComponentsPath` exists.
+- The Tailwind CLI is available (the shared copy in `~/.shellui/bin`, a project copy, or the npm packages), `Build/ShellUI.targets` exists, and `wwwroot/app.css` is newer than `input.css` and the components.
+- The host page (`Components/App.razor` or `wwwroot/index.html`) links `app.css`, loads `shellui.js` and has the theme script.
+- An interactive render mode is set in `App.razor`. When only some pages set one, components on the other pages don't respond to clicks.
+- Every installed component's file exists and its dependencies are installed.
+- `_Imports.razor` has the ShellUI `@using` lines.
+- The project doesn't use the `ShellUI.Components` package and CLI-installed components together.
+
+It exits with code 1 when it finds a problem, so it can run in CI. Warnings, such as a stale `app.css`, don't change the exit code. In a Razor class library it skips the host page checks, which apply to each app that uses the library.
+
 ## `theme`
 
 The theme commands fetch a public tweakcn theme by URL or theme ID and write its CSS variables into the project.
@@ -287,6 +310,7 @@ shellui add button,card
 
 ## Troubleshooting
 
+- Run `shellui doctor`; it checks the setup and says how to fix what it finds.
 - If the command is not found, use `shellui` for a global tool or `dotnet shellui` for a local manifest.
 - Run `shellui list` to verify a target name.
 - Confirm `wwwroot/input.css` exists and contains `@import "tailwindcss";`.
diff --git a/docs/COMPARISON.md b/docs/COMPARISON.md
index e110d4c..77d47ea 100644
--- a/docs/COMPARISON.md
+++ b/docs/COMPARISON.md
@@ -4,7 +4,7 @@ This is a qualitative comparison, not a benchmark report. Library features, pack
 
 ## Current ShellUI snapshot
 
-- **Target framework:** .NET 10
+- **Target framework:** .NET 8, 9 and 10
 - **Tailwind CSS:** `4.3.2`
 - **CLI inventory:** 93 direct targets, 243 registry entries, and 150 hidden entries
 - **Distribution:** the CLI copies source into an application; the repository also contains the packable `ShellUI.Components` package
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index aa42cfd..ec5c89c 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing to ShellUI
 
-ShellUI targets .NET 10 and Tailwind CSS `4.3.2`. This guide describes the contribution and verification workflow; releases are covered in [VERSIONING_STRATEGY.md](../VERSIONING_STRATEGY.md) and [RELEASING.md](RELEASING.md).
+ShellUI targets .NET 8 and .NET 10 and Tailwind CSS `4.3.2`. This guide describes the contribution and verification workflow; releases are covered in [VERSIONING_STRATEGY.md](../VERSIONING_STRATEGY.md) and [RELEASING.md](RELEASING.md).
 
 ## Contribution Policy
 
@@ -32,7 +32,7 @@ The runnable demo at `NET10/BlazorInteractiveServer/BlazorInteractiveServer.cspr
 
 ## Prerequisites
 
-- .NET 10 SDK. `global.json` requests SDK `10.0.100` with feature-band roll-forward.
+- .NET 10 SDK. `global.json` requests SDK `10.0.100` with feature-band roll-forward. The projects also target `net8.0`, so running the tests on both frameworks needs the .NET 8 runtime.
 - Git.
 - Node.js and npm only when using the npm Tailwind method. The standalone method does not require Node.js.
 
diff --git a/docs/FAQ.md b/docs/FAQ.md
index b38ad30..934ae10 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -6,13 +6,13 @@ Answers for the current ShellUI source and the currently published packages.
 
 ### Which version should I use?
 
-Use the latest stable release, `0.3.4`. It uses Tailwind CSS `4.3.2`. The `0.4.0-alpha.3` prerelease, with 93 direct component targets, needs `--version 0.4.0-alpha.3`:
+Use the latest stable release, `0.3.5`. It uses Tailwind CSS `4.3.2`. The `0.4.0-alpha.3` prerelease, with 93 direct component targets, needs `--version 0.4.0-alpha.3`:
 
 ```bash
 dotnet tool install -g ShellUI.CLI
 ```
 
-The CLI needs the .NET 10 SDK and works in Blazor projects on .NET 8, 9 and 10. The `ShellUI.Components` NuGet package targets .NET 10 only; on .NET 8 or 9, use the CLI.
+The CLI runs on .NET 8 or later and works in Blazor projects on .NET 8, 9 and 10. The `ShellUI.Components` NuGet package targets .NET 8, 9 and 10. (`0.4.0-alpha.3` and the 0.3 line need .NET 10 for both.)
 
 ### Which command prefix should I use?
 
diff --git a/docs/PROJECT_STATUS.md b/docs/PROJECT_STATUS.md
index 98a8fd9..7e9c282 100644
--- a/docs/PROJECT_STATUS.md
+++ b/docs/PROJECT_STATUS.md
@@ -5,7 +5,7 @@
 | Area | Current fact |
 |---|---|
 | Version | See `Directory.Build.props` |
-| Framework | .NET 10 (`net10.0`) |
+| Framework | .NET 8 and .NET 10 (`net8.0;net10.0`); `ShellUI.Components` also `net9.0` |
 | Tailwind CSS | `4.3.2` |
 | Solution | `ShellUI.slnx` with six projects |
 | Demo | `NET10/BlazorInteractiveServer/BlazorInteractiveServer.csproj`, outside the solution |
diff --git a/docs/QUICKSTART.md b/docs/QUICKSTART.md
index 2113a23..3aa00aa 100644
--- a/docs/QUICKSTART.md
+++ b/docs/QUICKSTART.md
@@ -1,10 +1,10 @@
 # ShellUI Quick Start
 
-This quick start uses ShellUI `0.4.0-alpha.3`, a prerelease, with Tailwind CSS `4.3.2`. The CLI needs the .NET 10 SDK and works in Blazor projects on .NET 8, 9 and 10.
+This quick start uses ShellUI `0.4.0-alpha.3`, a prerelease, with Tailwind CSS `4.3.2`. The CLI runs on .NET 8 or later and works in Blazor projects on .NET 8, 9 and 10.
 
 ## Prerequisites
 
-- .NET 10 SDK
+- .NET 8 SDK or later
 - A Blazor project
 - The `ShellUI.CLI` tool
 - Node.js and npm only when choosing `--tailwind npm`
diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md
index 898cdda..3db8059 100644
--- a/docs/RELEASE_NOTES.md
+++ b/docs/RELEASE_NOTES.md
@@ -106,6 +106,55 @@ dotnet add package ShellUI.Components --version 0.4.0-alpha.2
 
 **Full Changelog**: https://github.com/shellui-dev/shellui/compare/v0.4.0-alpha.1...v0.4.0-alpha.2
 
+# ShellUI v0.3.5
+
+> A patch release that brings the 0.4 prerelease fixes to the stable line. `init` no longer downloads the Tailwind CLI into every project, `update` keeps your changes, `add` never downgrades a NuGet package, a component's `Class` overrides its own classes, overlays keep keyboard focus inside, and several component bugs are fixed. It also adds Razor class library support.
+
+## 🛠️ CLI
+
+- **One Tailwind CLI per machine.** `init` used to download the 112 MB Tailwind CLI into every project, hold it in memory and give up after five minutes, so on a slow connection it failed and left the project half set up. The CLI now lives once in `~/.shellui/bin` (set `SHELLUI_CACHE_DIR` to move it), and `init` and the build both run it from there; a copy in a project's `.shellui/bin` still wins. Downloads resume after a dropped connection, retry, and only stop after 60 seconds without data. If the download fails, `init` finishes everything else and the next build tries again. `.shellui/` gets its own `.gitignore`, so the folder stays out of git.
+- **`update` keeps your changes.** `shellui.json` now records a hash of each file the CLI writes. `update` skips files you've changed since and says so (`--force` overwrites them), and installs dependencies a component gained since you added it, the same way `add` does. Files installed by an earlier CLI have no hash; for those, `update` keeps `app-sidebar` and the `dashboard-*` layouts when they differ from the template.
+- **`update` moves existing projects onto the shared Tailwind CLI.** It replaces a `Build/ShellUI.targets` written by an earlier CLI (unless you edited it) and deletes the project's copy of the Tailwind CLI when it is identical to the shared one.
+- **`remove` finds what `install` wrote.** It always looked in `Components/UI`, so it ignored a custom `ComponentsPath`, couldn't remove the dashboard layouts, and reported every name as removed. It now uses the install path, reports only what it removed, and lists files that still use a removed layout.
+- **`add` never downgrades a NuGet package.** It used to set the exact version a component pins, so adding `chart` to an app on Blazor-ApexCharts 7 moved it back to 6.0.2. Now it adds a missing package or raises an older one, and leaves the same or newer versions, floating versions and ranges alone (including `Directory.Packages.props`).
+- **Razor class libraries.** `init` recognises a library shared by several apps, prints what each app needs with the library's `_content` path, and adds its `@using` to a root `_Imports.razor`. [Using ShellUI from a Razor class library](https://github.com/shellui-dev/shellui/blob/main/docs/razor-class-library.md) covers Blazor Web App and MAUI Blazor Hybrid hosts.
+
+## ✨ Components (package and CLI templates)
+
+- **`Class` overrides a component's own classes.** `Shell.Cn` used to join strings, so `Class="max-w-lg"` on a component that sets `max-w-md` put both on the element and the stylesheet decided. Now, when two classes set the same CSS property under the same variants, the later one (yours) wins, like tailwind-merge: `p-4` replaces an earlier `px-2`, text colour and text size stay separate, and unknown classes are kept. You no longer need the `!` modifier. Run `shellui update shell` to get it in a CLI project.
+- **Focus stays inside open overlays.** `Dialog`, `AlertDialog`, `Sheet` and `Drawer` keep Tab and Shift+Tab inside while open and return focus to where it was when they close. The non-compositional `Sheet` and `Drawer` panels now also take focus and close on Escape.
+
+## 🐛 Fixes
+
+- **`RadioGroup`** (template): clicking an item did nothing, because the group never passed itself to its items. `RadioGroupItem` also gains `Disabled`.
+- **`ScrollArea`**: long content was clipped instead of scrolling. `Height` and `MaxHeight` now size the scrolling element. The `scrollbar-*` classes, which needed a Tailwind plugin nobody shipped, are gone.
+- **`DatePicker`** (package): day 1 was always drawn under Sunday. It now sits under its real weekday, and the picker opens on the selected month.
+- **`TimePicker`**: `Step` now filters the minutes (it was ignored), the picker opens on the current value, and Cancel or an outside click closes it.
+- **`DateRangePicker`** (template) closes on an outside click; **`EmptyState`** (template) applies `Class` and extra attributes.
+- **`Sheet` and `Drawer`**: clicks inside the panel no longer reach parent click handlers, and the `Sheet` close button shows when only `Description` is set.
+- **`Label`** (package) renders `For` as the `for` attribute; **`FileUpload`** (package) uses an inline SVG icon instead of the Material Symbols font; **`CarouselItem`** (template) handles zero slides.
+- Still working but deprecated: `DatePicker.SelectedDate` and `TimePicker.SelectedTime`. Use `Value` / `@bind-Value`.
+
+## ⬆️ Upgrading
+
+- **CLI:** update the tool, then run `shellui update` in each project. Commit first so you can review the changes. If the project still has a `.shellui/bin/tailwindcss` binary afterwards, you can delete it: the next build downloads the shared copy.
+- **NuGet package:** update `ShellUI.Components` to `0.3.5`.
+- If you used `Class="…!"` to beat a component's own classes, you can drop the `!`.
+
+## 📦 Installation
+
+```bash
+dotnet tool install -g ShellUI.CLI --version 0.3.5
+# or upgrade an existing install
+dotnet tool update -g ShellUI.CLI --version 0.3.5
+```
+
+```bash
+dotnet add package ShellUI.Components --version 0.3.5
+```
+
+**Full Changelog**: https://github.com/shellui-dev/shellui/compare/v0.3.4...v0.3.5
+
 # ShellUI v0.3.4
 
 > A patch release with a `TimePicker` fix for the `ShellUI.Components` NuGet package and dark-theme fixes for both the package and the CLI.
diff --git a/src/ShellUI.CLI/Program.cs b/src/ShellUI.CLI/Program.cs
index db01e98..93a1a43 100644
--- a/src/ShellUI.CLI/Program.cs
+++ b/src/ShellUI.CLI/Program.cs
@@ -24,6 +24,7 @@ static async Task<int> Main(string[] args)
         rootCommand.AddCommand(CreateRemoveCommand());
         rootCommand.AddCommand(CreateUpdateCommand());
         rootCommand.AddCommand(CreateThemeCommand());
+        rootCommand.AddCommand(CreateDoctorCommand());
 
         return await rootCommand.InvokeAsync(args);
     }
@@ -228,7 +229,7 @@ static Command CreateAddCommand()
         
         var componentsArg = new Argument<string[]>(
             "components",
-            "Component name(s) to add (space or comma-separated)")
+            "Component name(s) to add (space or comma-separated), or all for the whole library")
         {
             Arity = ArgumentArity.OneOrMore
         };
@@ -242,11 +243,19 @@ static Command CreateAddCommand()
         var replaceLayoutOption = CreateReplaceLayoutOption();
         command.AddOption(replaceLayoutOption);
 
-        command.SetHandler(async (components, force, replaceLayout) =>
+        var exceptOption = new Option<string[]>(
+            "--except",
+            "Component(s) to leave out, for example with all (space or comma-separated)")
+        {
+            AllowMultipleArgumentsPerToken = true
+        };
+        command.AddOption(exceptOption);
+
+        command.SetHandler(async (components, force, replaceLayout, except) =>
         {
             try
             {
-                if (!await ComponentInstaller.InstallComponents(components, force, replaceLayout ? LayoutSwitch.Always : LayoutSwitch.Ask))
+                if (!await ComponentInstaller.InstallComponents(components, force, replaceLayout ? LayoutSwitch.Always : LayoutSwitch.Ask, except))
                     Environment.Exit(1);
             }
             catch (Exception ex)
@@ -254,8 +263,26 @@ static Command CreateAddCommand()
                 AnsiConsole.MarkupLine($"[red]Error:[/] {ex.Message.Replace("[", "[[").Replace("]", "]]")}");
                 Environment.Exit(1);
             }
-        }, componentsArg, forceOption, replaceLayoutOption);
+        }, componentsArg, forceOption, replaceLayoutOption, exceptOption);
+
+        return command;
+    }
 
+    static Command CreateDoctorCommand()
+    {
+        var command = new Command("doctor", "Check the project's ShellUI setup and say how to fix problems");
+        command.SetHandler(context =>
+        {
+            try
+            {
+                context.ExitCode = DoctorService.Run();
+            }
+            catch (Exception ex)
+            {
+                AnsiConsole.MarkupLine($"[red]Error:[/] {Markup.Escape(ex.Message)}");
+                context.ExitCode = 1;
+            }
+        });
         return command;
     }
 
diff --git a/src/ShellUI.CLI/README.md b/src/ShellUI.CLI/README.md
index 0bff09f..7908c11 100644
--- a/src/ShellUI.CLI/README.md
+++ b/src/ShellUI.CLI/README.md
@@ -6,7 +6,7 @@
 
 ## Install
 
-The tool needs the .NET 10 runtime. The projects it sets up can target .NET 8, 9 or 10:
+The tool runs on .NET 8 or later. The projects it sets up can target .NET 8, 9 or 10:
 
 ```bash
 dotnet tool install --global ShellUI.CLI
diff --git a/src/ShellUI.CLI/Services/ComponentInstaller.cs b/src/ShellUI.CLI/Services/ComponentInstaller.cs
index 57cb0c5..ea4dd9e 100644
--- a/src/ShellUI.CLI/Services/ComponentInstaller.cs
+++ b/src/ShellUI.CLI/Services/ComponentInstaller.cs
@@ -10,7 +10,7 @@ public class ComponentInstaller
 {
     private const string ShellUiJsSidebarApiMarker = "initSidebar: function (handle, dotNetRef)";
 
-    public static async Task<bool> InstallComponents(string[] components, bool force, LayoutSwitch layoutSwitch = LayoutSwitch.Ask)
+    public static async Task<bool> InstallComponents(string[] components, bool force, LayoutSwitch layoutSwitch = LayoutSwitch.Ask, string[]? except = null)
     {
         var configPath = Path.Combine(Directory.GetCurrentDirectory(), "shellui.json");
 
@@ -37,6 +37,26 @@ public static async Task<bool> InstallComponents(string[] components, bool force
         {
             componentList.AddRange(comp.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries));
         }
+        var addAll = componentList.RemoveAll(c => c.Equals("all", StringComparison.OrdinalIgnoreCase)) > 0;
+        if (addAll)
+            componentList.AddRange(LibraryComponents().Where(name => !componentList.Contains(name, StringComparer.OrdinalIgnoreCase)));
+        if (except is { Length: > 0 })
+        {
+            var skip = except.SelectMany(e => e.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
+                .ToHashSet(StringComparer.OrdinalIgnoreCase);
+            foreach (var name in skip.Where(n => ComponentRegistry.GetMetadata(n) == null))
+                AnsiConsole.MarkupLine($"[yellow]Unknown component in --except:[/] {Markup.Escape(name)}");
+            componentList.RemoveAll(skip.Contains);
+            // Leaving out chart also leaves out bar-chart and the rest, so its NuGet package isn't added.
+            var dependents = componentList.Where(name => DependsOnAny(name, skip)).ToList();
+            if (dependents.Count > 0)
+            {
+                componentList.RemoveAll(dependents.Contains);
+                AnsiConsole.MarkupLine($"[dim]Also left out, because they need an excluded component: {Markup.Escape(string.Join(", ", dependents))}[/]");
+            }
+        }
+        if (addAll)
+            AnsiConsole.MarkupLine($"[blue]Adding all {componentList.Count} components[/] [dim](layout blocks such as dashboard-02 and auth-01 are left out; add them by name)[/]");
         if (componentList.Any(DashboardSetup.Layouts.ContainsKey) && DashboardSetup.IsIdentityApp(Directory.GetCurrentDirectory()))
             componentList.Add("sidebar-account");
 
@@ -48,7 +68,7 @@ public static async Task<bool> InstallComponents(string[] components, bool force
         var requestedPackages = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         var pendingNuGetDeps = new List<NuGetDependency>();
 
-        foreach (var componentName in componentList)
+        foreach (var componentName in addAll ? Enumerable.Empty<string>() : componentList)
         {
             var metadata = ComponentRegistry.GetMetadata(componentName);
             if (metadata != null && metadata.Dependencies?.Any() == true)
@@ -114,6 +134,21 @@ await Loaders.SnakeStatus()
         return failedComponents.Count == 0 && failedPackages.Count == 0;
     }
 
+    internal static bool DependsOnAny(string name, IReadOnlySet<string> names, HashSet<string>? seen = null)
+    {
+        seen ??= new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        if (!seen.Add(name)) return false;
+        var dependencies = ComponentRegistry.GetMetadata(name)?.Dependencies ?? new List<string>();
+        return dependencies.Any(d => names.Contains(d) || DependsOnAny(d, names, seen));
+    }
+
+    // What `add all` installs: every target `list` shows except the layout blocks, which rewire the app.
+    internal static IEnumerable<string> LibraryComponents() =>
+        ComponentRegistry.Components.Values
+            .Where(m => m.IsAvailable && !m.IsLayoutBlock)
+            .Select(m => m.Name)
+            .OrderBy(name => name, StringComparer.Ordinal);
+
     public static Task<bool> InstallComponentForInitAsync(
         string componentName,
         ProjectInfo projectInfo,
@@ -243,11 +278,12 @@ private static InstallResult InstallComponentInternal(string componentName, Shel
         return InstallResult.Success;
     }
 
-    internal static string InstalledFilePath(ComponentMetadata metadata, ShellUIConfig config)
+    internal static string InstalledFilePath(ComponentMetadata metadata, ShellUIConfig config, string? root = null)
     {
+        root ??= Directory.GetCurrentDirectory();
         var basePath = metadata.IsLayoutBlock
-            ? Path.Combine(Directory.GetCurrentDirectory(), config.LayoutPath ?? "Components/Layout")
-            : Path.Combine(Directory.GetCurrentDirectory(), config.ComponentsPath);
+            ? Path.Combine(root, config.LayoutPath ?? "Components/Layout")
+            : Path.Combine(root, config.ComponentsPath);
         return Path.GetFullPath(Path.Combine(basePath, metadata.FilePath));
     }
 
@@ -259,7 +295,7 @@ internal static string InstalledFilePath(ComponentMetadata metadata, ShellUIConf
     public static string ContentHash(string content)
     {
         var bytes = System.Text.Encoding.UTF8.GetBytes(content.Replace("\r\n", "\n"));
-        return Convert.ToHexStringLower(System.Security.Cryptography.SHA256.HashData(bytes));
+        return Convert.ToHexString(System.Security.Cryptography.SHA256.HashData(bytes)).ToLowerInvariant();
     }
 
     private static void RecordInstalledComponent(
diff --git a/src/ShellUI.CLI/Services/DoctorService.cs b/src/ShellUI.CLI/Services/DoctorService.cs
new file mode 100644
index 0000000..42b2947
--- /dev/null
+++ b/src/ShellUI.CLI/Services/DoctorService.cs
@@ -0,0 +1,199 @@
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using ShellUI.Core.Models;
+using ShellUI.Templates;
+using Spectre.Console;
+
+namespace ShellUI.CLI.Services;
+
+public enum DoctorSeverity { Ok, Warning, Error }
+
+public record DoctorFinding(DoctorSeverity Severity, string Message, string? Fix = null);
+
+public static class DoctorService
+{
+    public static int Run()
+    {
+        var findings = Diagnose(Directory.GetCurrentDirectory());
+        foreach (var finding in findings)
+        {
+            var (mark, color) = finding.Severity switch
+            {
+                DoctorSeverity.Ok => ("✓", "green"),
+                DoctorSeverity.Warning => ("!", "yellow"),
+                _ => ("✗", "red"),
+            };
+            AnsiConsole.MarkupLine($"[{color}]{mark}[/] {Markup.Escape(finding.Message)}");
+            if (finding.Fix != null)
+                AnsiConsole.MarkupLine($"  [dim]{Markup.Escape(finding.Fix)}[/]");
+        }
+
+        var errors = findings.Count(f => f.Severity == DoctorSeverity.Error);
+        var warnings = findings.Count(f => f.Severity == DoctorSeverity.Warning);
+        AnsiConsole.MarkupLine("");
+        AnsiConsole.MarkupLine(errors + warnings == 0
+            ? "[green]No problems found.[/]"
+            : $"[{(errors > 0 ? "red" : "yellow")}]{errors} problem(s), {warnings} warning(s).[/]");
+        return errors > 0 ? 1 : 0;
+    }
+
+    public static List<DoctorFinding> Diagnose(string root)
+    {
+        var findings = new List<DoctorFinding>();
+        var csproj = Directory.GetFiles(root, "*.csproj").FirstOrDefault();
+        if (csproj == null)
+        {
+            findings.Add(new(DoctorSeverity.Error, "No .csproj in this folder.", "Run shellui doctor from the Blazor project's folder."));
+            return findings;
+        }
+
+        var configPath = Path.Combine(root, "shellui.json");
+        if (!File.Exists(configPath))
+        {
+            findings.Add(new(DoctorSeverity.Error, "shellui.json is missing, so ShellUI isn't set up here.", "Run shellui init."));
+            return findings;
+        }
+
+        ShellUIConfig? config;
+        try
+        {
+            config = JsonSerializer.Deserialize<ShellUIConfig>(File.ReadAllText(configPath));
+        }
+        catch (JsonException ex)
+        {
+            findings.Add(new(DoctorSeverity.Error, $"shellui.json isn't valid JSON: {ex.Message}", "Fix the file, or run shellui init --force to write a new one."));
+            return findings;
+        }
+        if (config == null)
+        {
+            findings.Add(new(DoctorSeverity.Error, "shellui.json is empty.", "Run shellui init --force."));
+            return findings;
+        }
+        findings.Add(new(DoctorSeverity.Ok, "shellui.json is valid."));
+
+        var componentsDir = Path.Combine(root, config.ComponentsPath);
+        findings.Add(Directory.Exists(componentsDir)
+            ? new(DoctorSeverity.Ok, $"{config.ComponentsPath} exists.")
+            : new(DoctorSeverity.Error, $"ComponentsPath {config.ComponentsPath} doesn't exist.", "Fix ComponentsPath in shellui.json, or run shellui update to reinstall the components."));
+
+        var project = ProjectDetector.DetectProject(root);
+        var projectFile = File.ReadAllText(csproj);
+        if (Regex.IsMatch(projectFile, @"<PackageReference\s+Include=""ShellUI\.Components""", RegexOptions.IgnoreCase))
+            findings.Add(new(DoctorSeverity.Warning, "The project uses both the ShellUI.Components package and CLI-installed components, so components with the same name are ambiguous.",
+                "Use one: remove the ShellUI.Components PackageReference, or remove shellui.json and Components/UI."));
+
+        CheckTailwind(root, config, findings);
+        CheckHost(root, project, findings);
+        CheckComponents(root, config, project, findings);
+        return findings;
+    }
+
+    private static void CheckTailwind(string root, ShellUIConfig config, List<DoctorFinding> findings)
+    {
+        if (config.Tailwind.Method == "npm")
+        {
+            findings.Add(Directory.Exists(Path.Combine(root, "node_modules", "@tailwindcss", "cli"))
+                ? new(DoctorSeverity.Ok, "Tailwind CLI (npm) is installed.")
+                : new(DoctorSeverity.Error, "The Tailwind npm packages aren't installed.", "Run npm install."));
+        }
+        else
+        {
+            var projectCopy = TailwindDownloader.GetTailwindPath(root);
+            var shared = TailwindDownloader.CachedPath();
+            findings.Add(File.Exists(projectCopy) || File.Exists(shared)
+                ? new(DoctorSeverity.Ok, $"Tailwind CLI found ({(File.Exists(projectCopy) ? projectCopy : shared)}).")
+                : new(DoctorSeverity.Warning, "The Tailwind CLI isn't downloaded yet.", "Run dotnet build; it downloads the CLI and builds wwwroot/app.css."));
+
+            var targets = Path.Combine(root, "Build", "ShellUI.targets");
+            if (!File.Exists(targets))
+                findings.Add(new(DoctorSeverity.Error, "Build/ShellUI.targets is missing, so dotnet build doesn't rebuild app.css.", "Run shellui init --force."));
+        }
+
+        var input = Path.Combine(root, "wwwroot", "input.css");
+        var output = Path.Combine(root, config.Tailwind.CssPath);
+        if (!File.Exists(output))
+        {
+            findings.Add(new(DoctorSeverity.Error, $"{config.Tailwind.CssPath} doesn't exist.", "Run dotnet build."));
+            return;
+        }
+
+        var built = File.GetLastWriteTimeUtc(output);
+        var componentsDir = Path.Combine(root, config.ComponentsPath);
+        var newer = new[] { input }.Where(File.Exists)
+            .Concat(Directory.Exists(componentsDir) ? Directory.EnumerateFiles(componentsDir, "*.razor", SearchOption.AllDirectories) : Enumerable.Empty<string>())
+            .Any(f => File.GetLastWriteTimeUtc(f) > built);
+        findings.Add(newer
+            ? new(DoctorSeverity.Warning, $"{config.Tailwind.CssPath} is older than input.css or a component, so new classes may be missing.", "Run dotnet build.")
+            : new(DoctorSeverity.Ok, $"{config.Tailwind.CssPath} is up to date."));
+    }
+
+    private static void CheckHost(string root, ProjectInfo project, List<DoctorFinding> findings)
+    {
+        var appRazor = Path.Combine(root, "Components", "App.razor");
+        var indexHtml = Path.Combine(root, "wwwroot", "index.html");
+        var host = File.Exists(appRazor) ? appRazor : File.Exists(indexHtml) ? indexHtml : null;
+        if (host == null)
+        {
+            if (InitService.RazorClassLibraryAssetBase(project.ProjectPath) != null)
+                findings.Add(new(DoctorSeverity.Ok, "Razor class library: the host page checks apply to each app that uses it.", $"See {InitService.RazorClassLibraryGuide}"));
+            else
+                findings.Add(new(DoctorSeverity.Warning, "No Components/App.razor or wwwroot/index.html, so the host page wasn't checked."));
+            return;
+        }
+
+        var name = Path.GetRelativePath(root, host).Replace('\\', '/');
+        var content = File.ReadAllText(host);
+        findings.Add(content.Contains("app.css", StringComparison.Ordinal)
+            ? new(DoctorSeverity.Ok, $"{name} links app.css.")
+            : new(DoctorSeverity.Error, $"{name} doesn't link app.css, so components are unstyled.", "Add <link rel=\"stylesheet\" href=\"app.css\" /> to <head>."));
+        findings.Add(content.Contains("shellui.js", StringComparison.Ordinal)
+            ? new(DoctorSeverity.Ok, $"{name} loads shellui.js.")
+            : new(DoctorSeverity.Error, $"{name} doesn't load shellui.js, so dialogs, dropdowns and the theme toggle can't call it.", "Add <script src=\"shellui.js\"></script> before the Blazor script, or run shellui init --force."));
+        findings.Add(content.Contains("ShellUI theme bootstrap", StringComparison.Ordinal) || content.Contains("localStorage.getItem('theme')", StringComparison.Ordinal)
+            ? new(DoctorSeverity.Ok, $"{name} applies the saved theme before first paint.")
+            : new(DoctorSeverity.Warning, $"{name} has no theme script, so dark mode flashes light on load.", "Run shellui init --force, or copy the theme script from a new init."));
+
+        if (host == indexHtml) return;
+        if (content.Contains("@rendermode", StringComparison.Ordinal))
+            findings.Add(new(DoctorSeverity.Ok, "App.razor sets an interactive render mode."));
+        else if (Directory.EnumerateFiles(Path.Combine(root, "Components"), "*.razor", SearchOption.AllDirectories)
+                     .Any(f => File.ReadAllText(f).Contains("@rendermode", StringComparison.Ordinal)))
+            findings.Add(new(DoctorSeverity.Warning, "Only some pages set a render mode; ShellUI components don't respond to clicks on the others.",
+                "Set it app-wide: <Routes @rendermode=\"InteractiveServer\" /> in App.razor."));
+        else
+            findings.Add(new(DoctorSeverity.Error, "No interactive render mode, so ShellUI components render but don't respond to clicks.",
+                "Add @rendermode=\"InteractiveServer\" to <Routes /> and <HeadOutlet /> in App.razor."));
+    }
+
+    private static void CheckComponents(string root, ShellUIConfig config, ProjectInfo project, List<DoctorFinding> findings)
+    {
+        var installed = config.InstalledComponents.Select(c => c.Name).ToList();
+        var missingFiles = config.InstalledComponents
+            .Where(c => ComponentRegistry.GetMetadata(c.Name) is { } m && !File.Exists(ComponentInstaller.InstalledFilePath(m, config, root)))
+            .Select(c => c.Name).ToList();
+        if (missingFiles.Count > 0)
+            findings.Add(new(DoctorSeverity.Error, $"Installed but the file is gone: {string.Join(", ", missingFiles)}.", $"Run shellui add {string.Join(" ", missingFiles)} --force, or shellui remove them."));
+
+        var missingDeps = ComponentManager.MissingDependencies(installed, installed);
+        findings.Add(missingDeps.Count == 0
+            ? new(DoctorSeverity.Ok, $"{installed.Count} installed component(s), none missing a dependency.")
+            : new(DoctorSeverity.Error, $"Missing dependencies: {string.Join(", ", missingDeps)}.", "Run shellui update; it installs them."));
+
+        var imports = new[] { Path.Combine(root, "Components", "_Imports.razor"), Path.Combine(root, "_Imports.razor") }.FirstOrDefault(File.Exists);
+        if (imports == null)
+        {
+            findings.Add(new(DoctorSeverity.Warning, "No _Imports.razor, so pages need their own @using for the components."));
+            return;
+        }
+        var lines = File.ReadAllLines(imports).Select(l => l.Trim()).ToHashSet();
+        var contents = installed.Where(n => ComponentRegistry.GetMetadata(n) is { IsLayoutBlock: false })
+            .Select(ComponentRegistry.GetComponentContent).OfType<string>();
+        var required = new[] { $"@using {project.RootNamespace}.Components.UI" }
+            .Concat(ComponentInstaller.RequiredImports(project.RootNamespace, contents));
+        var missingUsings = required.Where(u => !lines.Contains(u)).ToList();
+        var importsName = Path.GetRelativePath(root, imports).Replace('\\', '/');
+        findings.Add(missingUsings.Count == 0
+            ? new(DoctorSeverity.Ok, $"{importsName} has the ShellUI usings.")
+            : new(DoctorSeverity.Error, $"{importsName} is missing {string.Join(", ", missingUsings)}.", "Add those lines to it."));
+    }
+}
diff --git a/src/ShellUI.CLI/Services/ProjectDetector.cs b/src/ShellUI.CLI/Services/ProjectDetector.cs
index 1c1cbb8..98b34d8 100644
--- a/src/ShellUI.CLI/Services/ProjectDetector.cs
+++ b/src/ShellUI.CLI/Services/ProjectDetector.cs
@@ -5,9 +5,11 @@ namespace ShellUI.CLI.Services;
 
 public class ProjectDetector
 {
-    public static ProjectInfo DetectProject()
+    public static ProjectInfo DetectProject() => DetectProject(Directory.GetCurrentDirectory());
+
+    public static ProjectInfo DetectProject(string directory)
     {
-        var csprojFiles = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.csproj");
+        var csprojFiles = Directory.GetFiles(directory, "*.csproj");
         
         if (csprojFiles.Length == 0)
         {
diff --git a/src/ShellUI.CLI/ShellUI.CLI.csproj b/src/ShellUI.CLI/ShellUI.CLI.csproj
index cbeaba9..19fcd70 100644
--- a/src/ShellUI.CLI/ShellUI.CLI.csproj
+++ b/src/ShellUI.CLI/ShellUI.CLI.csproj
@@ -12,7 +12,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     
diff --git a/src/ShellUI.Components/Components/ContextMenu.razor b/src/ShellUI.Components/Components/ContextMenu.razor
index 2014cc5..e323285 100644
--- a/src/ShellUI.Components/Components/ContextMenu.razor
+++ b/src/ShellUI.Components/Components/ContextMenu.razor
@@ -25,12 +25,12 @@
                         }
                         else
                         {
-                            <button class="relative flex w-full cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50"
+                            <button class="@Shell.Cn("relative flex w-full cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50", item.Destructive ? "text-destructive hover:bg-destructive/10 hover:text-destructive focus:bg-destructive/10 focus:text-destructive" : null)"
                                     disabled="@item.Disabled"
                                     @onclick="() => SelectItem(item)">
                                 @if (!string.IsNullOrEmpty(item.Icon))
                                 {
-                                    <span class="mr-2 flex shrink-0 items-center justify-center text-muted-foreground" style="width: 0.875rem; height: 0.875rem;">@((MarkupString)item.Icon)</span>
+                                    <span class="mr-2 flex shrink-0 items-center justify-center @(item.Destructive ? "text-destructive" : "text-muted-foreground")" style="width: 0.875rem; height: 0.875rem;">@((MarkupString)item.Icon)</span>
                                 }
                                 <span class="flex-1">@item.Label</span>
                                 @if (!string.IsNullOrEmpty(item.Shortcut))
diff --git a/src/ShellUI.Components/Components/ContextMenuOption.razor b/src/ShellUI.Components/Components/ContextMenuOption.razor
index 24fc4b4..73de4c6 100644
--- a/src/ShellUI.Components/Components/ContextMenuOption.razor
+++ b/src/ShellUI.Components/Components/ContextMenuOption.razor
@@ -8,13 +8,13 @@
 else
 {
     <button type="button"
-            class="relative flex w-full cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50"
+            class="@Shell.Cn("relative flex w-full cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50", Destructive ? "text-destructive hover:bg-destructive/10 hover:text-destructive focus:bg-destructive/10 focus:text-destructive" : null)"
             disabled="@Disabled"
             @onclick="HandleClick"
             @attributes="AdditionalAttributes">
         @if (IconContent != null)
         {
-            <span class="mr-2 flex shrink-0 items-center justify-center text-muted-foreground" style="width: 0.875rem; height: 0.875rem;">@IconContent</span>
+            <span class="mr-2 flex shrink-0 items-center justify-center @(Destructive ? "text-destructive" : "text-muted-foreground")" style="width: 0.875rem; height: 0.875rem;">@IconContent</span>
         }
         <span class="flex-1">@ChildContent</span>
         @if (!string.IsNullOrEmpty(Shortcut))
@@ -30,6 +30,7 @@ else
     [Parameter] public RenderFragment? IconContent { get; set; }
     [Parameter] public string? Shortcut { get; set; }
     [Parameter] public bool Disabled { get; set; }
+    [Parameter] public bool Destructive { get; set; }
     [Parameter] public bool IsSeparator { get; set; }
     [Parameter] public string? Value { get; set; }
     [Parameter] public EventCallback OnClick { get; set; }
diff --git a/src/ShellUI.Components/Components/Sonner.razor b/src/ShellUI.Components/Components/Sonner.razor
index 9db9ad7..beb7911 100644
--- a/src/ShellUI.Components/Components/Sonner.razor
+++ b/src/ShellUI.Components/Components/Sonner.razor
@@ -13,7 +13,7 @@
         var stackClass = i > 0 ? (IsTop ? "-mt-20 group-hover:mt-0" : "-mb-20 group-hover:mb-0") : "";
         <div @key="toast.Id"
              style="z-index: @(i + 1)"
-             class="@stackClass @GetToastClasses(toast.Variant) pointer-events-auto relative flex min-w-0 w-full items-center gap-3 overflow-hidden rounded-lg p-4 shadow-lg transition-all duration-300 motion-reduce:transition-none animate-in fade-in-0 motion-reduce:animate-none @SonnerVariants.GetToastAnimation(Position) shrink-0">
+             class="@stackClass @GetToastClasses(toast.Variant) relative flex min-w-0 w-full items-center gap-3 overflow-hidden rounded-lg p-4 shadow-lg transition-all duration-300 motion-reduce:transition-none animate-in fade-in-0 motion-reduce:animate-none @SonnerVariants.GetToastAnimation(Position) shrink-0 @(toast.Dismissing ? "opacity-0 pointer-events-none" : "pointer-events-auto")">
             <div class="grid flex-1 gap-1">
                 @if (!string.IsNullOrEmpty(toast.Message))
                 {
diff --git a/src/ShellUI.Components/Models/ContextMenuModels.cs b/src/ShellUI.Components/Models/ContextMenuModels.cs
index da8b058..0734929 100644
--- a/src/ShellUI.Components/Models/ContextMenuModels.cs
+++ b/src/ShellUI.Components/Models/ContextMenuModels.cs
@@ -6,6 +6,7 @@ public class ContextMenuItem
     public string? Icon { get; set; }
     public string? Shortcut { get; set; }
     public bool Disabled { get; set; }
+    public bool Destructive { get; set; }
     public bool IsSeparator { get; set; }
     public object? Data { get; set; }
 }
diff --git a/src/ShellUI.Components/README.md b/src/ShellUI.Components/README.md
index 5111602..eea881f 100644
--- a/src/ShellUI.Components/README.md
+++ b/src/ShellUI.Components/README.md
@@ -8,14 +8,12 @@ Prefer to own and edit the component source? Use the [ShellUI CLI](https://www.n
 
 ## Install
 
-Requires a .NET 10 project:
+Works in .NET 8, 9 and 10 projects:
 
 ```bash
 dotnet add package ShellUI.Components
 ```
 
-On .NET 8 or 9, use the [ShellUI CLI](https://www.nuget.org/packages/ShellUI.CLI) instead. The source it installs builds on .NET 8, 9 and 10.
-
 ## Set up
 
 1. Import the namespace in `Components/_Imports.razor`:
diff --git a/src/ShellUI.Components/Services/SonnerService.cs b/src/ShellUI.Components/Services/SonnerService.cs
index 5ec4c06..a88ea3f 100644
--- a/src/ShellUI.Components/Services/SonnerService.cs
+++ b/src/ShellUI.Components/Services/SonnerService.cs
@@ -9,6 +9,7 @@ public class SonnerToastItem
     // Zero or negative disables auto-dismiss (toast stays until manually closed).
     public TimeSpan Duration { get; set; } = TimeSpan.FromSeconds(4);
     public DateTime CreatedAt { get; } = DateTime.UtcNow;
+    public bool Dismissing { get; internal set; }
 }
 
 public interface ISonnerService
@@ -20,6 +21,7 @@ public interface ISonnerService
     void Info(string message, string? description = null, TimeSpan? duration = null);
     void Warning(string message, string? description = null, TimeSpan? duration = null);
     void Remove(string id);
+    void Clear();
 }
 
 public class SonnerService : ISonnerService
@@ -58,10 +60,23 @@ public void Info(string message, string? description = null, TimeSpan? duration
     public void Warning(string message, string? description = null, TimeSpan? duration = null)
         => Show(message, description, "warning", duration);
 
-    public void Remove(string id)
+    // Matches the toast's duration-300 transition, so the fade finishes before removal.
+    private static readonly TimeSpan ExitDuration = TimeSpan.FromMilliseconds(300);
+
+    public void Remove(string id) => _ = DismissAsync(_toasts.Where(t => t.Id == id).ToList());
+
+    public void Clear() => _ = DismissAsync(_toasts.ToList());
+
+    private async Task DismissAsync(List<SonnerToastItem> toasts)
     {
-        var removed = _toasts.RemoveAll(t => t.Id == id);
-        if (removed > 0) OnChange?.Invoke();
+        toasts.RemoveAll(t => t.Dismissing);
+        if (toasts.Count == 0) return;
+        foreach (var toast in toasts) toast.Dismissing = true;
+        OnChange?.Invoke();
+
+        try { await Task.Delay(ExitDuration); } catch { }
+        foreach (var toast in toasts) _toasts.Remove(toast);
+        OnChange?.Invoke();
     }
 
     private async Task AutoDismissAsync(string id, TimeSpan delay)
diff --git a/src/ShellUI.Components/ShellUI.Components.csproj b/src/ShellUI.Components/ShellUI.Components.csproj
index 16db844..00b47d8 100644
--- a/src/ShellUI.Components/ShellUI.Components.csproj
+++ b/src/ShellUI.Components/ShellUI.Components.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     
@@ -28,12 +28,23 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.1" />
     <PackageReference Include="Blazor-ApexCharts" Version="6.0.2" />
     <PackageReference Include="QRCoder" Version="1.8.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.13" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="README.md" Pack="true" PackagePath="\" />
     <!-- NuGet auto-imports build/<PackageId>.targets; the safelist is embedded in it. -->
diff --git a/src/ShellUI.Components/build/ShellUI.Components.targets b/src/ShellUI.Components/build/ShellUI.Components.targets
index 2cc43ba..2c8371c 100644
--- a/src/ShellUI.Components/build/ShellUI.Components.targets
+++ b/src/ShellUI.Components/build/ShellUI.Components.targets
@@ -1,64 +1,119 @@
 <Project>
   <!-- AUTO-GENERATED by tools/ShellUI.SafelistGenerator. Do not edit by hand. -->
   <ItemGroup>
+    <ShellUISafelistEntry Include="active:scale-[0.98]" />
+    <ShellUISafelistEntry Include="after:-inset-2" />
+    <ShellUISafelistEntry Include="after:absolute" />
+    <ShellUISafelistEntry Include="after:md:hidden" />
     <ShellUISafelistEntry Include="align-middle" />
     <ShellUISafelistEntry Include="animate-bounce" />
     <ShellUISafelistEntry Include="animate-in" />
+    <ShellUISafelistEntry Include="animate-pulse" />
     <ShellUISafelistEntry Include="animate-spin" />
     <ShellUISafelistEntry Include="appearance-none" />
     <ShellUISafelistEntry Include="aspect-square" />
+    <ShellUISafelistEntry Include="backdrop-blur" />
     <ShellUISafelistEntry Include="backdrop-blur-md" />
     <ShellUISafelistEntry Include="backdrop-blur-sm" />
+    <ShellUISafelistEntry Include="bars-vertical" />
     <ShellUISafelistEntry Include="bg-accent" />
+    <ShellUISafelistEntry Include="bg-accent/30" />
+    <ShellUISafelistEntry Include="bg-accent/50" />
     <ShellUISafelistEntry Include="bg-background" />
     <ShellUISafelistEntry Include="bg-background/80" />
     <ShellUISafelistEntry Include="bg-background/95" />
     <ShellUISafelistEntry Include="bg-black/50" />
     <ShellUISafelistEntry Include="bg-black/80" />
     <ShellUISafelistEntry Include="bg-blue-500" />
+    <ShellUISafelistEntry Include="bg-blue-500/20" />
     <ShellUISafelistEntry Include="bg-border" />
     <ShellUISafelistEntry Include="bg-card" />
     <ShellUISafelistEntry Include="bg-current" />
     <ShellUISafelistEntry Include="bg-destructive" />
+    <ShellUISafelistEntry Include="bg-emerald-500/10" />
+    <ShellUISafelistEntry Include="bg-green-50" />
     <ShellUISafelistEntry Include="bg-green-500" />
+    <ShellUISafelistEntry Include="bg-green-500/20" />
+    <ShellUISafelistEntry Include="bg-input" />
     <ShellUISafelistEntry Include="bg-muted" />
+    <ShellUISafelistEntry Include="bg-muted-foreground" />
     <ShellUISafelistEntry Include="bg-muted/30" />
     <ShellUISafelistEntry Include="bg-muted/40" />
     <ShellUISafelistEntry Include="bg-popover" />
     <ShellUISafelistEntry Include="bg-primary" />
+    <ShellUISafelistEntry Include="bg-primary/10" />
+    <ShellUISafelistEntry Include="bg-red-500/10" />
     <ShellUISafelistEntry Include="bg-secondary" />
     <ShellUISafelistEntry Include="bg-sidebar" />
+    <ShellUISafelistEntry Include="bg-sidebar-accent" />
+    <ShellUISafelistEntry Include="bg-sidebar-border" />
     <ShellUISafelistEntry Include="bg-sidebar-primary" />
     <ShellUISafelistEntry Include="bg-transparent" />
+    <ShellUISafelistEntry Include="bg-white/10" />
+    <ShellUISafelistEntry Include="bg-yellow-50" />
     <ShellUISafelistEntry Include="bg-yellow-500" />
+    <ShellUISafelistEntry Include="bg-yellow-500/20" />
     <ShellUISafelistEntry Include="border-0" />
+    <ShellUISafelistEntry Include="border-2" />
     <ShellUISafelistEntry Include="border-b" />
     <ShellUISafelistEntry Include="border-border" />
     <ShellUISafelistEntry Include="border-border/40" />
+    <ShellUISafelistEntry Include="border-dashed" />
     <ShellUISafelistEntry Include="border-destructive" />
+    <ShellUISafelistEntry Include="border-green-500" />
     <ShellUISafelistEntry Include="border-input" />
     <ShellUISafelistEntry Include="border-l" />
+    <ShellUISafelistEntry Include="border-muted" />
+    <ShellUISafelistEntry Include="border-primary" />
     <ShellUISafelistEntry Include="border-r" />
+    <ShellUISafelistEntry Include="border-ring" />
+    <ShellUISafelistEntry Include="border-sidebar-border" />
     <ShellUISafelistEntry Include="border-t" />
     <ShellUISafelistEntry Include="border-transparent" />
+    <ShellUISafelistEntry Include="border-yellow-500" />
     <ShellUISafelistEntry Include="bottom-0" />
     <ShellUISafelistEntry Include="bottom-4" />
     <ShellUISafelistEntry Include="bottom-full" />
+    <ShellUISafelistEntry Include="bottom-left" />
+    <ShellUISafelistEntry Include="bottom-right" />
+    <ShellUISafelistEntry Include="break-words" />
     <ShellUISafelistEntry Include="caption-bottom" />
     <ShellUISafelistEntry Include="cursor-default" />
+    <ShellUISafelistEntry Include="cursor-not-allowed" />
     <ShellUISafelistEntry Include="cursor-pointer" />
+    <ShellUISafelistEntry Include="dark:bg-blue-900/30" />
+    <ShellUISafelistEntry Include="dark:bg-green-900/20" />
+    <ShellUISafelistEntry Include="dark:bg-green-900/30" />
+    <ShellUISafelistEntry Include="dark:bg-yellow-900/20" />
+    <ShellUISafelistEntry Include="dark:bg-yellow-900/30" />
+    <ShellUISafelistEntry Include="dark:text-blue-100" />
+    <ShellUISafelistEntry Include="dark:text-emerald-400" />
+    <ShellUISafelistEntry Include="dark:text-green-100" />
+    <ShellUISafelistEntry Include="dark:text-red-400" />
+    <ShellUISafelistEntry Include="dark:text-yellow-100" />
+    <ShellUISafelistEntry Include="data-[disabled]:opacity-50" />
+    <ShellUISafelistEntry Include="data-[disabled]:pointer-events-none" />
     <ShellUISafelistEntry Include="data-[selected]:bg-accent" />
     <ShellUISafelistEntry Include="data-[selected]:text-accent-foreground" />
     <ShellUISafelistEntry Include="data-[state=closed]:animate-out" />
     <ShellUISafelistEntry Include="data-[state=closed]:duration-300" />
     <ShellUISafelistEntry Include="data-[state=closed]:fade-out-0" />
+    <ShellUISafelistEntry Include="data-[state=closed]:slide-out-to-left-1/2" />
+    <ShellUISafelistEntry Include="data-[state=closed]:slide-out-to-top-[48%]" />
+    <ShellUISafelistEntry Include="data-[state=closed]:zoom-out-95" />
     <ShellUISafelistEntry Include="data-[state=open]:animate-in" />
     <ShellUISafelistEntry Include="data-[state=open]:bg-accent" />
     <ShellUISafelistEntry Include="data-[state=open]:duration-500" />
     <ShellUISafelistEntry Include="data-[state=open]:fade-in-0" />
     <ShellUISafelistEntry Include="data-[state=open]:grid-rows-[1fr]" />
+    <ShellUISafelistEntry Include="data-[state=open]:opacity-100" />
+    <ShellUISafelistEntry Include="data-[state=open]:slide-in-from-left-1/2" />
+    <ShellUISafelistEntry Include="data-[state=open]:slide-in-from-top-[48%]" />
     <ShellUISafelistEntry Include="data-[state=open]:text-muted-foreground" />
+    <ShellUISafelistEntry Include="data-[state=open]:zoom-in-95" />
+    <ShellUISafelistEntry Include="data-[state=selected]:bg-muted" />
     <ShellUISafelistEntry Include="disabled:cursor-not-allowed" />
+    <ShellUISafelistEntry Include="disabled:opacity-40" />
     <ShellUISafelistEntry Include="disabled:opacity-50" />
     <ShellUISafelistEntry Include="disabled:pointer-events-none" />
     <ShellUISafelistEntry Include="duration-150" />
@@ -66,13 +121,23 @@
     <ShellUISafelistEntry Include="duration-300" />
     <ShellUISafelistEntry Include="ease-[cubic-bezier(0.4,0,0.2,1)]" />
     <ShellUISafelistEntry Include="ease-in-out" />
+    <ShellUISafelistEntry Include="ease-linear" />
     <ShellUISafelistEntry Include="ease-out" />
     <ShellUISafelistEntry Include="fa-bell" />
+    <ShellUISafelistEntry Include="fa-book" />
+    <ShellUISafelistEntry Include="fa-bullhorn" />
     <ShellUISafelistEntry Include="fa-chevron-right" />
     <ShellUISafelistEntry Include="fa-circle-check" />
     <ShellUISafelistEntry Include="fa-circle-plus" />
+    <ShellUISafelistEntry Include="fa-code" />
     <ShellUISafelistEntry Include="fa-credit-card" />
     <ShellUISafelistEntry Include="fa-ellipsis" />
+    <ShellUISafelistEntry Include="fa-gear" />
+    <ShellUISafelistEntry Include="fa-life-ring" />
+    <ShellUISafelistEntry Include="fa-location-dot" />
+    <ShellUISafelistEntry Include="fa-microchip" />
+    <ShellUISafelistEntry Include="fa-paper-plane" />
+    <ShellUISafelistEntry Include="fa-pen-ruler" />
     <ShellUISafelistEntry Include="fa-right-from-bracket" />
     <ShellUISafelistEntry Include="fa-solid" />
     <ShellUISafelistEntry Include="fa-sort" />
@@ -90,6 +155,7 @@
     <ShellUISafelistEntry Include="flex-col" />
     <ShellUISafelistEntry Include="flex-col-reverse" />
     <ShellUISafelistEntry Include="flex-row" />
+    <ShellUISafelistEntry Include="flex-row-reverse" />
     <ShellUISafelistEntry Include="flex-shrink-0" />
     <ShellUISafelistEntry Include="flex-wrap" />
     <ShellUISafelistEntry Include="focus-visible:[&amp;::-moz-range-thumb]:ring-2" />
@@ -103,14 +169,23 @@
     <ShellUISafelistEntry Include="focus-visible:ring-2" />
     <ShellUISafelistEntry Include="focus-visible:ring-destructive" />
     <ShellUISafelistEntry Include="focus-visible:ring-offset-2" />
+    <ShellUISafelistEntry Include="focus-visible:ring-offset-background" />
     <ShellUISafelistEntry Include="focus-visible:ring-ring" />
+    <ShellUISafelistEntry Include="focus-within:ring-2" />
+    <ShellUISafelistEntry Include="focus-within:ring-offset-2" />
+    <ShellUISafelistEntry Include="focus-within:ring-ring" />
     <ShellUISafelistEntry Include="focus:bg-accent" />
+    <ShellUISafelistEntry Include="focus:bg-destructive/10" />
+    <ShellUISafelistEntry Include="focus:bg-primary" />
+    <ShellUISafelistEntry Include="focus:border-ring" />
     <ShellUISafelistEntry Include="focus:outline-none" />
     <ShellUISafelistEntry Include="focus:ring-1" />
     <ShellUISafelistEntry Include="focus:ring-2" />
     <ShellUISafelistEntry Include="focus:ring-offset-2" />
     <ShellUISafelistEntry Include="focus:ring-ring" />
     <ShellUISafelistEntry Include="focus:text-accent-foreground" />
+    <ShellUISafelistEntry Include="focus:text-destructive" />
+    <ShellUISafelistEntry Include="focus:text-primary-foreground" />
     <ShellUISafelistEntry Include="font-bold" />
     <ShellUISafelistEntry Include="font-medium" />
     <ShellUISafelistEntry Include="font-mono" />
@@ -129,21 +204,37 @@
     <ShellUISafelistEntry Include="grid-cols-5" />
     <ShellUISafelistEntry Include="grid-cols-7" />
     <ShellUISafelistEntry Include="grid-rows-[0fr]" />
+    <ShellUISafelistEntry Include="group-content" />
+    <ShellUISafelistEntry Include="group-data-[collapsible=icon]:!bg-sidebar-primary" />
     <ShellUISafelistEntry Include="group-data-[collapsible=icon]:!flex" />
     <ShellUISafelistEntry Include="group-data-[collapsible=icon]:!items-center" />
     <ShellUISafelistEntry Include="group-data-[collapsible=icon]:!justify-center" />
     <ShellUISafelistEntry Include="group-data-[collapsible=icon]:!p-0" />
     <ShellUISafelistEntry Include="group-data-[collapsible=icon]:!rounded-full" />
     <ShellUISafelistEntry Include="group-data-[collapsible=icon]:!size-8" />
+    <ShellUISafelistEntry Include="group-data-[collapsible=icon]:-mt-8" />
     <ShellUISafelistEntry Include="group-data-[collapsible=icon]:hidden" />
+    <ShellUISafelistEntry Include="group-data-[collapsible=icon]:opacity-0" />
+    <ShellUISafelistEntry Include="group-data-[collapsible=icon]:overflow-hidden" />
+    <ShellUISafelistEntry Include="group-data-[collapsible=icon]:text-sidebar-primary-foreground" />
+    <ShellUISafelistEntry Include="group-data-[collapsible=offcanvas]:after:left-full" />
+    <ShellUISafelistEntry Include="group-data-[collapsible=offcanvas]:hover:bg-sidebar" />
+    <ShellUISafelistEntry Include="group-data-[collapsible=offcanvas]:translate-x-0" />
+    <ShellUISafelistEntry Include="group-data-[side=right]:group-data-[collapsible=offcanvas]:-translate-x-full" />
     <ShellUISafelistEntry Include="group-data-[variant=floating]:border" />
     <ShellUISafelistEntry Include="group-data-[variant=floating]:border-sidebar-border" />
     <ShellUISafelistEntry Include="group-data-[variant=floating]:rounded-lg" />
     <ShellUISafelistEntry Include="group-data-[variant=floating]:shadow" />
     <ShellUISafelistEntry Include="group-first:top-3.5" />
+    <ShellUISafelistEntry Include="group-focus-within/menu-item:opacity-100" />
+    <ShellUISafelistEntry Include="group-hover/menu-item:opacity-100" />
+    <ShellUISafelistEntry Include="group-hover:scale-105" />
+    <ShellUISafelistEntry Include="group-label" />
     <ShellUISafelistEntry Include="group-last:bottom-auto" />
     <ShellUISafelistEntry Include="group-last:h-3.5" />
     <ShellUISafelistEntry Include="group-only:hidden" />
+    <ShellUISafelistEntry Include="group/menu-item" />
+    <ShellUISafelistEntry Include="group/sidebar-wrapper" />
     <ShellUISafelistEntry Include="h-1.5" />
     <ShellUISafelistEntry Include="h-1/2" />
     <ShellUISafelistEntry Include="h-10" />
@@ -158,28 +249,40 @@
     <ShellUISafelistEntry Include="h-3.5" />
     <ShellUISafelistEntry Include="h-4" />
     <ShellUISafelistEntry Include="h-5" />
+    <ShellUISafelistEntry Include="h-6" />
     <ShellUISafelistEntry Include="h-7" />
     <ShellUISafelistEntry Include="h-8" />
     <ShellUISafelistEntry Include="h-9" />
+    <ShellUISafelistEntry Include="h-[1px]" />
     <ShellUISafelistEntry Include="h-full" />
     <ShellUISafelistEntry Include="h-px" />
+    <ShellUISafelistEntry Include="h-svh" />
+    <ShellUISafelistEntry Include="h1v1h-1z" />
+    <ShellUISafelistEntry Include="has-[[data-variant=inset]]:bg-sidebar" />
     <ShellUISafelistEntry Include="hover:bg-accent" />
     <ShellUISafelistEntry Include="hover:bg-accent/50" />
     <ShellUISafelistEntry Include="hover:bg-blue-600" />
+    <ShellUISafelistEntry Include="hover:bg-destructive/10" />
     <ShellUISafelistEntry Include="hover:bg-destructive/80" />
     <ShellUISafelistEntry Include="hover:bg-destructive/90" />
     <ShellUISafelistEntry Include="hover:bg-green-600" />
     <ShellUISafelistEntry Include="hover:bg-muted" />
+    <ShellUISafelistEntry Include="hover:bg-muted/50" />
+    <ShellUISafelistEntry Include="hover:bg-primary" />
     <ShellUISafelistEntry Include="hover:bg-primary/80" />
     <ShellUISafelistEntry Include="hover:bg-primary/90" />
     <ShellUISafelistEntry Include="hover:bg-secondary/80" />
     <ShellUISafelistEntry Include="hover:bg-sidebar-accent" />
+    <ShellUISafelistEntry Include="hover:bg-white/20" />
     <ShellUISafelistEntry Include="hover:bg-yellow-600" />
+    <ShellUISafelistEntry Include="hover:border-border" />
+    <ShellUISafelistEntry Include="hover:border-primary/50" />
     <ShellUISafelistEntry Include="hover:opacity-100" />
     <ShellUISafelistEntry Include="hover:text-accent-foreground" />
     <ShellUISafelistEntry Include="hover:text-destructive" />
     <ShellUISafelistEntry Include="hover:text-foreground" />
     <ShellUISafelistEntry Include="hover:text-muted-foreground" />
+    <ShellUISafelistEntry Include="hover:text-primary-foreground" />
     <ShellUISafelistEntry Include="hover:text-sidebar-accent-foreground" />
     <ShellUISafelistEntry Include="hover:underline" />
     <ShellUISafelistEntry Include="inline-block" />
@@ -189,23 +292,34 @@
     <ShellUISafelistEntry Include="inset-y-0" />
     <ShellUISafelistEntry Include="items-baseline" />
     <ShellUISafelistEntry Include="items-center" />
+    <ShellUISafelistEntry Include="items-end" />
     <ShellUISafelistEntry Include="items-start" />
     <ShellUISafelistEntry Include="justify-between" />
     <ShellUISafelistEntry Include="justify-center" />
     <ShellUISafelistEntry Include="justify-end" />
+    <ShellUISafelistEntry Include="last:border-b-0" />
+    <ShellUISafelistEntry Include="last:pb-0" />
     <ShellUISafelistEntry Include="leading-none" />
+    <ShellUISafelistEntry Include="leading-relaxed" />
     <ShellUISafelistEntry Include="leading-tight" />
     <ShellUISafelistEntry Include="left-0" />
     <ShellUISafelistEntry Include="left-1/2" />
     <ShellUISafelistEntry Include="left-2" />
     <ShellUISafelistEntry Include="left-3.5" />
+    <ShellUISafelistEntry Include="left-[50%]" />
+    <ShellUISafelistEntry Include="left-full" />
     <ShellUISafelistEntry Include="lg:space-x-8" />
     <ShellUISafelistEntry Include="list-none" />
     <ShellUISafelistEntry Include="max-h-48" />
     <ShellUISafelistEntry Include="max-h-60" />
+    <ShellUISafelistEntry Include="max-h-[300px]" />
     <ShellUISafelistEntry Include="max-h-[90vh]" />
     <ShellUISafelistEntry Include="max-h-[min(360px,55vh)]" />
+    <ShellUISafelistEntry Include="max-h-screen" />
+    <ShellUISafelistEntry Include="max-w-[80%]" />
     <ShellUISafelistEntry Include="max-w-[90vw]" />
+    <ShellUISafelistEntry Include="max-w-lg" />
+    <ShellUISafelistEntry Include="max-w-max" />
     <ShellUISafelistEntry Include="max-w-sm" />
     <ShellUISafelistEntry Include="max-w-xl" />
     <ShellUISafelistEntry Include="mb-1" />
@@ -213,18 +327,35 @@
     <ShellUISafelistEntry Include="mb-4" />
     <ShellUISafelistEntry Include="mb-6" />
     <ShellUISafelistEntry Include="md:block" />
+    <ShellUISafelistEntry Include="md:flex" />
+    <ShellUISafelistEntry Include="md:max-w-[420px]" />
+    <ShellUISafelistEntry Include="md:opacity-0" />
+    <ShellUISafelistEntry Include="md:peer-data-[variant=inset]:m-2" />
+    <ShellUISafelistEntry Include="md:peer-data-[variant=inset]:ml-0" />
+    <ShellUISafelistEntry Include="md:peer-data-[variant=inset]:rounded-xl" />
+    <ShellUISafelistEntry Include="md:peer-data-[variant=inset]:shadow" />
+    <ShellUISafelistEntry Include="menu-action" />
+    <ShellUISafelistEntry Include="menu-badge" />
+    <ShellUISafelistEntry Include="menu-button" />
+    <ShellUISafelistEntry Include="menu-item" />
+    <ShellUISafelistEntry Include="menu-sub" />
+    <ShellUISafelistEntry Include="menu-sub-button" />
+    <ShellUISafelistEntry Include="menu-sub-item" />
     <ShellUISafelistEntry Include="min-h-0" />
     <ShellUISafelistEntry Include="min-h-10" />
     <ShellUISafelistEntry Include="min-h-7" />
     <ShellUISafelistEntry Include="min-h-8" />
     <ShellUISafelistEntry Include="min-h-[80px]" />
+    <ShellUISafelistEntry Include="min-h-svh" />
     <ShellUISafelistEntry Include="min-w-0" />
     <ShellUISafelistEntry Include="min-w-24" />
     <ShellUISafelistEntry Include="min-w-5" />
     <ShellUISafelistEntry Include="min-w-8" />
+    <ShellUISafelistEntry Include="min-w-[12rem]" />
     <ShellUISafelistEntry Include="min-w-[640px]" />
     <ShellUISafelistEntry Include="min-w-[8rem]" />
     <ShellUISafelistEntry Include="ml-1" />
+    <ShellUISafelistEntry Include="ml-2" />
     <ShellUISafelistEntry Include="ml-4" />
     <ShellUISafelistEntry Include="ml-auto" />
     <ShellUISafelistEntry Include="motion-reduce:animate-none" />
@@ -233,25 +364,31 @@
     <ShellUISafelistEntry Include="mr-3" />
     <ShellUISafelistEntry Include="mt-0.5" />
     <ShellUISafelistEntry Include="mt-1" />
+    <ShellUISafelistEntry Include="mt-10" />
     <ShellUISafelistEntry Include="mt-2" />
     <ShellUISafelistEntry Include="mt-4" />
     <ShellUISafelistEntry Include="mt-6" />
     <ShellUISafelistEntry Include="mt-8" />
     <ShellUISafelistEntry Include="mt-auto" />
+    <ShellUISafelistEntry Include="mx-2" />
+    <ShellUISafelistEntry Include="mx-3.5" />
     <ShellUISafelistEntry Include="mx-auto" />
     <ShellUISafelistEntry Include="my-1" />
     <ShellUISafelistEntry Include="object-contain" />
     <ShellUISafelistEntry Include="object-cover" />
+    <ShellUISafelistEntry Include="opacity-0" />
     <ShellUISafelistEntry Include="opacity-25" />
     <ShellUISafelistEntry Include="opacity-50" />
     <ShellUISafelistEntry Include="opacity-70" />
     <ShellUISafelistEntry Include="opacity-75" />
     <ShellUISafelistEntry Include="opacity-90" />
+    <ShellUISafelistEntry Include="opacity:.12" />
     <ShellUISafelistEntry Include="origin-top-right" />
     <ShellUISafelistEntry Include="outline-none" />
     <ShellUISafelistEntry Include="overflow-auto" />
     <ShellUISafelistEntry Include="overflow-hidden" />
     <ShellUISafelistEntry Include="overflow-x-auto" />
+    <ShellUISafelistEntry Include="overflow-x-hidden" />
     <ShellUISafelistEntry Include="overflow-y-auto" />
     <ShellUISafelistEntry Include="overscroll-contain" />
     <ShellUISafelistEntry Include="p-0.5" />
@@ -261,25 +398,35 @@
     <ShellUISafelistEntry Include="p-3" />
     <ShellUISafelistEntry Include="p-4" />
     <ShellUISafelistEntry Include="p-6" />
+    <ShellUISafelistEntry Include="p-8" />
     <ShellUISafelistEntry Include="p-[3px]" />
     <ShellUISafelistEntry Include="pb-0.5" />
     <ShellUISafelistEntry Include="pb-1" />
     <ShellUISafelistEntry Include="pb-4" />
+    <ShellUISafelistEntry Include="pb-8" />
+    <ShellUISafelistEntry Include="peer-data-[active=true]/menu-button:text-sidebar-accent-foreground" />
+    <ShellUISafelistEntry Include="peer-data-[variant=inset]:min-h-[calc(100svh-1rem)]" />
     <ShellUISafelistEntry Include="peer-disabled:cursor-not-allowed" />
     <ShellUISafelistEntry Include="peer-disabled:opacity-70" />
+    <ShellUISafelistEntry Include="peer-hover/menu-button:text-sidebar-accent-foreground" />
     <ShellUISafelistEntry Include="peer/menu-button" />
     <ShellUISafelistEntry Include="pl-2" />
+    <ShellUISafelistEntry Include="pl-2.5" />
     <ShellUISafelistEntry Include="pl-3" />
     <ShellUISafelistEntry Include="pl-4" />
+    <ShellUISafelistEntry Include="pl-8" />
     <ShellUISafelistEntry Include="placeholder:text-muted-foreground" />
     <ShellUISafelistEntry Include="pointer-events-auto" />
     <ShellUISafelistEntry Include="pointer-events-none" />
     <ShellUISafelistEntry Include="pr-2" />
+    <ShellUISafelistEntry Include="pr-2.5" />
     <ShellUISafelistEntry Include="pr-3" />
     <ShellUISafelistEntry Include="pr-6" />
     <ShellUISafelistEntry Include="pr-8" />
+    <ShellUISafelistEntry Include="pr-9" />
     <ShellUISafelistEntry Include="pt-0" />
     <ShellUISafelistEntry Include="pt-3" />
+    <ShellUISafelistEntry Include="pt-6" />
     <ShellUISafelistEntry Include="px-1" />
     <ShellUISafelistEntry Include="px-1.5" />
     <ShellUISafelistEntry Include="px-2" />
@@ -292,6 +439,7 @@
     <ShellUISafelistEntry Include="py-1" />
     <ShellUISafelistEntry Include="py-1.5" />
     <ShellUISafelistEntry Include="py-10" />
+    <ShellUISafelistEntry Include="py-12" />
     <ShellUISafelistEntry Include="py-2" />
     <ShellUISafelistEntry Include="py-3" />
     <ShellUISafelistEntry Include="py-4" />
@@ -301,14 +449,24 @@
     <ShellUISafelistEntry Include="right-1" />
     <ShellUISafelistEntry Include="right-2" />
     <ShellUISafelistEntry Include="right-4" />
+    <ShellUISafelistEntry Include="right-full" />
+    <ShellUISafelistEntry Include="ring-0" />
+    <ShellUISafelistEntry Include="ring-2" />
+    <ShellUISafelistEntry Include="ring-4" />
+    <ShellUISafelistEntry Include="ring-offset-2" />
     <ShellUISafelistEntry Include="ring-offset-background" />
+    <ShellUISafelistEntry Include="ring-primary/20" />
+    <ShellUISafelistEntry Include="ring-ring" />
     <ShellUISafelistEntry Include="ring-sidebar-ring" />
+    <ShellUISafelistEntry Include="rotate-180" />
+    <ShellUISafelistEntry Include="rotate-90" />
     <ShellUISafelistEntry Include="rounded-[2px]" />
     <ShellUISafelistEntry Include="rounded-full" />
     <ShellUISafelistEntry Include="rounded-lg" />
     <ShellUISafelistEntry Include="rounded-md" />
     <ShellUISafelistEntry Include="rounded-sm" />
     <ShellUISafelistEntry Include="rounded-xl" />
+    <ShellUISafelistEntry Include="scale-[1.02]" />
     <ShellUISafelistEntry Include="select-none" />
     <ShellUISafelistEntry Include="shadow-2xl" />
     <ShellUISafelistEntry Include="shadow-lg" />
@@ -322,6 +480,7 @@
     <ShellUISafelistEntry Include="shellui-chart-tooltip-row" />
     <ShellUISafelistEntry Include="shellui-chart-tooltip-title" />
     <ShellUISafelistEntry Include="shellui-chart-tooltip-value" />
+    <ShellUISafelistEntry Include="shellui-loading" />
     <ShellUISafelistEntry Include="shrink-0" />
     <ShellUISafelistEntry Include="size-4" />
     <ShellUISafelistEntry Include="size-8" />
@@ -331,40 +490,61 @@
     <ShellUISafelistEntry Include="slide-in-from-right" />
     <ShellUISafelistEntry Include="slide-in-from-top" />
     <ShellUISafelistEntry Include="slide-in-from-top-2" />
+    <ShellUISafelistEntry Include="sm:flex-col" />
     <ShellUISafelistEntry Include="sm:flex-row" />
+    <ShellUISafelistEntry Include="sm:gap-2.5" />
     <ShellUISafelistEntry Include="sm:inline" />
     <ShellUISafelistEntry Include="sm:inline-flex" />
     <ShellUISafelistEntry Include="sm:items-center" />
     <ShellUISafelistEntry Include="sm:justify-between" />
+    <ShellUISafelistEntry Include="sm:justify-end" />
     <ShellUISafelistEntry Include="sm:max-w-sm" />
+    <ShellUISafelistEntry Include="sm:pl-2.5" />
+    <ShellUISafelistEntry Include="sm:pr-2.5" />
+    <ShellUISafelistEntry Include="sm:px-4" />
+    <ShellUISafelistEntry Include="sm:rounded-lg" />
+    <ShellUISafelistEntry Include="sm:space-x-2" />
     <ShellUISafelistEntry Include="sm:space-x-6" />
     <ShellUISafelistEntry Include="sm:text-left" />
     <ShellUISafelistEntry Include="space-x-1" />
     <ShellUISafelistEntry Include="space-x-2" />
+    <ShellUISafelistEntry Include="space-x-4" />
     <ShellUISafelistEntry Include="space-y-0.5" />
+    <ShellUISafelistEntry Include="space-y-1.5" />
     <ShellUISafelistEntry Include="space-y-2" />
     <ShellUISafelistEntry Include="space-y-4" />
+    <ShellUISafelistEntry Include="space-y-6" />
     <ShellUISafelistEntry Include="sr-only" />
     <ShellUISafelistEntry Include="starting:opacity-0" />
     <ShellUISafelistEntry Include="starting:scale-95" />
+    <ShellUISafelistEntry Include="supports-[backdrop-filter]:bg-background/60" />
     <ShellUISafelistEntry Include="tabular-nums" />
     <ShellUISafelistEntry Include="text-2xl" />
     <ShellUISafelistEntry Include="text-[10px]" />
+    <ShellUISafelistEntry Include="text-[11px]" />
     <ShellUISafelistEntry Include="text-[8px]" />
     <ShellUISafelistEntry Include="text-accent-foreground" />
+    <ShellUISafelistEntry Include="text-base" />
+    <ShellUISafelistEntry Include="text-blue-700" />
     <ShellUISafelistEntry Include="text-card-foreground" />
     <ShellUISafelistEntry Include="text-center" />
+    <ShellUISafelistEntry Include="text-destructive" />
     <ShellUISafelistEntry Include="text-destructive-foreground" />
+    <ShellUISafelistEntry Include="text-emerald-600" />
     <ShellUISafelistEntry Include="text-foreground" />
     <ShellUISafelistEntry Include="text-foreground/70" />
+    <ShellUISafelistEntry Include="text-green-700" />
+    <ShellUISafelistEntry Include="text-green-900" />
     <ShellUISafelistEntry Include="text-left" />
     <ShellUISafelistEntry Include="text-lg" />
     <ShellUISafelistEntry Include="text-muted-foreground" />
     <ShellUISafelistEntry Include="text-popover-foreground" />
     <ShellUISafelistEntry Include="text-primary" />
     <ShellUISafelistEntry Include="text-primary-foreground" />
+    <ShellUISafelistEntry Include="text-red-600" />
     <ShellUISafelistEntry Include="text-right" />
     <ShellUISafelistEntry Include="text-secondary-foreground" />
+    <ShellUISafelistEntry Include="text-sidebar-accent-foreground" />
     <ShellUISafelistEntry Include="text-sidebar-foreground" />
     <ShellUISafelistEntry Include="text-sidebar-foreground/70" />
     <ShellUISafelistEntry Include="text-sidebar-primary-foreground" />
@@ -372,27 +552,44 @@
     <ShellUISafelistEntry Include="text-white" />
     <ShellUISafelistEntry Include="text-xl" />
     <ShellUISafelistEntry Include="text-xs" />
+    <ShellUISafelistEntry Include="text-yellow-800" />
+    <ShellUISafelistEntry Include="text-yellow-900" />
     <ShellUISafelistEntry Include="top-0" />
     <ShellUISafelistEntry Include="top-2" />
     <ShellUISafelistEntry Include="top-4" />
     <ShellUISafelistEntry Include="top-8" />
     <ShellUISafelistEntry Include="top-[15vh]" />
+    <ShellUISafelistEntry Include="top-[1px]" />
+    <ShellUISafelistEntry Include="top-[50%]" />
     <ShellUISafelistEntry Include="top-full" />
+    <ShellUISafelistEntry Include="top-right" />
+    <ShellUISafelistEntry Include="touch-none" />
     <ShellUISafelistEntry Include="tracking-tight" />
     <ShellUISafelistEntry Include="transition-[grid-template-rows]" />
+    <ShellUISafelistEntry Include="transition-[left,right,width]" />
     <ShellUISafelistEntry Include="transition-[width,height,padding]" />
+    <ShellUISafelistEntry Include="transition-[width]" />
     <ShellUISafelistEntry Include="transition-all" />
     <ShellUISafelistEntry Include="transition-colors" />
     <ShellUISafelistEntry Include="transition-opacity" />
     <ShellUISafelistEntry Include="transition-transform" />
+    <ShellUISafelistEntry Include="translate-x-0" />
+    <ShellUISafelistEntry Include="translate-x-5" />
+    <ShellUISafelistEntry Include="translate-x-[-50%]" />
+    <ShellUISafelistEntry Include="translate-x-px" />
+    <ShellUISafelistEntry Include="translate-y-[-50%]" />
     <ShellUISafelistEntry Include="underline-offset-4" />
     <ShellUISafelistEntry Include="var(--border" />
     <ShellUISafelistEntry Include="var(--muted" />
+    <ShellUISafelistEntry Include="var(--sidebar-width" />
+    <ShellUISafelistEntry Include="var(--sidebar-width-icon" />
     <ShellUISafelistEntry Include="w-1.5" />
     <ShellUISafelistEntry Include="w-1/2" />
     <ShellUISafelistEntry Include="w-10" />
+    <ShellUISafelistEntry Include="w-11" />
     <ShellUISafelistEntry Include="w-12" />
     <ShellUISafelistEntry Include="w-16" />
+    <ShellUISafelistEntry Include="w-2" />
     <ShellUISafelistEntry Include="w-2.5" />
     <ShellUISafelistEntry Include="w-2/5" />
     <ShellUISafelistEntry Include="w-3" />
@@ -401,19 +598,24 @@
     <ShellUISafelistEntry Include="w-4" />
     <ShellUISafelistEntry Include="w-5" />
     <ShellUISafelistEntry Include="w-56" />
+    <ShellUISafelistEntry Include="w-6" />
     <ShellUISafelistEntry Include="w-64" />
     <ShellUISafelistEntry Include="w-7" />
+    <ShellUISafelistEntry Include="w-72" />
     <ShellUISafelistEntry Include="w-8" />
     <ShellUISafelistEntry Include="w-9" />
     <ShellUISafelistEntry Include="w-[100px]" />
+    <ShellUISafelistEntry Include="w-[1px]" />
     <ShellUISafelistEntry Include="w-[70px]" />
     <ShellUISafelistEntry Include="w-[calc(100%-2rem)]" />
+    <ShellUISafelistEntry Include="w-auto" />
     <ShellUISafelistEntry Include="w-fit" />
     <ShellUISafelistEntry Include="w-full" />
     <ShellUISafelistEntry Include="w-max" />
     <ShellUISafelistEntry Include="w-px" />
     <ShellUISafelistEntry Include="whitespace-nowrap" />
     <ShellUISafelistEntry Include="whitespace-pre-line" />
+    <ShellUISafelistEntry Include="width:" />
     <ShellUISafelistEntry Include="z-10" />
     <ShellUISafelistEntry Include="z-40" />
     <ShellUISafelistEntry Include="z-50" />
diff --git a/src/ShellUI.Components/wwwroot/shellui-classes.txt b/src/ShellUI.Components/wwwroot/shellui-classes.txt
index f671aa4..0ec99c4 100644
--- a/src/ShellUI.Components/wwwroot/shellui-classes.txt
+++ b/src/ShellUI.Components/wwwroot/shellui-classes.txt
@@ -1,61 +1,116 @@
+active:scale-[0.98]
+after:-inset-2
+after:absolute
+after:md:hidden
 align-middle
 animate-bounce
 animate-in
+animate-pulse
 animate-spin
 appearance-none
 aspect-square
+backdrop-blur
 backdrop-blur-md
 backdrop-blur-sm
+bars-vertical
 bg-accent
+bg-accent/30
+bg-accent/50
 bg-background
 bg-background/80
 bg-background/95
 bg-black/50
 bg-black/80
 bg-blue-500
+bg-blue-500/20
 bg-border
 bg-card
 bg-current
 bg-destructive
+bg-emerald-500/10
+bg-green-50
 bg-green-500
+bg-green-500/20
+bg-input
 bg-muted
+bg-muted-foreground
 bg-muted/30
 bg-muted/40
 bg-popover
 bg-primary
+bg-primary/10
+bg-red-500/10
 bg-secondary
 bg-sidebar
+bg-sidebar-accent
+bg-sidebar-border
 bg-sidebar-primary
 bg-transparent
+bg-white/10
+bg-yellow-50
 bg-yellow-500
+bg-yellow-500/20
 border-0
+border-2
 border-b
 border-border
 border-border/40
+border-dashed
 border-destructive
+border-green-500
 border-input
 border-l
+border-muted
+border-primary
 border-r
+border-ring
+border-sidebar-border
 border-t
 border-transparent
+border-yellow-500
 bottom-0
 bottom-4
 bottom-full
+bottom-left
+bottom-right
+break-words
 caption-bottom
 cursor-default
+cursor-not-allowed
 cursor-pointer
+dark:bg-blue-900/30
+dark:bg-green-900/20
+dark:bg-green-900/30
+dark:bg-yellow-900/20
+dark:bg-yellow-900/30
+dark:text-blue-100
+dark:text-emerald-400
+dark:text-green-100
+dark:text-red-400
+dark:text-yellow-100
+data-[disabled]:opacity-50
+data-[disabled]:pointer-events-none
 data-[selected]:bg-accent
 data-[selected]:text-accent-foreground
 data-[state=closed]:animate-out
 data-[state=closed]:duration-300
 data-[state=closed]:fade-out-0
+data-[state=closed]:slide-out-to-left-1/2
+data-[state=closed]:slide-out-to-top-[48%]
+data-[state=closed]:zoom-out-95
 data-[state=open]:animate-in
 data-[state=open]:bg-accent
 data-[state=open]:duration-500
 data-[state=open]:fade-in-0
 data-[state=open]:grid-rows-[1fr]
+data-[state=open]:opacity-100
+data-[state=open]:slide-in-from-left-1/2
+data-[state=open]:slide-in-from-top-[48%]
 data-[state=open]:text-muted-foreground
+data-[state=open]:zoom-in-95
+data-[state=selected]:bg-muted
 disabled:cursor-not-allowed
+disabled:opacity-40
 disabled:opacity-50
 disabled:pointer-events-none
 duration-150
@@ -63,13 +118,23 @@ duration-200
 duration-300
 ease-[cubic-bezier(0.4,0,0.2,1)]
 ease-in-out
+ease-linear
 ease-out
 fa-bell
+fa-book
+fa-bullhorn
 fa-chevron-right
 fa-circle-check
 fa-circle-plus
+fa-code
 fa-credit-card
 fa-ellipsis
+fa-gear
+fa-life-ring
+fa-location-dot
+fa-microchip
+fa-paper-plane
+fa-pen-ruler
 fa-right-from-bracket
 fa-solid
 fa-sort
@@ -87,6 +152,7 @@ flex-1
 flex-col
 flex-col-reverse
 flex-row
+flex-row-reverse
 flex-shrink-0
 flex-wrap
 focus-visible:[&::-moz-range-thumb]:ring-2
@@ -100,14 +166,23 @@ focus-visible:ring-1
 focus-visible:ring-2
 focus-visible:ring-destructive
 focus-visible:ring-offset-2
+focus-visible:ring-offset-background
 focus-visible:ring-ring
+focus-within:ring-2
+focus-within:ring-offset-2
+focus-within:ring-ring
 focus:bg-accent
+focus:bg-destructive/10
+focus:bg-primary
+focus:border-ring
 focus:outline-none
 focus:ring-1
 focus:ring-2
 focus:ring-offset-2
 focus:ring-ring
 focus:text-accent-foreground
+focus:text-destructive
+focus:text-primary-foreground
 font-bold
 font-medium
 font-mono
@@ -126,21 +201,37 @@ grid-cols-3
 grid-cols-5
 grid-cols-7
 grid-rows-[0fr]
+group-content
+group-data-[collapsible=icon]:!bg-sidebar-primary
 group-data-[collapsible=icon]:!flex
 group-data-[collapsible=icon]:!items-center
 group-data-[collapsible=icon]:!justify-center
 group-data-[collapsible=icon]:!p-0
 group-data-[collapsible=icon]:!rounded-full
 group-data-[collapsible=icon]:!size-8
+group-data-[collapsible=icon]:-mt-8
 group-data-[collapsible=icon]:hidden
+group-data-[collapsible=icon]:opacity-0
+group-data-[collapsible=icon]:overflow-hidden
+group-data-[collapsible=icon]:text-sidebar-primary-foreground
+group-data-[collapsible=offcanvas]:after:left-full
+group-data-[collapsible=offcanvas]:hover:bg-sidebar
+group-data-[collapsible=offcanvas]:translate-x-0
+group-data-[side=right]:group-data-[collapsible=offcanvas]:-translate-x-full
 group-data-[variant=floating]:border
 group-data-[variant=floating]:border-sidebar-border
 group-data-[variant=floating]:rounded-lg
 group-data-[variant=floating]:shadow
 group-first:top-3.5
+group-focus-within/menu-item:opacity-100
+group-hover/menu-item:opacity-100
+group-hover:scale-105
+group-label
 group-last:bottom-auto
 group-last:h-3.5
 group-only:hidden
+group/menu-item
+group/sidebar-wrapper
 h-1.5
 h-1/2
 h-10
@@ -155,28 +246,40 @@ h-3
 h-3.5
 h-4
 h-5
+h-6
 h-7
 h-8
 h-9
+h-[1px]
 h-full
 h-px
+h-svh
+h1v1h-1z
+has-[[data-variant=inset]]:bg-sidebar
 hover:bg-accent
 hover:bg-accent/50
 hover:bg-blue-600
+hover:bg-destructive/10
 hover:bg-destructive/80
 hover:bg-destructive/90
 hover:bg-green-600
 hover:bg-muted
+hover:bg-muted/50
+hover:bg-primary
 hover:bg-primary/80
 hover:bg-primary/90
 hover:bg-secondary/80
 hover:bg-sidebar-accent
+hover:bg-white/20
 hover:bg-yellow-600
+hover:border-border
+hover:border-primary/50
 hover:opacity-100
 hover:text-accent-foreground
 hover:text-destructive
 hover:text-foreground
 hover:text-muted-foreground
+hover:text-primary-foreground
 hover:text-sidebar-accent-foreground
 hover:underline
 inline-block
@@ -186,23 +289,34 @@ inset-x-0
 inset-y-0
 items-baseline
 items-center
+items-end
 items-start
 justify-between
 justify-center
 justify-end
+last:border-b-0
+last:pb-0
 leading-none
+leading-relaxed
 leading-tight
 left-0
 left-1/2
 left-2
 left-3.5
+left-[50%]
+left-full
 lg:space-x-8
 list-none
 max-h-48
 max-h-60
+max-h-[300px]
 max-h-[90vh]
 max-h-[min(360px,55vh)]
+max-h-screen
+max-w-[80%]
 max-w-[90vw]
+max-w-lg
+max-w-max
 max-w-sm
 max-w-xl
 mb-1
@@ -210,18 +324,35 @@ mb-2
 mb-4
 mb-6
 md:block
+md:flex
+md:max-w-[420px]
+md:opacity-0
+md:peer-data-[variant=inset]:m-2
+md:peer-data-[variant=inset]:ml-0
+md:peer-data-[variant=inset]:rounded-xl
+md:peer-data-[variant=inset]:shadow
+menu-action
+menu-badge
+menu-button
+menu-item
+menu-sub
+menu-sub-button
+menu-sub-item
 min-h-0
 min-h-10
 min-h-7
 min-h-8
 min-h-[80px]
+min-h-svh
 min-w-0
 min-w-24
 min-w-5
 min-w-8
+min-w-[12rem]
 min-w-[640px]
 min-w-[8rem]
 ml-1
+ml-2
 ml-4
 ml-auto
 motion-reduce:animate-none
@@ -230,25 +361,31 @@ mr-2
 mr-3
 mt-0.5
 mt-1
+mt-10
 mt-2
 mt-4
 mt-6
 mt-8
 mt-auto
+mx-2
+mx-3.5
 mx-auto
 my-1
 object-contain
 object-cover
+opacity-0
 opacity-25
 opacity-50
 opacity-70
 opacity-75
 opacity-90
+opacity:.12
 origin-top-right
 outline-none
 overflow-auto
 overflow-hidden
 overflow-x-auto
+overflow-x-hidden
 overflow-y-auto
 overscroll-contain
 p-0.5
@@ -258,25 +395,35 @@ p-2
 p-3
 p-4
 p-6
+p-8
 p-[3px]
 pb-0.5
 pb-1
 pb-4
+pb-8
+peer-data-[active=true]/menu-button:text-sidebar-accent-foreground
+peer-data-[variant=inset]:min-h-[calc(100svh-1rem)]
 peer-disabled:cursor-not-allowed
 peer-disabled:opacity-70
+peer-hover/menu-button:text-sidebar-accent-foreground
 peer/menu-button
 pl-2
+pl-2.5
 pl-3
 pl-4
+pl-8
 placeholder:text-muted-foreground
 pointer-events-auto
 pointer-events-none
 pr-2
+pr-2.5
 pr-3
 pr-6
 pr-8
+pr-9
 pt-0
 pt-3
+pt-6
 px-1
 px-1.5
 px-2
@@ -289,6 +436,7 @@ py-0.5
 py-1
 py-1.5
 py-10
+py-12
 py-2
 py-3
 py-4
@@ -298,14 +446,24 @@ right-0
 right-1
 right-2
 right-4
+right-full
+ring-0
+ring-2
+ring-4
+ring-offset-2
 ring-offset-background
+ring-primary/20
+ring-ring
 ring-sidebar-ring
+rotate-180
+rotate-90
 rounded-[2px]
 rounded-full
 rounded-lg
 rounded-md
 rounded-sm
 rounded-xl
+scale-[1.02]
 select-none
 shadow-2xl
 shadow-lg
@@ -319,6 +477,7 @@ shellui-chart-tooltip-marker
 shellui-chart-tooltip-row
 shellui-chart-tooltip-title
 shellui-chart-tooltip-value
+shellui-loading
 shrink-0
 size-4
 size-8
@@ -328,40 +487,61 @@ slide-in-from-left
 slide-in-from-right
 slide-in-from-top
 slide-in-from-top-2
+sm:flex-col
 sm:flex-row
+sm:gap-2.5
 sm:inline
 sm:inline-flex
 sm:items-center
 sm:justify-between
+sm:justify-end
 sm:max-w-sm
+sm:pl-2.5
+sm:pr-2.5
+sm:px-4
+sm:rounded-lg
+sm:space-x-2
 sm:space-x-6
 sm:text-left
 space-x-1
 space-x-2
+space-x-4
 space-y-0.5
+space-y-1.5
 space-y-2
 space-y-4
+space-y-6
 sr-only
 starting:opacity-0
 starting:scale-95
+supports-[backdrop-filter]:bg-background/60
 tabular-nums
 text-2xl
 text-[10px]
+text-[11px]
 text-[8px]
 text-accent-foreground
+text-base
+text-blue-700
 text-card-foreground
 text-center
+text-destructive
 text-destructive-foreground
+text-emerald-600
 text-foreground
 text-foreground/70
+text-green-700
+text-green-900
 text-left
 text-lg
 text-muted-foreground
 text-popover-foreground
 text-primary
 text-primary-foreground
+text-red-600
 text-right
 text-secondary-foreground
+text-sidebar-accent-foreground
 text-sidebar-foreground
 text-sidebar-foreground/70
 text-sidebar-primary-foreground
@@ -369,27 +549,44 @@ text-sm
 text-white
 text-xl
 text-xs
+text-yellow-800
+text-yellow-900
 top-0
 top-2
 top-4
 top-8
 top-[15vh]
+top-[1px]
+top-[50%]
 top-full
+top-right
+touch-none
 tracking-tight
 transition-[grid-template-rows]
+transition-[left,right,width]
 transition-[width,height,padding]
+transition-[width]
 transition-all
 transition-colors
 transition-opacity
 transition-transform
+translate-x-0
+translate-x-5
+translate-x-[-50%]
+translate-x-px
+translate-y-[-50%]
 underline-offset-4
 var(--border
 var(--muted
+var(--sidebar-width
+var(--sidebar-width-icon
 w-1.5
 w-1/2
 w-10
+w-11
 w-12
 w-16
+w-2
 w-2.5
 w-2/5
 w-3
@@ -398,19 +595,24 @@ w-3/4
 w-4
 w-5
 w-56
+w-6
 w-64
 w-7
+w-72
 w-8
 w-9
 w-[100px]
+w-[1px]
 w-[70px]
 w-[calc(100%-2rem)]
+w-auto
 w-fit
 w-full
 w-max
 w-px
 whitespace-nowrap
 whitespace-pre-line
+width:
 z-10
 z-40
 z-50
diff --git a/src/ShellUI.Core/ShellUI.Core.csproj b/src/ShellUI.Core/ShellUI.Core.csproj
index 5149b5e..6e0baaa 100644
--- a/src/ShellUI.Core/ShellUI.Core.csproj
+++ b/src/ShellUI.Core/ShellUI.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <!-- Internal library — consumed only by ShellUI.CLI. Not published to NuGet. -->
diff --git a/src/ShellUI.Templates/README.md b/src/ShellUI.Templates/README.md
index 886828e..25e7020 100644
--- a/src/ShellUI.Templates/README.md
+++ b/src/ShellUI.Templates/README.md
@@ -4,7 +4,7 @@
 
 ## Packaging status
 
-This project targets .NET 10.
+This project targets .NET 8 and .NET 10.
 
 `ShellUI.Templates` sets `IsPackable` to `false` and is not published to NuGet. Do not run `dotnet add package ShellUI.Templates`. The only packable ShellUI projects are:
 
diff --git a/src/ShellUI.Templates/ShellUI.Templates.csproj b/src/ShellUI.Templates/ShellUI.Templates.csproj
index 801406e..e9b7806 100644
--- a/src/ShellUI.Templates/ShellUI.Templates.csproj
+++ b/src/ShellUI.Templates/ShellUI.Templates.csproj
@@ -5,7 +5,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     
diff --git a/src/ShellUI.Templates/Templates/ContextMenuModelsTemplate.cs b/src/ShellUI.Templates/Templates/ContextMenuModelsTemplate.cs
index b6ddd61..fadf756 100644
--- a/src/ShellUI.Templates/Templates/ContextMenuModelsTemplate.cs
+++ b/src/ShellUI.Templates/Templates/ContextMenuModelsTemplate.cs
@@ -23,6 +23,7 @@ public class ContextMenuItem
     public string? Icon { get; set; }
     public string? Shortcut { get; set; }
     public bool Disabled { get; set; }
+    public bool Destructive { get; set; }
     public bool IsSeparator { get; set; }
     public object? Data { get; set; }
 }
diff --git a/src/ShellUI.Templates/Templates/ContextMenuOptionTemplate.cs b/src/ShellUI.Templates/Templates/ContextMenuOptionTemplate.cs
index 1c6e34a..80e12ad 100644
--- a/src/ShellUI.Templates/Templates/ContextMenuOptionTemplate.cs
+++ b/src/ShellUI.Templates/Templates/ContextMenuOptionTemplate.cs
@@ -25,13 +25,13 @@ public static class ContextMenuOptionTemplate
 else
 {
     <button type=""button""
-            class=""relative flex w-full cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50""
+            class=""@Shell.Cn(""relative flex w-full cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50"", Destructive ? ""text-destructive hover:bg-destructive/10 hover:text-destructive focus:bg-destructive/10 focus:text-destructive"" : null)""
             disabled=""@Disabled""
             @onclick=""HandleClick""
             @attributes=""AdditionalAttributes"">
         @if (IconContent != null)
         {
-            <span class=""mr-2 flex shrink-0 items-center justify-center text-muted-foreground"" style=""width: 0.875rem; height: 0.875rem;"">@IconContent</span>
+            <span class=""mr-2 flex shrink-0 items-center justify-center @(Destructive ? ""text-destructive"" : ""text-muted-foreground"")"" style=""width: 0.875rem; height: 0.875rem;"">@IconContent</span>
         }
         <span class=""flex-1"">@ChildContent</span>
         @if (!string.IsNullOrEmpty(Shortcut))
@@ -47,6 +47,7 @@ public static class ContextMenuOptionTemplate
     [Parameter] public RenderFragment? IconContent { get; set; }
     [Parameter] public string? Shortcut { get; set; }
     [Parameter] public bool Disabled { get; set; }
+    [Parameter] public bool Destructive { get; set; }
     [Parameter] public bool IsSeparator { get; set; }
     [Parameter] public string? Value { get; set; }
     [Parameter] public EventCallback OnClick { get; set; }
diff --git a/src/ShellUI.Templates/Templates/ContextMenuTemplate.cs b/src/ShellUI.Templates/Templates/ContextMenuTemplate.cs
index 6ebf69f..c66c85d 100644
--- a/src/ShellUI.Templates/Templates/ContextMenuTemplate.cs
+++ b/src/ShellUI.Templates/Templates/ContextMenuTemplate.cs
@@ -42,12 +42,12 @@ @using YourProjectNamespace.Components.Models
                         }
                         else
                         {
-                            <button class=""relative flex w-full cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50""
+                            <button class=""@Shell.Cn(""relative flex w-full cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50"", item.Destructive ? ""text-destructive hover:bg-destructive/10 hover:text-destructive focus:bg-destructive/10 focus:text-destructive"" : null)""
                                     disabled=""@item.Disabled""
                                     @onclick=""() => SelectItem(item)"">
                                 @if (!string.IsNullOrEmpty(item.Icon))
                                 {
-                                    <span class=""mr-2 flex shrink-0 items-center justify-center text-muted-foreground"" style=""width: 0.875rem; height: 0.875rem;"">@((MarkupString)item.Icon)</span>
+                                    <span class=""mr-2 flex shrink-0 items-center justify-center @(item.Destructive ? ""text-destructive"" : ""text-muted-foreground"")"" style=""width: 0.875rem; height: 0.875rem;"">@((MarkupString)item.Icon)</span>
                                 }
                                 <span class=""flex-1"">@item.Label</span>
                                 @if (!string.IsNullOrEmpty(item.Shortcut))
diff --git a/src/ShellUI.Templates/Templates/SonnerServiceTemplate.cs b/src/ShellUI.Templates/Templates/SonnerServiceTemplate.cs
index 1df6ea9..4cbd911 100644
--- a/src/ShellUI.Templates/Templates/SonnerServiceTemplate.cs
+++ b/src/ShellUI.Templates/Templates/SonnerServiceTemplate.cs
@@ -26,6 +26,7 @@ public class SonnerToastItem
     // Zero or negative disables auto-dismiss (toast stays until manually closed).
     public TimeSpan Duration { get; set; } = TimeSpan.FromSeconds(4);
     public DateTime CreatedAt { get; } = DateTime.UtcNow;
+    public bool Dismissing { get; internal set; }
 }
 
 public interface ISonnerService
@@ -37,6 +38,7 @@ public interface ISonnerService
     void Info(string message, string? description = null, TimeSpan? duration = null);
     void Warning(string message, string? description = null, TimeSpan? duration = null);
     void Remove(string id);
+    void Clear();
 }
 
 public class SonnerService : ISonnerService
@@ -75,10 +77,23 @@ public void Info(string message, string? description = null, TimeSpan? duration
     public void Warning(string message, string? description = null, TimeSpan? duration = null)
         => Show(message, description, ""warning"", duration);
 
-    public void Remove(string id)
+    // Matches the toast's duration-300 transition, so the fade finishes before removal.
+    private static readonly TimeSpan ExitDuration = TimeSpan.FromMilliseconds(300);
+
+    public void Remove(string id) => _ = DismissAsync(_toasts.Where(t => t.Id == id).ToList());
+
+    public void Clear() => _ = DismissAsync(_toasts.ToList());
+
+    private async Task DismissAsync(List<SonnerToastItem> toasts)
     {
-        var removed = _toasts.RemoveAll(t => t.Id == id);
-        if (removed > 0) OnChange?.Invoke();
+        toasts.RemoveAll(t => t.Dismissing);
+        if (toasts.Count == 0) return;
+        foreach (var toast in toasts) toast.Dismissing = true;
+        OnChange?.Invoke();
+
+        try { await Task.Delay(ExitDuration); } catch { }
+        foreach (var toast in toasts) _toasts.Remove(toast);
+        OnChange?.Invoke();
     }
 
     private async Task AutoDismissAsync(string id, TimeSpan delay)
diff --git a/src/ShellUI.Templates/Templates/SonnerTemplate.cs b/src/ShellUI.Templates/Templates/SonnerTemplate.cs
index 556e71c..4c8ca8a 100644
--- a/src/ShellUI.Templates/Templates/SonnerTemplate.cs
+++ b/src/ShellUI.Templates/Templates/SonnerTemplate.cs
@@ -32,7 +32,7 @@ @inject SonnerService SonnerService
         var stackClass = i > 0 ? (IsTop ? ""-mt-20 group-hover:mt-0"" : ""-mb-20 group-hover:mb-0"") : """";
         <div @key=""toast.Id""
              style=""z-index: @(i + 1)""
-             class=""@stackClass @GetToastClasses(toast.Variant) pointer-events-auto relative flex min-w-0 w-full items-center gap-3 overflow-hidden rounded-lg p-4 shadow-lg transition-all duration-300 motion-reduce:transition-none animate-in fade-in-0 motion-reduce:animate-none @SonnerVariants.GetToastAnimation(Position) shrink-0"">
+             class=""@stackClass @GetToastClasses(toast.Variant) relative flex min-w-0 w-full items-center gap-3 overflow-hidden rounded-lg p-4 shadow-lg transition-all duration-300 motion-reduce:transition-none animate-in fade-in-0 motion-reduce:animate-none @SonnerVariants.GetToastAnimation(Position) shrink-0 @(toast.Dismissing ? ""opacity-0 pointer-events-none"" : ""pointer-events-auto"")"">
             <div class=""grid flex-1 gap-1"">
                 @if (!string.IsNullOrEmpty(toast.Message))
                 {
diff --git a/tools/ShellUI.SafelistGenerator/Program.cs b/tools/ShellUI.SafelistGenerator/Program.cs
index 1ad88ea..c19d33c 100644
--- a/tools/ShellUI.SafelistGenerator/Program.cs
+++ b/tools/ShellUI.SafelistGenerator/Program.cs
@@ -64,6 +64,7 @@ public static SortedSet<string> GenerateSafelist(IEnumerable<string> sourceFileP
             if (file.EndsWith(".razor", StringComparison.OrdinalIgnoreCase))
             {
                 ExtractClasses(text, classes);
+                ExtractFromRazorExpressions(text, classes);
             }
             else if (file.EndsWith(".cs", StringComparison.OrdinalIgnoreCase))
             {
@@ -86,7 +87,7 @@ private static void ExtractFromCSharp(string content, SortedSet<string> sink)
 
     private static bool LooksLikeClassList(string s)
     {
-        if (s.Length == 0 || s.Length > 500) return false;
+        if (s.Length == 0 || s.Length > 2000) return false;
         // `=` outside `[…]` implies key=value pairs, not class strings.
         if (s.Contains("://") || s.Contains('<') || s.Contains('>') || s.Contains('{')
             || s.Contains(';') || s.Contains('=') && !s.Contains('[')
@@ -151,6 +152,20 @@ private static string XmlEscape(string s)
         "class\\s*=\\s*\"(?<value>[^\"]*)\"",
         RegexOptions.Compiled);
 
+    // Shell.Cn arguments, ternaries and switch arms, which the class attribute regex cuts off at their first quote.
+    private static readonly Regex RazorExpressionLiteralRegex = new(
+        "(?<=[(,?:=>]\\s*)\"(?<lit>[^\"@]*)\"",
+        RegexOptions.Compiled);
+
+    private static void ExtractFromRazorExpressions(string content, SortedSet<string> sink)
+    {
+        foreach (Match lit in RazorExpressionLiteralRegex.Matches(content))
+        {
+            var value = lit.Groups["lit"].Value;
+            if (LooksLikeClassList(value)) HarvestTokens(value, sink);
+        }
+    }
+
     private static readonly Regex StringLiteralRegex = new(
         "\"(?<lit>[^\"]*)\"",
         RegexOptions.Compiled);
diff --git a/tools/ShellUI.SafelistGenerator/ShellUI.SafelistGenerator.csproj b/tools/ShellUI.SafelistGenerator/ShellUI.SafelistGenerator.csproj
index 81ec651..f1c0252 100644
--- a/tools/ShellUI.SafelistGenerator/ShellUI.SafelistGenerator.csproj
+++ b/tools/ShellUI.SafelistGenerator/ShellUI.SafelistGenerator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>