From dd40cfa35826fd71adbb46c2738efe5dbc92b29e Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Tue, 29 Sep 2026 08:26:06 +0200
Subject: [PATCH 1/6] feat(ci): initialize Blazor dashboard layout and validate
 component structure

- Added steps to the CI workflow for initializing a Blazor application with a dashboard layout.
- Implemented checks to ensure the correct removal of default layouts and the addition of necessary components in the application structure.
- Enhanced the build process to validate the integration of the new dashboard layout and sidebar links.
---
 .github/workflows/ci.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 424ba64..b9857ab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -134,6 +134,19 @@ jobs:
 
         dotnet build -c Debug
 
+        # init --dashboard wires the layout: Routes default, stock MainLayout/NavMenu removed,
+        # error bar moved to App.razor, sidebar links built from the app's pages.
+        cd "$TMPDIR/app"
+        dotnet new blazor -o DashApp --no-restore
+        cd DashApp
+        shellui init --tailwind standalone --yes --dashboard 02
+        grep -q 'typeof(Layout.DashboardLayout02)' Components/Routes.razor || (echo "init --dashboard 02 did not switch Routes.razor"; exit 1)
+        test ! -e Components/Layout/MainLayout.razor || (echo "stock MainLayout.razor was not removed"; exit 1)
+        test ! -e Components/Layout/NavMenu.razor || (echo "stock NavMenu.razor was not removed"; exit 1)
+        grep -q 'id="blazor-error-ui"' Components/App.razor || (echo "the error bar was not added to App.razor"; exit 1)
+        grep -q '"/counter"' Components/UI/AppSidebar.razor || (echo "AppSidebar links were not built from the pages"; exit 1)
+        dotnet build -c Debug
+
         # Every direct target must install and compile together; this catches missing
         # dependencies and template compile errors that per-template tests can't see.
         ALL=$(python3 - "$GITHUB_WORKSPACE" <<'PY'

From 0a41bcec8a60f2f984c0d93c2600624602abb3c4 Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Tue, 29 Sep 2026 08:26:26 +0200
Subject: [PATCH 2/6] feat(cli): enhance CLI syntax for dashboard layout and
 component management

- Added options for `--dashboard` and `--replace-layout` to `shellui init` and `shellui add` commands, allowing users to specify dashboard layouts during initialization and component addition.
- Updated documentation to reflect new command options and their functionalities, including details on dashboard layout configurations and the impact on existing layouts.
- Improved the initialization process to handle Bootstrap removal and restyling of sample pages with Tailwind classes, ensuring a smoother setup experience for users.
---
 docs/CLI_SYNTAX.md | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/docs/CLI_SYNTAX.md b/docs/CLI_SYNTAX.md
index f9138c3..70338df 100644
--- a/docs/CLI_SYNTAX.md
+++ b/docs/CLI_SYNTAX.md
@@ -16,12 +16,12 @@ shellui --version
 ## Command overview
 
 ```text
-shellui init [--force] [--style <style>] [--tailwind standalone|npm] [--yes]
-shellui add <name...> [--force]
+shellui init [--force] [--style <style>] [--tailwind standalone|npm] [--yes] [--dashboard 01|02|none] [--replace-layout]
+shellui add <name...> [--force] [--replace-layout]
 shellui list [--installed|--available]
 shellui remove <name...>
 shellui update [name...] [--all]
-shellui theme init <url-or-id> [--force] [--style <style>] [--tailwind standalone|npm] [--yes]
+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
 ```
@@ -37,6 +37,7 @@ shellui init
 shellui init --force
 shellui init --style new-york
 shellui init --tailwind npm --yes
+shellui init --yes --dashboard 02
 ```
 
 Options:
@@ -45,6 +46,8 @@ Options:
 - `--style <style>` selects `default`, `new-york`, or `minimal`.
 - `--tailwind standalone|npm` selects the Tailwind setup method.
 - `--yes` runs without prompts and uses the selected defaults. Without an explicit method, the default is `standalone`.
+- `--dashboard 01|02|none` sets up a dashboard layout: `02` has a sticky header, `01` a scrolling one. Without the option, `init` asks; with `--yes` alone, no dashboard is added.
+- `--replace-layout` makes the dashboard the default layout even when the app already uses a custom layout. See [Dashboard layouts](#dashboard-layouts).
 
 Initialization creates or updates:
 
@@ -58,6 +61,10 @@ Initialization creates or updates:
 
 `Components/Layout/` is created when a layout target is installed.
 
+`init` removes the template's local Bootstrap copy (`wwwroot/lib/bootstrap` or, on .NET 8, `wwwroot/bootstrap`) and its `<link>` in `App.razor`; Bootstrap loaded from a CDN is left alone. The sample pages (`Home`, `Counter`, `Weather`, `Error`, `NotFound`, `Auth`) are restyled with Tailwind classes when they are unchanged from `dotnet new blazor`. Pages you have edited are kept, and `init` lists any that still use Bootstrap classes. Identity pages under `Account/` are counted but not restyled.
+
+With `--dashboard`, `init` then runs `shellui add dashboard-0x`, including the layout wiring described under [Dashboard layouts](#dashboard-layouts).
+
 Standalone mode stores the Tailwind executable in `.shellui/bin/`. npm mode installs `tailwindcss@^4.3.2` and `@tailwindcss/cli@^4.3.2` and requires Node.js and npm. The current CLI invokes npm through `cmd`; use standalone mode on non-Windows systems or run npm manually.
 
 ## `add`
@@ -76,6 +83,20 @@ shellui add button --force
 
 `--force` overwrites an existing component file. Dependencies are installed automatically; there is no separate dependency option.
 
+### Dashboard layouts
+
+`shellui add dashboard-01` and `shellui add dashboard-02`, and `init --dashboard`, also wire the layout into the app:
+
+- `Routes.razor` gets `DefaultLayout="typeof(Layout.DashboardLayout02)"`. Switching between the two dashboards is automatic.
+- If the app uses a custom layout, or a `MainLayout` that was modified, the CLI asks before switching. Without a terminal it leaves the layout alone and prints a hint; pass `--replace-layout` to switch anyway.
+- The stock `MainLayout` and `NavMenu` files (and their `.razor.css`) are deleted only when they are byte-identical to `dotnet new blazor` output for .NET 8, 9 or 10 and nothing else references them. Modified files are kept with a warning.
+- Pages that pin `@layout MainLayout`, such as the .NET 10 `NotFound` page, move to the dashboard layout.
+- The Blazor error bar (`blazor-error-ui`) moves from `MainLayout` into `App.razor`.
+- `AppSidebar` links are built from the app's `@page` routes. Parameterized routes, `/Account/*`, `/Error` and `/not-found` are skipped. Links you have edited are left alone.
+- `ReconnectModal` and pages are not changed otherwise.
+
+Running the command again is safe. It prints a summary of what changed.
+
 ## `list`
 
 Lists the direct targets and their installation status.

From 18685607b5522e247b10b5ae72a9e8be8809e870 Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Tue, 29 Sep 2026 08:29:42 +0200
Subject: [PATCH 3/6] feat(cli): enhance CLI with dashboard layout options and
 improved initialization

- Added `--dashboard` and `--replace-layout` options to `shellui init` and `shellui add` commands for better dashboard layout management.
- Updated the initialization process to set console output encoding to UTF-8 for improved character display.
- Enhanced the `InitService` to prompt for dashboard layout selection during initialization.
- Introduced a new `DashboardSetup` service to manage dashboard layout configurations and updates.
- Implemented a custom loading spinner for better user experience during CLI operations.
- Refactored component installation logic to accommodate new layout options and ensure proper integration with existing components.
---
 src/ShellUI.CLI/Program.cs                    |  60 ++-
 .../Services/ComponentInstaller.cs            |  38 +-
 src/ShellUI.CLI/Services/ComponentManager.cs  |  82 ++--
 src/ShellUI.CLI/Services/DashboardSetup.cs    | 402 ++++++++++++++++++
 src/ShellUI.CLI/Services/InitService.cs       | 115 ++---
 src/ShellUI.CLI/Services/Loaders.cs           | 119 ++++++
 src/ShellUI.CLI/Services/StockPages.cs        | 140 ++++++
 7 files changed, 829 insertions(+), 127 deletions(-)
 create mode 100644 src/ShellUI.CLI/Services/DashboardSetup.cs
 create mode 100644 src/ShellUI.CLI/Services/Loaders.cs
 create mode 100644 src/ShellUI.CLI/Services/StockPages.cs

diff --git a/src/ShellUI.CLI/Program.cs b/src/ShellUI.CLI/Program.cs
index 8cf3bfa..fd139e9 100644
--- a/src/ShellUI.CLI/Program.cs
+++ b/src/ShellUI.CLI/Program.cs
@@ -10,6 +10,10 @@ class Program
 {
     static async Task<int> Main(string[] args)
     {
+        // Windows consoles default to the OEM code page, so Spectre would fall back to ASCII
+        // spinners and print ✅ as "?". Must run before AnsiConsole is first used.
+        try { Console.OutputEncoding = System.Text.Encoding.UTF8; } catch (IOException) { }
+
         var rootCommand = new RootCommand("ShellUI - CLI-first Blazor component library")
         {
             Description = "Add beautiful, accessible components to your Blazor app. Inspired by shadcn/ui."
@@ -48,17 +52,22 @@ static Command CreateThemeInitCommand()
         var tailwindOpt = new Option<string>("--tailwind", getDefaultValue: () => "standalone",
             "Tailwind method: standalone, npm");
         var yesOpt = new Option<bool>("--yes", "Non-interactive mode with default options");
+        var dashboardOpt = CreateDashboardOption();
+        var replaceLayoutOpt = CreateReplaceLayoutOption();
         command.AddOption(forceOpt);
         command.AddOption(styleOpt);
         command.AddOption(tailwindOpt);
         command.AddOption(yesOpt);
+        command.AddOption(dashboardOpt);
+        command.AddOption(replaceLayoutOpt);
 
-        command.SetHandler(async (url, force, style, tailwind, nonInteractive) =>
+        command.SetHandler(async (url, force, style, tailwind, nonInteractive, dashboard, replaceLayout) =>
         {
             try
             {
                 AnsiConsole.MarkupLine("[cyan]Step 1/2:[/] initializing ShellUI…");
-                await InitService.InitializeAsync(style, force, tailwind, nonInteractive);
+                await InitService.InitializeAsync(style, force, tailwind, nonInteractive, dashboard,
+                    replaceLayout ? LayoutSwitch.Always : LayoutSwitch.Ask);
                 AnsiConsole.MarkupLine("");
                 AnsiConsole.MarkupLine("[cyan]Step 2/2:[/] applying tweakcn theme…");
                 await ApplyThemeAsync(url, emitOverride: null);
@@ -68,11 +77,19 @@ static Command CreateThemeInitCommand()
                 AnsiConsole.MarkupLine($"[red]Error:[/] {ex.Message.Replace("[", "[[").Replace("]", "]]")}");
                 Environment.Exit(1);
             }
-        }, urlArg, forceOpt, styleOpt, tailwindOpt, yesOpt);
+        }, urlArg, forceOpt, styleOpt, tailwindOpt, yesOpt, dashboardOpt, replaceLayoutOpt);
 
         return command;
     }
 
+    static Option<string?> CreateDashboardOption() => new(
+        "--dashboard",
+        "Set up the dashboard layout: 02 (sticky header), 01 (scrolling header) or none. Prompts when omitted; --yes alone means none");
+
+    static Option<bool> CreateReplaceLayoutOption() => new(
+        "--replace-layout",
+        "Make the dashboard the default layout even if the app already has a custom one");
+
     static Command CreateThemeApplyCommand()
     {
         var command = new Command("apply", "Fetch a theme from tweakcn and bake it into wwwroot/input.css");
@@ -134,8 +151,7 @@ private static async Task ApplyThemeAsync(string url, string? emitOverride)
     {
         var cwd = Directory.GetCurrentDirectory();
 
-        AnsiConsole.MarkupLine($"[cyan]Fetching theme:[/] {url.Replace("[", "[[").Replace("]", "]]")}");
-        var json = await ThemeService.FetchThemeJsonAsync(url);
+        var json = await Loaders.SnakeStatus().StartAsync($"Fetching theme: {Markup.Escape(url)}", _ => ThemeService.FetchThemeJsonAsync(url));
         var theme = ThemeService.ParseTheme(json);
         AnsiConsole.MarkupLine($"[green]✓[/] Fetched: [bold]{theme.Name}[/] ({theme.LightVars.Count} light + {theme.DarkVars.Count} dark vars)");
 
@@ -181,33 +197,30 @@ static Command CreateInitCommand()
             "--yes",
             "Run in non-interactive mode with default options");
 
+        var dashboardOption = CreateDashboardOption();
+        var replaceLayoutOption = CreateReplaceLayoutOption();
+
         command.AddOption(forceOption);
         command.AddOption(styleOption);
         command.AddOption(tailwindOption);
         command.AddOption(nonInteractiveOption);
+        command.AddOption(dashboardOption);
+        command.AddOption(replaceLayoutOption);
 
-        command.SetHandler(async (force, style, tailwind, nonInteractive) =>
+        command.SetHandler(async (force, style, tailwind, nonInteractive, dashboard, replaceLayout) =>
         {
             try
             {
-                var logo = @"
- ███████╗██╗  ██╗███████╗██╗     ██╗     ██╗   ██╗██╗
- ██╔════╝██║  ██║██╔════╝██║     ██║     ██║   ██║██║
- ███████╗███████║█████╗  ██║     ██║     ██║   ██║██║
- ╚════██║██╔══██║██╔══╝  ██║     ██║     ██║   ██║██║
- ███████║██║  ██║███████╗███████╗███████╗╚██████╔╝██║
- ╚══════╝╚═╝  ╚═╝╚══════╝╚══════╝╚══════╝ ╚═════╝ ╚═╝
-
-";
-
-                AnsiConsole.Markup($"[blue]{logo}[/]");
-                await InitService.InitializeAsync(style, force, tailwind, nonInteractive);
+                LogoLoader.WriteHeader("Setting up your Blazor project");
+                await InitService.InitializeAsync(style, force, tailwind, nonInteractive, dashboard,
+                    replaceLayout ? LayoutSwitch.Always : LayoutSwitch.Ask);
             }
             catch (Exception ex)
             {
                 AnsiConsole.MarkupLine($"[red]Error:[/] {ex.Message.Replace("[", "[[").Replace("]", "]]")}");
+                Environment.Exit(1);
             }
-        }, forceOption, styleOption, tailwindOption, nonInteractiveOption);
+        }, forceOption, styleOption, tailwindOption, nonInteractiveOption, dashboardOption, replaceLayoutOption);
 
         return command;
     }
@@ -229,11 +242,14 @@ static Command CreateAddCommand()
             "Overwrite existing components");
         command.AddOption(forceOption);
 
-        command.SetHandler(async (components, force) =>
+        var replaceLayoutOption = CreateReplaceLayoutOption();
+        command.AddOption(replaceLayoutOption);
+
+        command.SetHandler(async (components, force, replaceLayout) =>
         {
             try
             {
-                if (!await ComponentInstaller.InstallComponents(components, force))
+                if (!await ComponentInstaller.InstallComponents(components, force, replaceLayout ? LayoutSwitch.Always : LayoutSwitch.Ask))
                     Environment.Exit(1);
             }
             catch (Exception ex)
@@ -241,7 +257,7 @@ static Command CreateAddCommand()
                 AnsiConsole.MarkupLine($"[red]Error:[/] {ex.Message.Replace("[", "[[").Replace("]", "]]")}");
                 Environment.Exit(1);
             }
-        }, componentsArg, forceOption);
+        }, componentsArg, forceOption, replaceLayoutOption);
 
         return command;
     }
diff --git a/src/ShellUI.CLI/Services/ComponentInstaller.cs b/src/ShellUI.CLI/Services/ComponentInstaller.cs
index 30d778b..8ab31f6 100644
--- a/src/ShellUI.CLI/Services/ComponentInstaller.cs
+++ b/src/ShellUI.CLI/Services/ComponentInstaller.cs
@@ -1,6 +1,7 @@
 using ShellUI.Core.Models;
 using ShellUI.Templates;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 using Spectre.Console;
 
 namespace ShellUI.CLI.Services;
@@ -9,7 +10,7 @@ public class ComponentInstaller
 {
     private const string ShellUiJsSidebarApiMarker = "initSidebar: function (handle, dotNetRef)";
 
-    public static async Task<bool> InstallComponents(string[] components, bool force)
+    public static async Task<bool> InstallComponents(string[] components, bool force, LayoutSwitch layoutSwitch = LayoutSwitch.Ask)
     {
         var configPath = Path.Combine(Directory.GetCurrentDirectory(), "shellui.json");
 
@@ -62,9 +63,7 @@ public static async Task<bool> InstallComponents(string[] components, bool force
 
         AnsiConsole.MarkupLine("");
 
-        await AnsiConsole.Status()
-            .Spinner(Spinner.Known.Dots)
-            .SpinnerStyle(Style.Parse("green"))
+        await Loaders.SnakeStatus()
             .StartAsync("Installing components...", ctx =>
             {
                 foreach (var componentName in componentList)
@@ -95,6 +94,11 @@ await AnsiConsole.Status()
 
         EnsureImports(projectInfo, installedSet);
 
+        foreach (var dashboard in componentList.Where(c => DashboardSetup.Layouts.ContainsKey(c) && installedSet.Contains(c)))
+        {
+            await DashboardSetup.WireAsync(dashboard, projectInfo, config, layoutSwitch);
+        }
+
         // Update config
         var updatedJson = JsonSerializer.Serialize(config, new JsonSerializerOptions
         {
@@ -413,14 +417,16 @@ private static async Task<List<NuGetDependency>> InstallNuGetDependenciesAsync(P
     }
 
     // Consumer pages reference helper types such as ButtonVariant and CommandItem, which live in
-    // sub-namespaces; the imports are only added once a file in that namespace exists.
-    public static IEnumerable<string> RequiredImports(string rootNamespace, IEnumerable<string> filePaths)
+    // sub-namespaces; the imports are only added once an installed file declares that namespace.
+    public static IEnumerable<string> RequiredImports(string rootNamespace, IEnumerable<string> templateContents)
     {
-        var paths = filePaths.Select(p => p.Replace('\\', '/')).ToList();
-        if (paths.Any(p => p.StartsWith("Variants/", StringComparison.Ordinal)))
-            yield return $"@using {rootNamespace}.Components.UI.Variants";
-        if (paths.Any(p => p.Contains("Models/", StringComparison.Ordinal)))
-            yield return $"@using {rootNamespace}.Components.Models";
+        var contents = templateContents.ToList();
+        foreach (var ns in new[] { "Components.UI.Variants", "Components.Models" })
+        {
+            var declaration = new Regex($@"^\s*namespace\s+YourProjectNamespace\.{Regex.Escape(ns)}\s*[;{{]", RegexOptions.Multiline);
+            if (contents.Any(c => declaration.IsMatch(c)))
+                yield return $"@using {rootNamespace}.{ns}";
+        }
     }
 
     private static void EnsureImports(ProjectInfo projectInfo, IEnumerable<string> installed)
@@ -431,11 +437,11 @@ private static void EnsureImports(ProjectInfo projectInfo, IEnumerable<string> i
         if (importsPath == null) return;
 
         var existing = File.ReadAllLines(importsPath).Select(l => l.Trim()).ToHashSet();
-        var filePaths = installed
-            .Select(ComponentRegistry.GetMetadata)
-            .Where(m => m != null && !m.IsLayoutBlock)
-            .Select(m => m!.FilePath);
-        var missing = RequiredImports(projectInfo.RootNamespace, filePaths).Where(u => !existing.Contains(u)).ToList();
+        var contents = installed
+            .Where(name => ComponentRegistry.GetMetadata(name) is { IsLayoutBlock: false })
+            .Select(ComponentRegistry.GetComponentContent)
+            .OfType<string>();
+        var missing = RequiredImports(projectInfo.RootNamespace, contents).Where(u => !existing.Contains(u)).ToList();
         if (missing.Count == 0) return;
 
         File.AppendAllText(importsPath, Environment.NewLine + string.Join(Environment.NewLine, missing) + Environment.NewLine);
diff --git a/src/ShellUI.CLI/Services/ComponentManager.cs b/src/ShellUI.CLI/Services/ComponentManager.cs
index 29e0a3c..952a3f1 100644
--- a/src/ShellUI.CLI/Services/ComponentManager.cs
+++ b/src/ShellUI.CLI/Services/ComponentManager.cs
@@ -32,16 +32,20 @@ public static void ListComponents(bool showOnlyInstalled, bool showOnlyAvailable
     {
         var installed = GetInstalledComponents();
         
-        AnsiConsole.Write(new FigletText("ShellUI").Color(Color.Blue));
-        AnsiConsole.MarkupLine("[dim]Available Components[/]\n");
-        
+        LogoLoader.WriteHeader("Components");
+
+        // Narrow terminals wrap every cell into slivers, so drop the widest columns first.
+        var width = AnsiConsole.Profile.Width;
+        var showDescription = width >= 100;
+        var showVersion = width >= 70;
+
         var table = new Table();
         table.Border(TableBorder.Simple);
-        table.AddColumn(new TableColumn("[bold]Component[/]").Centered());
-        table.AddColumn(new TableColumn("[bold]Status[/]").Centered());
-        table.AddColumn(new TableColumn("[bold]Version[/]").Centered());
-        table.AddColumn(new TableColumn("[bold]Category[/]").Centered());
-        table.AddColumn(new TableColumn("[bold]Description[/]"));
+        table.AddColumn(new TableColumn("[bold]Component[/]"));
+        table.AddColumn(new TableColumn("[bold]Status[/]"));
+        if (showVersion) table.AddColumn(new TableColumn("[bold]Version[/]"));
+        table.AddColumn(new TableColumn("[bold]Category[/]"));
+        if (showDescription) table.AddColumn(new TableColumn("[bold]Description[/]"));
 
         int installedCount = 0;
         int availableCount = 0;
@@ -63,13 +67,11 @@ public static void ListComponents(bool showOnlyInstalled, bool showOnlyAvailable
                 ? $"[green]{component.Name}[/]" 
                 : component.Name;
 
-            table.AddRow(
-                componentName,
-                status,
-                $"[dim]{component.Version}[/]",
-                $"[blue]{component.Category}[/]",
-                $"[dim]{component.Description}[/]"
-            );
+            var cells = new List<string> { componentName, status };
+            if (showVersion) cells.Add($"[dim]{component.Version}[/]");
+            cells.Add($"[blue]{component.Category}[/]");
+            if (showDescription) cells.Add($"[dim]{Markup.Escape(component.Description)}[/]");
+            table.AddRow(cells.ToArray());
 
             if (isInstalled) installedCount++;
             else availableCount++;
@@ -79,7 +81,7 @@ public static void ListComponents(bool showOnlyInstalled, bool showOnlyAvailable
         
         AnsiConsole.WriteLine();
         var panel = new Panel(
-            new Markup($"[green]{installedCount} installed[/] | [blue]{availableCount} available[/] | [yellow]{ComponentRegistry.Components.Count} total[/]")
+            new Markup($"[green]{installedCount} installed[/] | [blue]{availableCount} available[/] | [yellow]{ComponentRegistry.Components.Values.Count(c => c.IsAvailable)} total[/]")
         );
         panel.Header = new PanelHeader("[bold]Summary[/]");
         panel.Border = BoxBorder.Rounded;
@@ -185,33 +187,37 @@ public static void UpdateComponents(string[] componentNames, bool updateAll)
         AnsiConsole.Write(new Rule("[blue]Updating Components[/]").RuleStyle("blue dim"));
         AnsiConsole.WriteLine();
 
-        foreach (var componentName in toUpdate)
+        Loaders.SnakeStatus().Start("Updating components...", ctx =>
         {
-            var normalizedName = componentName.ToLower().Replace(",", "").Trim();
-            
-            if (!ComponentRegistry.Components.TryGetValue(normalizedName, out var metadata))
+            foreach (var componentName in toUpdate)
             {
-                AnsiConsole.MarkupLine($"[yellow]Warning:[/] Unknown component '{componentName}'");
-                continue;
-            }
+                var normalizedName = componentName.ToLower().Replace(",", "").Trim();
+                ctx.Status($"Updating {normalizedName}...");
 
-            if (!installed.Contains(normalizedName))
-            {
-                AnsiConsole.MarkupLine($"[yellow]Skipped:[/] Component '{metadata.DisplayName}' is not installed");
-                continue;
-            }
+                if (!ComponentRegistry.Components.TryGetValue(normalizedName, out var metadata))
+                {
+                    AnsiConsole.MarkupLine($"[yellow]Warning:[/] Unknown component '{componentName}'");
+                    continue;
+                }
 
-            if (metadata.Dependencies.Contains("shellui-js") &&
-                !ComponentInstaller.IsShellUiJsCompatible() &&
-                !ComponentInstaller.EnsureShellUiJs())
-            {
-                AnsiConsole.MarkupLine($"[yellow]Skipped:[/] Component '{metadata.DisplayName}' requires a compatible wwwroot/shellui.js.");
-                continue;
-            }
+                if (!installed.Contains(normalizedName))
+                {
+                    AnsiConsole.MarkupLine($"[yellow]Skipped:[/] Component '{metadata.DisplayName}' is not installed");
+                    continue;
+                }
 
-            ComponentInstaller.InstallComponent(normalizedName, metadata, force: true, skipConfig: false);
-            AnsiConsole.MarkupLine($"[green]Updated:[/] {metadata.DisplayName} to v{metadata.Version}");
-        }
+                if (metadata.Dependencies.Contains("shellui-js") &&
+                    !ComponentInstaller.IsShellUiJsCompatible() &&
+                    !ComponentInstaller.EnsureShellUiJs())
+                {
+                    AnsiConsole.MarkupLine($"[yellow]Skipped:[/] Component '{metadata.DisplayName}' requires a compatible wwwroot/shellui.js.");
+                    continue;
+                }
+
+                ComponentInstaller.InstallComponent(normalizedName, metadata, force: true, skipConfig: false);
+                AnsiConsole.MarkupLine($"[green]Updated:[/] {metadata.DisplayName} to v{metadata.Version}");
+            }
+        });
 
         AnsiConsole.WriteLine();
         AnsiConsole.MarkupLine($"[green]Successfully updated {toUpdate.Length} component(s)[/]");
diff --git a/src/ShellUI.CLI/Services/DashboardSetup.cs b/src/ShellUI.CLI/Services/DashboardSetup.cs
new file mode 100644
index 0000000..c550a6f
--- /dev/null
+++ b/src/ShellUI.CLI/Services/DashboardSetup.cs
@@ -0,0 +1,402 @@
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.RegularExpressions;
+using ShellUI.Core.Models;
+using Spectre.Console;
+
+namespace ShellUI.CLI.Services;
+
+public enum LayoutSwitch
+{
+    Ask,
+    Always
+}
+
+public static class DashboardSetup
+{
+    public static readonly IReadOnlyDictionary<string, string> Layouts = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+    {
+        ["dashboard-01"] = "DashboardLayout01",
+        ["dashboard-02"] = "DashboardLayout02"
+    };
+
+    internal const string StockProjectName = "ShellStockProbe";
+
+    // `dotnet new blazor` output for net8.0/net9.0/net10.0 across --interactivity, --all-interactive, --auth and --empty,
+    // hashed after NormalizeStock.
+    private static readonly Dictionary<string, HashSet<string>> StockHashes = new(StringComparer.OrdinalIgnoreCase)
+    {
+        ["MainLayout.razor"] = new(StringComparer.Ordinal)
+        {
+            "99a50a55f6b55aa0446c1ef889a9096f3a8e5a7b16b71d393df3b57f00f9347f",
+            "9ecf2f10a5db9e896b46991e6134e197224734ef47ae608daa44558c11a78786",
+            "af6d8151880d2a7f521abe08f7c5aee59917a569ef58aac2d4653b32077daed2",
+            "b3c5ef0717f18d50d12bb510a8665a6db2c00da224169816531ed4eabb02752b",
+            "f444829e5638cff745e4071e6af5bbbec673cbe4fd9d8541e97632c788270d5e",
+            "ff9995ff35fcb1744a698536009d0997ae63e2641dbeb993e5153683e5d46e3c"
+        },
+        ["MainLayout.razor.css"] = new(StringComparer.Ordinal)
+        {
+            "0ba85a9f9b54e905e9d3859d6767c95a49a21b3492d097cf04fcdf52f5696eae",
+            "210414cc64ad9c676390ddfecd53fbda3288e2d15cbf038e62bd3f568925c821",
+            "936a82896c36bfebfe22868aa84e5fd3e0c0f0029f5c9c2adb9a11125b7bc6dd",
+            "fc92498e1743ce82b2fb69a2ebe2c4648c7e0adeba40417ffe1a124b9a0d1095"
+        },
+        ["NavMenu.razor"] = new(StringComparer.Ordinal)
+        {
+            "1ff6d08f3776aa632df2c209a09c1841ecd0f1004f9e372df77198c4a1b1f2a1",
+            "6a476727de0169cbcc03462b4359175fcab17ce4d27b7f57796db8c28fb1554d",
+            "7d0ce8b35944c09ae20a6d18c1bf642857e0ffc8a567d6854a6d831ff19d94b3",
+            "83da60817516398d55eba3a8a76aa06ef340edaeb488b6fc57ab6352a00a7403",
+            "a020cfd72aedbdffc131c929f9257ed35f0b359a23a8ee691551a92cf2894743",
+            "b7b968c84028e0d855091f60db00349099594254e75afd2eac11592f2559d474",
+            "c6b71e7459510a281e9177ed4e0be7b7fe9ccc4248615bc282d77bb73271c860",
+            "f6bdc02b2599e90105e5515ba6f579b31dcb02d9b100b72577e7d6939a9bafe5"
+        },
+        ["NavMenu.razor.css"] = new(StringComparer.Ordinal)
+        {
+            "4db5ecd06678f42f1c2fd32887ba74e0a790bec15407d381853f7ce7320aa66b",
+            "5542c1c9e78ed89c670306c4cbd975cc1ca47d14560029bf63e554bf8b23abb8",
+            "7b623080b93bbd68c171e657f5555f4197c9537d20b92ae3254dfbc5b9eaea21",
+            "9570d629a7155ae9a77bcdd856d70e4b46887391c90ebed05d5662ae35a6ead1"
+        }
+    };
+
+    private static readonly Regex RouteViewPattern = new(@"<(Authorize)?RouteView\b", RegexOptions.Compiled);
+    private static readonly Regex DefaultLayoutPattern = new(@"DefaultLayout=""(@?)typeof\(([^)]*)\)""", RegexOptions.Compiled);
+    private static readonly Regex LinksPattern = new(@"(private static readonly NavLink\[\] Links =\s*\[)(.*?)(\s*\];)", RegexOptions.Compiled | RegexOptions.Singleline);
+    private static readonly Regex PagePattern = new(@"^\s*@page\s+""([^""]*)""", RegexOptions.Compiled | RegexOptions.Multiline);
+    private static readonly Regex PageTitlePattern = new(@"<PageTitle>([^<@]+)</PageTitle>", RegexOptions.Compiled);
+
+    internal const string DefaultLinks = @"new(""Home"", ""/"", ""home""),";
+
+    internal const string ErrorUi =
+@"    <div id=""blazor-error-ui"" data-nosnippet class=""fixed inset-x-0 bottom-0 z-[1000] hidden border-t border-border bg-background px-5 py-3 text-sm text-foreground shadow-lg"">
+        An unhandled error has occurred.
+        <a href=""."" class=""reload font-medium underline underline-offset-4"">Reload</a>
+        <span class=""dismiss absolute right-4 top-3 cursor-pointer"">🗙</span>
+    </div>
+";
+
+    /// Returns "dashboard-01", "dashboard-02", "none", or null when the option was not given.
+    public static string? ParseDashboardOption(string? value)
+    {
+        if (value is null) return null;
+        return value.Trim().ToLowerInvariant() switch
+        {
+            "none" or "no" or "false" => "none",
+            "01" or "1" or "dashboard-01" => "dashboard-01",
+            "02" or "2" or "dashboard-02" => "dashboard-02",
+            _ => throw new ArgumentException($"Unknown --dashboard value '{value}'. Use 01, 02 or none.")
+        };
+    }
+
+    public static async Task WireAsync(string component, ProjectInfo projectInfo, ShellUIConfig config, LayoutSwitch layoutSwitch)
+    {
+        var cwd = Directory.GetCurrentDirectory();
+        var layoutName = Layouts[component];
+        var changes = new List<string>();
+        var notes = new List<string>();
+        var usesDashboard = false;
+
+        var routesPath = FindRoutesFile(cwd);
+        if (routesPath == null)
+        {
+            notes.Add($"No RouteView found. Set DefaultLayout=\"typeof({layoutName})\" on your RouteView.");
+        }
+        else
+        {
+            var routes = await File.ReadAllTextAsync(routesPath);
+            var current = FindDefaultLayout(routes);
+            var currentName = current?.Split('.').Last();
+
+            if (current == null || currentName == null)
+            {
+                notes.Add($"{Rel(cwd, routesPath)} has no DefaultLayout. Set DefaultLayout=\"typeof({layoutName})\" on the RouteView.");
+            }
+            else if (currentName == layoutName)
+            {
+                usesDashboard = true;
+            }
+            else
+            {
+                var mainLayout = Path.Combine(cwd, "Components", "Layout", "MainLayout.razor");
+                var replaceable = currentName.StartsWith("DashboardLayout", StringComparison.Ordinal)
+                    || (currentName == "MainLayout" && IsStockFile(mainLayout));
+
+                if (replaceable || ConfirmReplace(currentName, layoutName, layoutSwitch, notes))
+                {
+                    var typeRef = LayoutTypeReference(Path.GetDirectoryName(routesPath)!, cwd, projectInfo.RootNamespace, config.LayoutPath, layoutName);
+                    await File.WriteAllTextAsync(routesPath, RewriteDefaultLayout(routes, typeRef));
+                    changes.Add($"{Rel(cwd, routesPath)}: default layout {currentName} → {layoutName}");
+                    if (Layouts.Values.Contains(currentName))
+                        RetargetLayoutDirectives(cwd, currentName, layoutName, changes);
+                    usesDashboard = true;
+                }
+            }
+        }
+
+        if (usesDashboard)
+        {
+            await EnsureErrorUiAsync(cwd, changes);
+            RemoveStockLayout(cwd, config, layoutName, changes, notes);
+        }
+
+        await UpdateSidebarLinksAsync(cwd, config, changes);
+
+        AnsiConsole.MarkupLine("");
+        AnsiConsole.MarkupLine($"[cyan]Dashboard setup ({layoutName}):[/]");
+        foreach (var change in changes)
+            AnsiConsole.MarkupLine($"  [green]✓[/] {Markup.Escape(change)}");
+        foreach (var note in notes)
+            AnsiConsole.MarkupLine($"  [yellow]![/] {Markup.Escape(note)}");
+        if (changes.Count == 0 && notes.Count == 0)
+            AnsiConsole.MarkupLine("  [dim]Already set up, nothing changed.[/]");
+    }
+
+    private static bool ConfirmReplace(string current, string layoutName, LayoutSwitch layoutSwitch, List<string> notes)
+    {
+        if (layoutSwitch == LayoutSwitch.Always) return true;
+
+        if (AnsiConsole.Profile.Capabilities.Interactive && !Console.IsInputRedirected)
+            return AnsiConsole.Confirm($"Your app uses [bold]{Markup.Escape(current)}[/] as its default layout. Switch to [bold]{layoutName}[/]?", false);
+
+        notes.Add($"Default layout {current} was left unchanged. Re-run with --replace-layout to switch to {layoutName}.");
+        return false;
+    }
+
+    internal static string? FindRoutesFile(string cwd)
+    {
+        var candidates = new[]
+        {
+            Path.Combine(cwd, "Components", "Routes.razor"),
+            Path.Combine(cwd, "Routes.razor"),
+            Path.Combine(cwd, "App.razor"),
+            Path.Combine(cwd, "Components", "App.razor")
+        };
+        return candidates.FirstOrDefault(p => File.Exists(p) && RouteViewPattern.IsMatch(File.ReadAllText(p)));
+    }
+
+    internal static string? FindDefaultLayout(string routesContent)
+    {
+        var match = DefaultLayoutPattern.Match(routesContent);
+        return match.Success ? match.Groups[2].Value.Trim() : null;
+    }
+
+    internal static string RewriteDefaultLayout(string routesContent, string typeRef) =>
+        DefaultLayoutPattern.Replace(routesContent, m => $"DefaultLayout=\"{m.Groups[1].Value}typeof({typeRef})\"", 1);
+
+    internal static string LayoutTypeReference(string routesDir, string cwd, string rootNamespace, string layoutPath, string layoutName)
+    {
+        string Ns(string relative)
+        {
+            var parts = relative.Replace('\\', '/').Split('/', StringSplitOptions.RemoveEmptyEntries).Where(p => p != ".");
+            return string.Join(".", new[] { rootNamespace }.Concat(parts));
+        }
+
+        var routesNs = Ns(Path.GetRelativePath(cwd, routesDir));
+        var layoutNs = Ns(layoutPath);
+        if (layoutNs == routesNs) return layoutName;
+        if (layoutNs.StartsWith(routesNs + ".", StringComparison.Ordinal)) return $"{layoutNs[(routesNs.Length + 1)..]}.{layoutName}";
+        return $"global::{layoutNs}.{layoutName}";
+    }
+
+    // The project name only appears in the stock NavMenu brand link.
+    private static readonly Regex BrandPattern = new(@"(<a class=""navbar-brand"" href="""">)[^<]*(</a>)", RegexOptions.Compiled);
+
+    internal static string NormalizeStock(string content)
+    {
+        var text = content.TrimStart('').Replace("\r\n", "\n").TrimEnd();
+        return BrandPattern.Replace(text, $"$1{StockProjectName}$2", 1);
+    }
+
+    internal static bool IsStockContent(string fileName, string content)
+    {
+        if (!StockHashes.TryGetValue(fileName, out var hashes)) return false;
+        var normalized = NormalizeStock(content);
+        var hash = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(normalized))).ToLowerInvariant();
+        return hashes.Contains(hash);
+    }
+
+    private static bool IsStockFile(string path) =>
+        File.Exists(path) && IsStockContent(Path.GetFileName(path), File.ReadAllText(path));
+
+    internal static string AddErrorUi(string appRazor)
+    {
+        if (appRazor.Contains("blazor-error-ui", StringComparison.Ordinal)) return appRazor;
+        var index = appRazor.LastIndexOf("</body>", StringComparison.OrdinalIgnoreCase);
+        if (index < 0) return appRazor;
+        var newline = appRazor.Contains("\r\n") ? "\r\n" : "\n";
+        return appRazor.Insert(index, ErrorUi.Replace("\r\n", "\n").Replace("\n", newline));
+    }
+
+    private static async Task EnsureErrorUiAsync(string cwd, List<string> changes)
+    {
+        var appRazor = Path.Combine(cwd, "Components", "App.razor");
+        if (!File.Exists(appRazor)) return;
+        var original = await File.ReadAllTextAsync(appRazor);
+        var patched = AddErrorUi(original);
+        if (patched == original) return;
+        await File.WriteAllTextAsync(appRazor, patched);
+        changes.Add("Components/App.razor: added the Blazor error bar (it lived in MainLayout)");
+    }
+
+    private static void RemoveStockLayout(string cwd, ShellUIConfig config, string layoutName, List<string> changes, List<string> notes)
+    {
+        var layoutDir = Path.Combine(cwd, "Components", "Layout");
+        var mainLayout = Path.Combine(layoutDir, "MainLayout.razor");
+        var sameFolder = config.LayoutPath.Replace('\\', '/').Trim('/').Equals("Components/Layout", StringComparison.OrdinalIgnoreCase);
+        if (sameFolder && IsStockFile(mainLayout))
+            RetargetLayoutDirectives(cwd, "MainLayout", layoutName, changes);
+
+        RemoveStockGroup(cwd, layoutDir, "MainLayout", changes, notes);
+        if (!File.Exists(Path.Combine(layoutDir, "MainLayout.razor")))
+            RemoveStockGroup(cwd, layoutDir, "NavMenu", changes, notes);
+    }
+
+    // Pages such as the .NET 10 NotFound page pin `@layout MainLayout`.
+    internal static string RetargetLayoutDirective(string content, string from, string to) =>
+        Regex.Replace(content, $@"^([ \t]*@layout[ \t]+(?:[\w.]+\.)?){Regex.Escape(from)}(?=[ \t]*\r?$)", m => m.Groups[1].Value + to, RegexOptions.Multiline);
+
+    private static void RetargetLayoutDirectives(string cwd, string from, string to, List<string> changes)
+    {
+        foreach (var file in EnumerateSources(cwd, "*.razor"))
+        {
+            var content = File.ReadAllText(file);
+            var retargeted = RetargetLayoutDirective(content, from, to);
+            if (retargeted == content) continue;
+            File.WriteAllText(file, retargeted);
+            changes.Add($"{Rel(cwd, file)}: @layout {from} → {to}");
+        }
+    }
+
+    private static void RemoveStockGroup(string cwd, string layoutDir, string component, List<string> changes, List<string> notes)
+    {
+        var files = new[] { $"{component}.razor", $"{component}.razor.css" }
+            .Select(f => Path.Combine(layoutDir, f))
+            .Where(File.Exists)
+            .ToList();
+        if (files.Count == 0) return;
+
+        if (!files.All(f => IsStockFile(f)))
+        {
+            notes.Add($"Kept Components/Layout/{component}.razor because it was modified. Delete it yourself if it is no longer needed.");
+            return;
+        }
+
+        if (IsReferencedElsewhere(cwd, component, files))
+        {
+            notes.Add($"Kept Components/Layout/{component}.razor because other files still use it.");
+            return;
+        }
+
+        foreach (var file in files)
+        {
+            File.Delete(file);
+            changes.Add($"Removed stock {Rel(cwd, file)}");
+        }
+    }
+
+    private static bool IsReferencedElsewhere(string cwd, string component, List<string> own)
+    {
+        var pattern = new Regex($@"\b{component}\b");
+        return EnumerateSources(cwd, "*.razor").Concat(EnumerateSources(cwd, "*.cs"))
+            .Where(f => !own.Contains(f, StringComparer.OrdinalIgnoreCase))
+            .Any(f => pattern.IsMatch(File.ReadAllText(f)));
+    }
+
+    internal static IEnumerable<string> EnumerateSources(string cwd, string pattern) =>
+        Directory.EnumerateFiles(cwd, pattern, SearchOption.AllDirectories)
+            .Where(f =>
+            {
+                var rel = Path.GetRelativePath(cwd, f).Replace('\\', '/');
+                return !rel.StartsWith("bin/", StringComparison.OrdinalIgnoreCase)
+                    && !rel.StartsWith("obj/", StringComparison.OrdinalIgnoreCase)
+                    && !rel.StartsWith(".shellui/", StringComparison.OrdinalIgnoreCase)
+                    && !rel.StartsWith("node_modules/", StringComparison.OrdinalIgnoreCase);
+            });
+
+    internal record PageLink(string Title, string Href, string Icon);
+
+    internal static List<PageLink> ScanPages(string cwd, ShellUIConfig config)
+    {
+        var skipDirs = new[] { config.ComponentsPath, config.LayoutPath }
+            .Where(p => !string.IsNullOrEmpty(p))
+            .Select(p => p.Replace('\\', '/').TrimEnd('/') + "/")
+            .ToList();
+
+        var links = new Dictionary<string, PageLink>(StringComparer.OrdinalIgnoreCase);
+        foreach (var file in EnumerateSources(cwd, "*.razor"))
+        {
+            var rel = Path.GetRelativePath(cwd, file).Replace('\\', '/');
+            if (skipDirs.Any(d => rel.StartsWith(d, StringComparison.OrdinalIgnoreCase))) continue;
+
+            var content = File.ReadAllText(file);
+            var page = PagePattern.Match(content);
+            if (!page.Success) continue;
+
+            var href = page.Groups[1].Value.Trim();
+            if (!IsNavigableRoute(href) || links.ContainsKey(href)) continue;
+
+            var name = Path.GetFileNameWithoutExtension(file);
+            var titleMatch = PageTitlePattern.Match(content);
+            var title = titleMatch.Success ? titleMatch.Groups[1].Value.Trim() : Humanize(name);
+            links[href] = new PageLink(title, href, IconFor(href, name));
+        }
+
+        return links.Values
+            .OrderBy(l => l.Href == "/" ? 0 : 1)
+            .ThenBy(l => l.Href, StringComparer.OrdinalIgnoreCase)
+            .ToList();
+    }
+
+    internal static bool IsNavigableRoute(string href)
+    {
+        if (!href.StartsWith('/') || href.Contains('{')) return false;
+        var excluded = new[] { "/Account", "/Error", "/not-found", "/notfound", "/_" };
+        return !excluded.Any(e => href.Equals(e, StringComparison.OrdinalIgnoreCase)
+            || href.StartsWith(e + "/", StringComparison.OrdinalIgnoreCase));
+    }
+
+    private static string IconFor(string href, string fileName)
+    {
+        if (href == "/") return "home";
+        var key = fileName.ToLowerInvariant();
+        if (key.Contains("counter")) return "counter";
+        if (key.Contains("weather")) return "weather";
+        return "page";
+    }
+
+    private static string Humanize(string name) => Regex.Replace(name, "(?<=[a-z0-9])(?=[A-Z])", " ");
+
+    internal static string? RewriteSidebarLinks(string sidebar, IReadOnlyList<PageLink> links)
+    {
+        var match = LinksPattern.Match(sidebar);
+        if (!match.Success || links.Count == 0) return null;
+
+        var existing = Regex.Replace(match.Groups[2].Value, @"\s+", "");
+        if (existing != Regex.Replace(DefaultLinks, @"\s+", "")) return null;
+
+        var newline = sidebar.Contains("\r\n") ? "\r\n" : "\n";
+        var body = string.Concat(links.Select(l => $"{newline}        new(\"{Escape(l.Title)}\", \"{Escape(l.Href)}\", \"{l.Icon}\"),"));
+        var rewritten = sidebar[..match.Groups[2].Index] + body + sidebar[(match.Groups[2].Index + match.Groups[2].Length)..];
+        return rewritten == sidebar ? null : rewritten;
+    }
+
+    private static string Escape(string value) => value.Replace("\\", "\\\\").Replace("\"", "\\\"");
+
+    private static async Task UpdateSidebarLinksAsync(string cwd, ShellUIConfig config, List<string> changes)
+    {
+        var sidebarPath = Path.Combine(cwd, config.ComponentsPath, "AppSidebar.razor");
+        if (!File.Exists(sidebarPath)) return;
+
+        var links = ScanPages(cwd, config);
+        var rewritten = RewriteSidebarLinks(await File.ReadAllTextAsync(sidebarPath), links);
+        if (rewritten == null) return;
+
+        await File.WriteAllTextAsync(sidebarPath, rewritten);
+        changes.Add($"AppSidebar.razor: links for your pages ({string.Join(", ", links.Select(l => l.Title))})");
+    }
+
+    private static string Rel(string cwd, string path) => Path.GetRelativePath(cwd, path).Replace('\\', '/');
+}
diff --git a/src/ShellUI.CLI/Services/InitService.cs b/src/ShellUI.CLI/Services/InitService.cs
index c772fd5..c4796c6 100644
--- a/src/ShellUI.CLI/Services/InitService.cs
+++ b/src/ShellUI.CLI/Services/InitService.cs
@@ -9,50 +9,25 @@ namespace ShellUI.CLI.Services;
 
 public class InitService
 {
-    public static async Task InitializeAsync(string style, bool force, string tailwindMethod = "standalone", bool nonInteractive = false)
+    public static async Task InitializeAsync(string style, bool force, string tailwindMethod = "standalone", bool nonInteractive = false,
+        string? dashboard = null, LayoutSwitch layoutSwitch = LayoutSwitch.Ask)
     {
         var configPath = Path.Combine(Directory.GetCurrentDirectory(), "shellui.json");
+        var dashboardChoice = DashboardSetup.ParseDashboardOption(dashboard) ?? (nonInteractive ? "none" : null);
 
         if (File.Exists(configPath) && !force)
         {
             AnsiConsole.MarkupLine("[yellow]ShellUI is already initialized in this project.[/]");
-            AnsiConsole.MarkupLine("[dim]Use --force to reinitialize[/]");
+            AnsiConsole.MarkupLine("[dim]Use --force to reinitialize, or add a dashboard with: shellui add dashboard-02[/]");
             return;
         }
 
         // Step 1: Detect project
-        ProjectInfo projectInfo = null!;
-
-        try
-        {
-            await AnsiConsole.Status()
-                .Spinner(Spinner.Known.Dots)
-                .SpinnerStyle(Style.Parse("green"))
-                .StartAsync("Initializing ShellUI...", async ctx =>
-                {
-                    ctx.Status("Detecting project type...");
-                    await Task.Delay(300); // Brief delay for UX
-                    projectInfo = ProjectDetector.DetectProject();
-                    AnsiConsole.MarkupLine($"[green]✅ Detected:[/] {projectInfo.ProjectType}");
-                    AnsiConsole.MarkupLine($"[dim]Project: {projectInfo.ProjectName}[/]");
-                    AnsiConsole.MarkupLine($"[dim]Namespace: {projectInfo.RootNamespace}[/]");
-
-                    // Clean up bootstrap files
-                    ctx.Status("Cleaning up Bootstrap files...");
-                    RemoveBootstrapFiles();
-                });
-        }
-        catch
-        {
-            // Fallback if status display fails
-            projectInfo = ProjectDetector.DetectProject();
-            AnsiConsole.MarkupLine($"[green]✅ Detected:[/] {projectInfo.ProjectType}");
-            AnsiConsole.MarkupLine($"[dim]Project: {projectInfo.ProjectName}[/]");
-            AnsiConsole.MarkupLine($"[dim]Namespace: {projectInfo.RootNamespace}[/]");
-
-            // Clean up bootstrap files
-            RemoveBootstrapFiles();
-        }
+        var projectInfo = ProjectDetector.DetectProject();
+        AnsiConsole.MarkupLine($"[green]✅ Detected:[/] {projectInfo.ProjectType}");
+        AnsiConsole.MarkupLine($"[dim]Project: {projectInfo.ProjectName}[/]");
+        AnsiConsole.MarkupLine($"[dim]Namespace: {projectInfo.RootNamespace}[/]");
+        RemoveBootstrapFiles();
 
         // Step 2: Determine Tailwind method preference
         AnsiConsole.MarkupLine("[cyan]Setting up Tailwind CSS...[/]");
@@ -78,6 +53,23 @@ await AnsiConsole.Status()
             AnsiConsole.MarkupLine($"[green]✅ Selected:[/] {method}");
         }
 
+        if (dashboardChoice == null)
+        {
+            var dashboardSelection = AnsiConsole.Prompt(
+                new SelectionPrompt<string>()
+                    .Title("[bold yellow]Set up the ShellUI dashboard layout?[/] [dim](sidebar, header, theme toggle)[/]")
+                    .AddChoices(new[] {
+                        "Sticky header (dashboard-02, recommended)",
+                        "Scrolling header (dashboard-01)",
+                        "No, keep my layout"
+                    }));
+
+            dashboardChoice = dashboardSelection.StartsWith("Sticky") ? "dashboard-02"
+                : dashboardSelection.StartsWith("Scrolling") ? "dashboard-01"
+                : "none";
+            AnsiConsole.MarkupLine($"[green]✅ Selected:[/] {dashboardChoice}");
+        }
+
         // Check npm availability if selected
         if (method == "npm" && !await IsNpmAvailableAsync())
         {
@@ -100,28 +92,27 @@ await AnsiConsole.Status()
             }
         };
 
-        await AnsiConsole.Status()
-            .StartAsync("Installing ShellUI components...", async ctx =>
+        await LogoLoader.RunAsync("Installing ShellUI components...", async status =>
             {
                 // Step 3: Create Components/UI folder
-                ctx.Status("Creating component folders...");
+                status("Creating component folders...");
                 var componentsPath = Path.Combine(Directory.GetCurrentDirectory(), "Components", "UI");
                 Directory.CreateDirectory(componentsPath);
                 AnsiConsole.MarkupLine($"[green]Created:[/] Components/UI/");
 
                 // Step 3.5: Install Shell utilities and shellui.js (required for CopyButton, FileUpload, Command)
-                ctx.Status("Installing Shell utilities...");
+                status("Installing Shell utilities...");
                 if (!await ComponentInstaller.InstallComponentForInitAsync("shell", projectInfo, config))
                     throw new InvalidOperationException("Shell could not be installed.");
                 if (!await ComponentInstaller.InstallComponentForInitAsync("shellui-js", projectInfo, config))
                     throw new InvalidOperationException("shellui.js could not be installed.");
 
                 // Step 4: Create shellui.json
-                ctx.Status("Preparing configuration...");
+                status("Preparing configuration...");
                 AnsiConsole.MarkupLine("[green]Configuration prepared[/]");
 
                 // Step 5: Create _Imports.razor if it doesn't exist
-                ctx.Status("Setting up imports...");
+                status("Setting up imports...");
                 var importsPath = Path.Combine(Directory.GetCurrentDirectory(), "Components", "_Imports.razor");
                 if (File.Exists(importsPath))
                 {
@@ -136,7 +127,7 @@ await AnsiConsole.Status()
                 }
 
                 // Step 6: Set up Tailwind CSS based on method
-                ctx.Status("Setting up Tailwind CSS...");
+                status("Setting up Tailwind CSS...");
                 if (method == "npm")
                 {
                     await SetupTailwindNpmAsync();
@@ -147,11 +138,18 @@ await AnsiConsole.Status()
                 }
 
                 // Step 6.5: Patch App.razor / index.html — render mode + theme bootstrap + shellui.js
-                ctx.Status("Wiring up theme and render mode...");
+                status("Wiring up theme and render mode...");
                 await BootstrapHostAsync(projectInfo);
 
+                status("Restyling the template's sample pages...");
+                var pages = StockPages.Apply(Directory.GetCurrentDirectory(), new[] { config.ComponentsPath, config.LayoutPath });
+                if (pages.Restyled.Count > 0)
+                    AnsiConsole.MarkupLine($"[green]Restyled:[/] {Markup.Escape(string.Join(", ", pages.Restyled))} [dim](Bootstrap classes → Tailwind)[/]");
+                foreach (var note in pages.Notes)
+                    AnsiConsole.MarkupLine($"[yellow]![/] {Markup.Escape(note)}");
+
                 // Step 7: Create MSBuild targets file
-                ctx.Status("Setting up MSBuild integration...");
+                status("Setting up MSBuild integration...");
                 var buildPath = Path.Combine(Directory.GetCurrentDirectory(), "Build");
                 Directory.CreateDirectory(buildPath);
 
@@ -165,7 +163,7 @@ await AnsiConsole.Status()
                 AnsiConsole.MarkupLine($"[green]Updated:[/] {Path.GetFileName(projectInfo.ProjectPath)}");
 
                 // Step 8: Run initial Tailwind build
-                ctx.Status("Building Tailwind CSS...");
+                status("Building Tailwind CSS...");
                 if (method == "npm")
                 {
                     await RunNpmTailwindBuildAsync();
@@ -187,10 +185,21 @@ await AnsiConsole.Status()
         File.WriteAllText(configPath, json);
         AnsiConsole.MarkupLine("[green]✅ Created:[/] shellui.json");
 
+        if (dashboardChoice != "none")
+        {
+            AnsiConsole.MarkupLine($"\n[cyan]Adding {dashboardChoice}...[/]");
+            if (!await ComponentInstaller.InstallComponents(new[] { dashboardChoice! }, force: false, layoutSwitch))
+                throw new InvalidOperationException($"{dashboardChoice} could not be installed.");
+        }
+
         AnsiConsole.MarkupLine("\n[green]✅ ShellUI initialized successfully![/]");
         AnsiConsole.MarkupLine("\n[blue]Next steps:[/]");
-        AnsiConsole.MarkupLine("  [dim]1. Add components:[/] shellui add button");
-        AnsiConsole.MarkupLine("  [dim]2. Browse all:[/] shellui list");
+        var step = 1;
+        if (dashboardChoice != "none")
+            AnsiConsole.MarkupLine($"  [dim]{step++}. Run the app:[/] dotnet watch");
+        AnsiConsole.MarkupLine($"  [dim]{step++}. Pick a theme at[/] [link]https://tweakcn.com[/][dim], then:[/] shellui theme apply <theme-url>");
+        AnsiConsole.MarkupLine($"  [dim]{step++}. Add components:[/] shellui add button");
+        AnsiConsole.MarkupLine($"  [dim]{step}. Browse all:[/] shellui list");
     }
 
     private static async Task SetupTailwindNpmAsync()
@@ -485,6 +494,9 @@ private static async Task BootstrapHostAsync(ProjectInfo projectInfo)
     // are preserved (they'll need to set @rendermode manually).
     internal static string RewriteAppRazor(string content)
     {
+        // init deletes the template's local Bootstrap copy; CDN links are left alone.
+        content = Regex.Replace(content, @"^[ \t]*<link\b(?![^\r\n]*://)[^\r\n]*bootstrap[^\r\n]*\.css[^\r\n]*\r?\n", "", RegexOptions.Multiline | RegexOptions.IgnoreCase);
+
         content = Regex.Replace(content, @"<HeadOutlet\s*/>", @"<HeadOutlet @rendermode=""InteractiveServer"" />");
         content = Regex.Replace(content, @"<Routes\s*/>", @"<Routes @rendermode=""InteractiveServer"" />");
 
@@ -599,12 +611,13 @@ private static void RemoveBootstrapFiles()
             AnsiConsole.MarkupLine("[cyan]Checking for Bootstrap files to clean up...[/]");
             var deletedCount = 0;
 
-            // 1. Delete wwwroot/lib/bootstrap
-            var libBootstrap = Path.Combine(wwwrootPath, "lib", "bootstrap");
-            if (Directory.Exists(libBootstrap))
+            // 1. Delete wwwroot/lib/bootstrap (.NET 9+) and wwwroot/bootstrap (.NET 8)
+            foreach (var folder in new[] { Path.Combine("lib", "bootstrap"), "bootstrap" })
             {
-                Directory.Delete(libBootstrap, true);
-                AnsiConsole.MarkupLine($"[dim]Deleted:[/] wwwroot/lib/bootstrap folder");
+                var bootstrapDir = Path.Combine(wwwrootPath, folder);
+                if (!Directory.Exists(bootstrapDir)) continue;
+                Directory.Delete(bootstrapDir, true);
+                AnsiConsole.MarkupLine($"[dim]Deleted:[/] wwwroot/{folder.Replace('\\', '/')} folder");
                 deletedCount++;
             }
 
diff --git a/src/ShellUI.CLI/Services/Loaders.cs b/src/ShellUI.CLI/Services/Loaders.cs
new file mode 100644
index 0000000..d1fe328
--- /dev/null
+++ b/src/ShellUI.CLI/Services/Loaders.cs
@@ -0,0 +1,119 @@
+using Spectre.Console;
+using Spectre.Console.Rendering;
+
+namespace ShellUI.CLI.Services;
+
+public static class Loaders
+{
+    public static Status SnakeStatus() =>
+        AnsiConsole.Status().Spinner(SnakeSpinner.Instance).SpinnerStyle(Style.Parse("green"));
+}
+
+// The Loading component's "snake" grid (3x3) as a one-line spinner. A Braille cell is 2 dots wide
+// and 4 tall, so the grid fits in two characters. Spectre falls back to ASCII without Unicode.
+public sealed class SnakeSpinner : Spinner
+{
+    private static readonly int[] Path = { 0, 1, 2, 5, 8, 7, 6, 3 };
+    private static readonly int[,] Bits = { { 0x01, 0x08 }, { 0x02, 0x10 }, { 0x04, 0x20 } };
+
+    public static readonly SnakeSpinner Instance = new();
+
+    private SnakeSpinner()
+    {
+        Frames = Enumerable.Range(0, Path.Length)
+            .Select(step => Braille(i => IsLit(Array.IndexOf(Path, i), step)))
+            .ToList();
+    }
+
+    public override TimeSpan Interval => TimeSpan.FromMilliseconds(110);
+    public override bool IsUnicode => true;
+    public override IReadOnlyList<string> Frames { get; }
+
+    private static bool IsLit(int position, int step) =>
+        position >= 0 && Enumerable.Range(0, 3).Any(k => (step - k + Path.Length) % Path.Length == position);
+
+    internal static string Braille(Func<int, bool> lit)
+    {
+        var chars = new int[2];
+        for (var i = 0; i < 9; i++)
+            if (lit(i)) chars[i % 3 / 2] |= Bits[i / 3, i % 3 % 2];
+        return string.Concat(chars.Select(c => (char)(0x2800 + c)));
+    }
+}
+
+// The Loading component's "logo" variant: the 5x5 ShellUI mark lights up along the diagonal,
+// with the current step beside it. Falls back to the snake spinner when there is no terminal.
+public static class LogoLoader
+{
+    private static readonly string[] Pattern = { "X...X", ".X..X", "..X.X", ".X..X", "X...X" };
+    private const int Cycle = 30;
+
+    public static async Task RunAsync(string initialStatus, Func<Action<string>, Task> work)
+    {
+        var caps = AnsiConsole.Profile.Capabilities;
+        if (!caps.Interactive || !caps.Unicode || Console.IsOutputRedirected)
+        {
+            await Loaders.SnakeStatus().StartAsync(initialStatus, ctx => work(s => ctx.Status(s)));
+            return;
+        }
+
+        var status = initialStatus;
+        await AnsiConsole.Live(Render(0, status))
+            .AutoClear(true)
+            .StartAsync(async ctx =>
+            {
+                var task = work(s => status = s);
+                for (var frame = 1; !task.IsCompleted; frame++)
+                {
+                    ctx.UpdateTarget(Render(frame, status));
+                    await Task.WhenAny(task, Task.Delay(70));
+                }
+                await task;
+            });
+    }
+
+    // Lit dots switch on along the diagonal, hold, then switch off the same way.
+    internal static string[] Frame(int frame)
+    {
+        var t = frame % Cycle;
+        return Enumerable.Range(0, 5).Select(r => string.Concat(Enumerable.Range(0, 5).Select(c =>
+        {
+            var diagonal = r + c;
+            var on = Pattern[r][c] == 'X' && (t < Cycle / 2 ? diagonal <= t : diagonal > t - Cycle / 2);
+            return on ? 'X' : '.';
+        }))).ToArray();
+    }
+
+    private static IRenderable Render(int frame, string status)
+    {
+        var grid = new Grid().AddColumn().AddColumn();
+        grid.AddRow(new Markup(Dots(Frame(frame))), new Markup($"\n\n  {Markup.Escape(status)}"));
+        return grid;
+    }
+
+    private static string Dots(IEnumerable<string> rows) =>
+        string.Join("\n", rows.Select(row => string.Join(" ", row.Select(ch => ch == 'X' ? "[white]●[/]" : "[grey19]●[/]"))));
+
+    // The static mark with the name, version and a subtitle beside it (used by init and list).
+    public static void WriteHeader(string subtitle)
+    {
+        var version = typeof(LogoLoader).Assembly
+            .GetCustomAttributes(typeof(System.Reflection.AssemblyInformationalVersionAttribute), false)
+            .OfType<System.Reflection.AssemblyInformationalVersionAttribute>()
+            .FirstOrDefault()?.InformationalVersion.Split('+')[0] ?? "";
+
+        if (!AnsiConsole.Profile.Capabilities.Unicode)
+        {
+            AnsiConsole.MarkupLine($"[bold]ShellUI[/] [dim]{Markup.Escape(version)}[/]  {Markup.Escape(subtitle)}\n");
+            return;
+        }
+
+        var grid = new Grid().AddColumn().AddColumn();
+        grid.AddRow(
+            new Markup(Dots(Pattern)),
+            new Markup($"\n  [bold]ShellUI[/] [dim]{Markup.Escape(version)}[/]\n  [dim]{Markup.Escape(subtitle)}[/]"));
+        AnsiConsole.WriteLine();
+        AnsiConsole.Write(grid);
+        AnsiConsole.WriteLine();
+    }
+}
diff --git a/src/ShellUI.CLI/Services/StockPages.cs b/src/ShellUI.CLI/Services/StockPages.cs
new file mode 100644
index 0000000..6ffa7da
--- /dev/null
+++ b/src/ShellUI.CLI/Services/StockPages.cs
@@ -0,0 +1,140 @@
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace ShellUI.CLI.Services;
+
+// init removes Bootstrap, so the template's sample pages lose their styling. Unmodified copies are
+// restyled with Tailwind classes that match ShellUI's Button and Table; edited pages are only reported.
+public static class StockPages
+{
+    // `dotnet new blazor` pages for net8.0/net9.0/net10.0 across --interactivity, --all-interactive and --auth.
+    private static readonly Dictionary<string, HashSet<string>> StockHashes = new(StringComparer.OrdinalIgnoreCase)
+    {
+        ["Home.razor"] = new(StringComparer.Ordinal) { "ae4681c90c84510d13bf2a66fdb86d78d60412cfec5e611c9c226d79592229a2" },
+        ["Counter.razor"] = new(StringComparer.Ordinal)
+        {
+            "38ec7d9ecc5a846bf6f089d36ccf3a254d9b88c28354f2a3c5a12a18ddce1241",
+            "4d78d57a4503a20d5ede388695435aceec3609b5942f0e5acfe35cedaf745ef8",
+            "8833e56b70f1ecd4a816d608a98d3e2c44a289a45b91c0a7faee645b91533267",
+            "a85be73e8a44c638d5e3974288a7817eef7a4a756cf0d2420b5b4bfcf3d2a82c"
+        },
+        ["Weather.razor"] = new(StringComparer.Ordinal)
+        {
+            "1d988ab0af352917c3fc68bbd8becc441fec00f0b8ebc572d9b94905ef301bb8",
+            "97afd80b92223a7ef963a7308a75938fa111ea67082e9cf66be4318c6ce6d688",
+            "b9246ba86447cae02e41128b1438eb45ccaf1084369acab794a174778a78e675",
+            "cbe95cabef0a65002c4f180c812f2de1bc1e526a779b4906a4ae122db232e5bc",
+            "f28be79c3d24e11bc2687974c27fb4814c2647305146bfca44fc5be29469baf9",
+            "febc623de76daa44cf9e05497c9f938fd999b0952daba5080d5b1cda20ca8b63"
+        },
+        ["Error.razor"] = new(StringComparer.Ordinal) { "0401924993372cfaa232b06ab63e5d91e1e6bf14618244c6c92df5124d6ca109" },
+        ["NotFound.razor"] = new(StringComparer.Ordinal) { "de247b81953d245d07af36d09e794f44ffda9fffe73e9fd39387ed93ceb8653e" },
+        ["Auth.razor"] = new(StringComparer.Ordinal)
+        {
+            "346f73f904b91e9a12e89e0f912f9a969225ab8e2bac25e19db9f2422e55ff4c",
+            "ebc06a858a7e635646a392738c44e99515c140d293979c59cac2c7664269dcd1",
+            "f6d65a3c128c136871cb96ca4bb0d8f2b28a06e07a44fc25a9df16764de0a1ea"
+        }
+    };
+
+    private const string Heading = "text-2xl font-semibold tracking-tight";
+    private const string TableHead = "h-12 px-4 text-left align-middle font-medium text-muted-foreground";
+
+    private static readonly (string From, string To)[] Replacements =
+    {
+        ("<h1>", $"<h1 class=\"{Heading}\">"),
+        ("<h1 class=\"text-danger\">", $"<h1 class=\"{Heading} text-destructive\">"),
+        ("<h2 class=\"text-danger\">", "<h2 class=\"text-lg font-medium text-destructive\">"),
+        ("<h3>", "<h3 class=\"text-lg font-semibold\">"),
+        ("class=\"btn btn-primary\"", "class=\"inline-flex h-10 w-fit items-center justify-center whitespace-nowrap rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground ring-offset-background transition-colors hover:bg-primary/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2\""),
+        ("<table class=\"table\">", "<table class=\"w-full caption-bottom text-sm\">"),
+        ("<tr>", "<tr class=\"border-b border-border transition-colors hover:bg-muted/50\">"),
+        ("<th>", $"<th class=\"{TableHead}\">"),
+        ("<th aria-label=", $"<th class=\"{TableHead}\" aria-label="),
+        ("<td>", "<td class=\"p-4 align-middle\">")
+    };
+
+    private static readonly Regex BootstrapClass = new(
+        @"class=""(table|[^""]*\b(btn|btn-[a-z-]+|form-control|form-floating|form-label|form-check[a-z-]*|text-danger|text-success|alert-[a-z]+|nav-link|navbar-brand|table-(striped|bordered|hover|sm|dark|responsive))\b[^""]*)""",
+        RegexOptions.Compiled);
+
+    public record Result(List<string> Restyled, List<string> Notes);
+
+    internal static bool IsStock(string fileName, string content)
+    {
+        if (!StockHashes.TryGetValue(fileName, out var hashes)) return false;
+        var normalized = content.TrimStart('').Replace("\r\n", "\n").TrimEnd();
+        var hash = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(normalized))).ToLowerInvariant();
+        return hashes.Contains(hash);
+    }
+
+    // The stock Home only says "Hello, world!"; it becomes a pointer to theming and the docs.
+    internal const string HomePage =
+@"@page ""/""
+
+<PageTitle>Home</PageTitle>
+
+<h1 class=""text-2xl font-semibold tracking-tight"">Hello, world!</h1>
+
+<p class=""text-muted-foreground"">Welcome to your new app.</p>
+
+<div class=""flex flex-1 items-center justify-center py-8"">
+    <div class=""w-full max-w-lg rounded-xl border border-border bg-card p-6 text-card-foreground shadow-sm"">
+        <h2 class=""text-lg font-semibold"">Make it yours</h2>
+        <p class=""mt-1 text-sm text-muted-foreground"">Pick or build a theme on tweakcn, copy its URL, then run:</p>
+        <pre class=""mt-3 overflow-x-auto rounded-md bg-muted px-3 py-2 font-mono text-sm""><code>shellui theme apply https://tweakcn.com/themes/&lt;id&gt;</code></pre>
+        <p class=""mt-3 text-sm text-muted-foreground"">Add components with <code class=""rounded bg-muted px-1 py-0.5 font-mono"">shellui add button card</code>, or list them all with <code class=""rounded bg-muted px-1 py-0.5 font-mono"">shellui list</code>.</p>
+        <div class=""mt-5 flex flex-wrap gap-2"">
+            <a href=""https://tweakcn.com"" target=""_blank"" rel=""noopener"" class=""inline-flex h-9 items-center justify-center rounded-md bg-primary px-4 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90"">Browse themes</a>
+            <a href=""https://shellui.dev"" target=""_blank"" rel=""noopener"" class=""inline-flex h-9 items-center justify-center rounded-md border border-input bg-background px-4 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground"">ShellUI docs</a>
+        </div>
+    </div>
+</div>
+";
+
+    internal static string Restyle(string fileName, string content)
+    {
+        if (fileName.Equals("Home.razor", StringComparison.OrdinalIgnoreCase))
+            return HomePage.Replace("\r\n", "\n").Replace("\n", content.Contains("\r\n") ? "\r\n" : "\n");
+        return Replacements.Aggregate(content, (text, r) => text.Replace(r.From, r.To));
+    }
+
+    internal static bool UsesBootstrap(string content) => BootstrapClass.IsMatch(content);
+
+    public static Result Apply(string cwd, IEnumerable<string> skipDirs)
+    {
+        var skip = skipDirs.Select(d => d.Replace('\\', '/').Trim('/') + "/").ToList();
+        var restyled = new List<string>();
+        var leftovers = new List<string>();
+        var accountPages = 0;
+
+        foreach (var file in DashboardSetup.EnumerateSources(cwd, "*.razor"))
+        {
+            var rel = Path.GetRelativePath(cwd, file).Replace('\\', '/');
+            if (skip.Any(d => rel.StartsWith(d, StringComparison.OrdinalIgnoreCase))) continue;
+
+            var content = File.ReadAllText(file);
+            if (IsStock(Path.GetFileName(file), content))
+            {
+                var updated = Restyle(Path.GetFileName(file), content);
+                if (updated == content) continue;
+                File.WriteAllText(file, updated);
+                restyled.Add(rel);
+            }
+            else if (UsesBootstrap(content))
+            {
+                if (rel.Contains("/Account/", StringComparison.OrdinalIgnoreCase)) accountPages++;
+                else leftovers.Add(rel);
+            }
+        }
+
+        var notes = leftovers
+            .Select(f => $"Kept {f} because it was modified. It still uses Bootstrap classes, which no longer have styles.")
+            .ToList();
+        if (accountPages > 0)
+            notes.Add($"{accountPages} Identity page(s) under Account/ still use Bootstrap classes and need restyling.");
+
+        return new Result(restyled, notes);
+    }
+}

From c9e4a32311796a2fe0f2cee449a427d2369f4c0b Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Tue, 29 Sep 2026 09:19:30 +0200
Subject: [PATCH 4/6] refactor: update AppSidebarTemplate to use dynamic
 navigation links

- Replaced static sidebar menu items with a dynamic generation of links using a `NavLink` record.
- Introduced a `Links` array to manage sidebar items, allowing for easier updates and maintenance.
- Enhanced icon rendering based on the link type, improving the flexibility of the sidebar structure.
---
 .../Templates/AppSidebarTemplate.cs           | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/ShellUI.Templates/Templates/AppSidebarTemplate.cs b/src/ShellUI.Templates/Templates/AppSidebarTemplate.cs
index 60230ac..a6009e0 100644
--- a/src/ShellUI.Templates/Templates/AppSidebarTemplate.cs
+++ b/src/ShellUI.Templates/Templates/AppSidebarTemplate.cs
@@ -42,31 +42,29 @@ @inject NavigationManager Navigation
             <SidebarGroupLabel>Navigation</SidebarGroupLabel>
             <SidebarGroupContent>
                 <SidebarMenu>
-                    <SidebarMenuItem>
-                        <SidebarMenuButton Href=""/"" IsActive=""@IsCurrentPath(""/"")"" Tooltip=""Home"">
-                            <svg xmlns=""http://www.w3.org/2000/svg"" viewBox=""0 0 24 24"" fill=""none"" stroke=""currentColor"" stroke-width=""2"" class=""size-4""><path d=""M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z""/><path d=""M9 22V12h6v10""/></svg>
-                            <span>Home</span>
-                        </SidebarMenuButton>
-                    </SidebarMenuItem>
-                    <SidebarMenuItem>
-                        <SidebarMenuButton Href=""/dashboard"" IsActive=""@IsCurrentPath(""/dashboard"")"" Tooltip=""Dashboard"">
-                            <svg xmlns=""http://www.w3.org/2000/svg"" viewBox=""0 0 24 24"" fill=""none"" stroke=""currentColor"" stroke-width=""2"" class=""size-4""><rect x=""3"" y=""3"" width=""7"" height=""7""/><rect x=""14"" y=""3"" width=""7"" height=""7""/><rect x=""14"" y=""14"" width=""7"" height=""7""/><rect x=""3"" y=""14"" width=""7"" height=""7""/></svg>
-                            <span>Dashboard</span>
-                        </SidebarMenuButton>
-                    </SidebarMenuItem>
-                </SidebarMenu>
-            </SidebarGroupContent>
-        </SidebarGroup>
-
-        <SidebarGroup Class=""mt-auto"">
-            <SidebarGroupContent>
-                <SidebarMenu>
-                    <SidebarMenuItem>
-                        <SidebarMenuButton Href=""/settings"" Tooltip=""Settings"" Size=""sm"">
-                            <svg xmlns=""http://www.w3.org/2000/svg"" viewBox=""0 0 24 24"" fill=""none"" stroke=""currentColor"" stroke-width=""2"" class=""size-4""><circle cx=""12"" cy=""12"" r=""3""/><path d=""M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 010 2.83 2 2 0 01-2.83 0l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-2 2 2 2 0 01-2-2v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83 0 2 2 0 010-2.83l.06-.06a1.65 1.65 0 00.33-1.82 1.65 1.65 0 00-1.51-1H3a2 2 0 01-2-2 2 2 0 012-2h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 010-2.83 2 2 0 012.83 0l.06.06a1.65 1.65 0 001.82.33H9a1.65 1.65 0 001-1.51V3a2 2 0 012-2 2 2 0 012 2v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 0 2 2 0 010 2.83l-.06.06a1.65 1.65 0 00-.33 1.82V9a1.65 1.65 0 001.51 1H21a2 2 0 012 2 2 2 0 01-2 2h-.09a1.65 1.65 0 00-1.51 1z""/></svg>
-                            <span>Settings</span>
-                        </SidebarMenuButton>
-                    </SidebarMenuItem>
+                    @foreach (var link in Links)
+                    {
+                        <SidebarMenuItem>
+                            <SidebarMenuButton Href=""@link.Href"" IsActive=""@IsCurrentPath(link.Href)"" Tooltip=""@link.Title"">
+                                @switch (link.Icon)
+                                {
+                                    case ""home"":
+                                        <svg xmlns=""http://www.w3.org/2000/svg"" viewBox=""0 0 24 24"" fill=""none"" stroke=""currentColor"" stroke-width=""2"" class=""size-4""><path d=""M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z""/><path d=""M9 22V12h6v10""/></svg>
+                                        break;
+                                    case ""counter"":
+                                        <svg xmlns=""http://www.w3.org/2000/svg"" viewBox=""0 0 24 24"" fill=""none"" stroke=""currentColor"" stroke-width=""2"" class=""size-4""><circle cx=""12"" cy=""12"" r=""10""/><path d=""M12 8v8M8 12h8""/></svg>
+                                        break;
+                                    case ""weather"":
+                                        <svg xmlns=""http://www.w3.org/2000/svg"" viewBox=""0 0 24 24"" fill=""none"" stroke=""currentColor"" stroke-width=""2"" class=""size-4""><path d=""M17.5 19H9a7 7 0 1 1 6.71-9h1.79a4.5 4.5 0 1 1 0 9z""/></svg>
+                                        break;
+                                    default:
+                                        <svg xmlns=""http://www.w3.org/2000/svg"" viewBox=""0 0 24 24"" fill=""none"" stroke=""currentColor"" stroke-width=""2"" class=""size-4""><path d=""M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z""/><path d=""M14 2v6h6""/></svg>
+                                        break;
+                                }
+                                <span>@link.Title</span>
+                            </SidebarMenuButton>
+                        </SidebarMenuItem>
+                    }
                 </SidebarMenu>
             </SidebarGroupContent>
         </SidebarGroup>
@@ -92,6 +90,13 @@ @inject NavigationManager Navigation
     [Parameter] public string? Class { get; set; }
     [Parameter(CaptureUnmatchedValues = true)] public Dictionary<string, object>? AdditionalAttributes { get; set; }
 
+    private record NavLink(string Title, string Href, string Icon);
+
+    private static readonly NavLink[] Links =
+    [
+        new(""Home"", ""/"", ""home""),
+    ];
+
     private bool IsCurrentPath(string path)
     {
         var uri = new Uri(Navigation.Uri);

From 0bd216a755d083e621af064146e2558335af593d Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Tue, 29 Sep 2026 09:24:08 +0200
Subject: [PATCH 5/6] test: dashboard setup, stock pages and loaders

---
 ShellUI.Tests/DashboardSetupTests.cs          | 208 ++++++++++++++++++
 .../Fixtures/StockBlazor/net10/App.razor.txt  |  22 ++
 .../StockBlazor/net10/Counter.razor.txt       |  19 ++
 .../StockBlazor/net10/Error.razor.txt         |  36 +++
 .../Fixtures/StockBlazor/net10/Home.razor.txt |   7 +
 .../net10/MainLayout.razor.css.txt            |  98 +++++++++
 .../StockBlazor/net10/MainLayout.razor.txt    |  17 ++
 .../StockBlazor/net10/NavMenu.razor.css.txt   | 105 +++++++++
 .../StockBlazor/net10/NavMenu.razor.txt       |  24 ++
 .../StockBlazor/net10/Routes.razor.txt        |   6 +
 .../StockBlazor/net10/Weather.razor.txt       |  64 ++++++
 .../StockBlazor/net8/MainLayout.razor.txt     |  17 ++
 .../StockBlazor/net8/NavMenu.razor.txt        |  24 ++
 .../StockBlazor/net8/Weather.razor.txt        |  64 ++++++
 ShellUI.Tests/InitBootstrapTests.cs           |  36 ++-
 ShellUI.Tests/LoadersTests.cs                 |  43 ++++
 ShellUI.Tests/StockPagesTests.cs              |  90 ++++++++
 17 files changed, 878 insertions(+), 2 deletions(-)
 create mode 100644 ShellUI.Tests/DashboardSetupTests.cs
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net10/App.razor.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net10/Counter.razor.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net10/Error.razor.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net10/Home.razor.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net10/MainLayout.razor.css.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net10/MainLayout.razor.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net10/NavMenu.razor.css.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net10/NavMenu.razor.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net10/Routes.razor.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net10/Weather.razor.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net8/MainLayout.razor.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net8/NavMenu.razor.txt
 create mode 100644 ShellUI.Tests/Fixtures/StockBlazor/net8/Weather.razor.txt
 create mode 100644 ShellUI.Tests/LoadersTests.cs
 create mode 100644 ShellUI.Tests/StockPagesTests.cs

diff --git a/ShellUI.Tests/DashboardSetupTests.cs b/ShellUI.Tests/DashboardSetupTests.cs
new file mode 100644
index 0000000..0b6f486
--- /dev/null
+++ b/ShellUI.Tests/DashboardSetupTests.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using ShellUI.CLI.Services;
+using ShellUI.Core.Models;
+using ShellUI.Templates;
+using Xunit;
+
+namespace ShellUI.Tests;
+
+public class DashboardSetupTests
+{
+    [Theory]
+    [InlineData("02", "dashboard-02")]
+    [InlineData("dashboard-01", "dashboard-01")]
+    [InlineData("1", "dashboard-01")]
+    [InlineData("None", "none")]
+    [InlineData(null, null)]
+    public void ParseDashboardOption_AcceptsShortAndLongForms(string? value, string? expected)
+    {
+        Assert.Equal(expected, DashboardSetup.ParseDashboardOption(value));
+    }
+
+    [Fact]
+    public void ParseDashboardOption_RejectsUnknownValues()
+    {
+        Assert.Throws<ArgumentException>(() => DashboardSetup.ParseDashboardOption("03"));
+    }
+
+    [Fact]
+    public void RewriteDefaultLayout_SwitchesStockRoutes()
+    {
+        var routes = Fixture("net10", "Routes.razor");
+        Assert.Equal("Layout.MainLayout", DashboardSetup.FindDefaultLayout(routes));
+
+        var rewritten = DashboardSetup.RewriteDefaultLayout(routes, "Layout.DashboardLayout02");
+
+        Assert.Contains(@"DefaultLayout=""typeof(Layout.DashboardLayout02)""", rewritten);
+        Assert.Contains("NotFoundPage=\"typeof(Pages.NotFound)\"", rewritten);
+    }
+
+    [Fact]
+    public void FindRoutesFile_AcceptsAuthorizeRouteView()
+    {
+        var root = Path.Combine(Path.GetTempPath(), "shellui-routes-" + Guid.NewGuid().ToString("N"));
+        try
+        {
+            Write(root, "Components/Routes.razor", @"<AuthorizeRouteView RouteData=""routeData"" DefaultLayout=""typeof(Layout.MainLayout)"" />");
+
+            Assert.Equal(Path.Combine(root, "Components", "Routes.razor"), DashboardSetup.FindRoutesFile(root));
+        }
+        finally
+        {
+            Directory.Delete(root, true);
+        }
+    }
+
+    [Fact]
+    public void RewriteDefaultLayout_KeepsRazorExpressionPrefix()
+    {
+        const string wasm = @"<RouteView RouteData=""@routeData"" DefaultLayout=""@typeof(MainLayout)"" />";
+
+        Assert.Equal("MainLayout", DashboardSetup.FindDefaultLayout(wasm));
+        Assert.Contains(@"DefaultLayout=""@typeof(X.Y)""", DashboardSetup.RewriteDefaultLayout(wasm, "X.Y"));
+    }
+
+    [Theory]
+    [InlineData("Components", "Components/Layout", "Layout.DashboardLayout02")]
+    [InlineData("", "Components/Layout", "Components.Layout.DashboardLayout02")]
+    [InlineData("Components", "Components", "DashboardLayout02")]
+    [InlineData("Components", "Shared/Layouts", "global::MyApp.Shared.Layouts.DashboardLayout02")]
+    public void LayoutTypeReference_IsRelativeToTheRoutesNamespace(string routesDir, string layoutPath, string expected)
+    {
+        var cwd = Path.Combine(Path.GetTempPath(), "shellui-app");
+        var dir = routesDir.Length == 0 ? cwd : Path.Combine(cwd, routesDir);
+
+        Assert.Equal(expected, DashboardSetup.LayoutTypeReference(dir, cwd, "MyApp", layoutPath, "DashboardLayout02"));
+    }
+
+    [Theory]
+    [InlineData("net10", "MainLayout.razor")]
+    [InlineData("net10", "MainLayout.razor.css")]
+    [InlineData("net10", "NavMenu.razor")]
+    [InlineData("net10", "NavMenu.razor.css")]
+    [InlineData("net8", "MainLayout.razor")]
+    [InlineData("net8", "NavMenu.razor")]
+    public void IsStockContent_RecognizesTemplateOutput_ForAnyProjectName(string framework, string file)
+    {
+        foreach (var name in new[] { "Contoso.Shop", "A", "App" })
+        {
+            var content = Fixture(framework, file).Replace("\r\n", "\n").Replace(DashboardSetup.StockProjectName, name);
+
+            Assert.True(DashboardSetup.IsStockContent(file, content), name);
+            Assert.True(DashboardSetup.IsStockContent(file, content.Replace("\n", "\r\n")), name);
+        }
+    }
+
+    [Theory]
+    [InlineData("MainLayout.razor")]
+    [InlineData("NavMenu.razor")]
+    public void IsStockContent_RejectsModifiedFiles(string file)
+    {
+        var content = Fixture("net10", file) + "\n<p>custom</p>";
+
+        Assert.False(DashboardSetup.IsStockContent(file, content));
+    }
+
+    [Fact]
+    public void AddErrorUi_InsertsBeforeBodyOnce()
+    {
+        var app = Fixture("net10", "App.razor");
+
+        var patched = DashboardSetup.AddErrorUi(app);
+
+        Assert.Contains(@"id=""blazor-error-ui""", patched);
+        Assert.True(patched.IndexOf("blazor-error-ui", StringComparison.Ordinal) < patched.IndexOf("</body>", StringComparison.Ordinal));
+        Assert.Contains("class=\"dismiss", patched);
+        Assert.Contains("class=\"reload", patched);
+        Assert.Equal(patched, DashboardSetup.AddErrorUi(patched));
+    }
+
+    [Theory]
+    [InlineData("@page \"/not-found\"\r\n@layout MainLayout\r\n\r\n<h3>Not Found</h3>", "@page \"/not-found\"\r\n@layout DashboardLayout02\r\n\r\n<h3>Not Found</h3>")]
+    [InlineData("@layout Layout.MainLayout\n", "@layout Layout.DashboardLayout02\n")]
+    [InlineData("@layout MainLayoutV2\n", "@layout MainLayoutV2\n")]
+    [InlineData("<p>MainLayout</p>", "<p>MainLayout</p>")]
+    public void RetargetLayoutDirective_OnlyTouchesMainLayoutDirectives(string content, string expected)
+    {
+        Assert.Equal(expected, DashboardSetup.RetargetLayoutDirective(content, "MainLayout", "DashboardLayout02"));
+    }
+
+    [Fact]
+    public void RetargetLayoutDirective_FollowsADashboardSwitch()
+    {
+        Assert.Equal("@layout DashboardLayout01\n", DashboardSetup.RetargetLayoutDirective("@layout DashboardLayout02\n", "DashboardLayout02", "DashboardLayout01"));
+    }
+
+    [Theory]
+    [InlineData("/", true)]
+    [InlineData("/counter", true)]
+    [InlineData("/items/{id:int}", false)]
+    [InlineData("/Error", false)]
+    [InlineData("/not-found", false)]
+    [InlineData("/Account/Login", false)]
+    [InlineData("/accounting", true)]
+    public void IsNavigableRoute_SkipsParameterizedAndSystemPages(string href, bool expected)
+    {
+        Assert.Equal(expected, DashboardSetup.IsNavigableRoute(href));
+    }
+
+    [Fact]
+    public void ScanPages_BuildsLinksFromPageDirectives()
+    {
+        var root = Path.Combine(Path.GetTempPath(), "shellui-scan-" + Guid.NewGuid().ToString("N"));
+        try
+        {
+            Write(root, "Components/Pages/Home.razor", "@page \"/\"\n<PageTitle>Home</PageTitle>");
+            Write(root, "Components/Pages/Counter.razor", "@page \"/counter\"\n@rendermode InteractiveServer\n<PageTitle>Counter</PageTitle>");
+            Write(root, "Components/Pages/OrderHistory.razor", "@page \"/orders\"");
+            Write(root, "Components/Pages/Error.razor", "@page \"/Error\"");
+            Write(root, "Components/Pages/Item.razor", "@page \"/items/{id}\"");
+            Write(root, "Components/Account/Pages/Login.razor", "@page \"/Account/Login\"");
+            Write(root, "Components/UI/Demo.razor", "@page \"/ui-demo\"");
+            Write(root, "obj/Debug/Stale.razor", "@page \"/stale\"");
+
+            var links = DashboardSetup.ScanPages(root, new ShellUIConfig());
+
+            Assert.Equal(new[] { "/", "/counter", "/orders" }, links.Select(l => l.Href));
+            Assert.Equal(new[] { "Home", "Counter", "Order History" }, links.Select(l => l.Title));
+            Assert.Equal(new[] { "home", "counter", "page" }, links.Select(l => l.Icon));
+        }
+        finally
+        {
+            Directory.Delete(root, true);
+        }
+    }
+
+    [Fact]
+    public void AppSidebarTemplate_LinksAreRewrittenFromPages()
+    {
+        var sidebar = ComponentRegistry.GetComponentContent("app-sidebar")!;
+        var links = new List<DashboardSetup.PageLink>
+        {
+            new("Home", "/", "home"),
+            new("Weather \"Now\"", "/weather", "weather")
+        };
+
+        var rewritten = DashboardSetup.RewriteSidebarLinks(sidebar, links);
+
+        Assert.NotNull(rewritten);
+        Assert.Contains(@"new(""Weather \""Now\"""", ""/weather"", ""weather""),", rewritten);
+        Assert.DoesNotContain("/settings", rewritten);
+        Assert.DoesNotContain("\"/dashboard\"", rewritten);
+        Assert.Null(DashboardSetup.RewriteSidebarLinks(rewritten!, links));
+    }
+
+    private static void Write(string root, string relative, string content)
+    {
+        var path = Path.Combine(root, relative);
+        Directory.CreateDirectory(Path.GetDirectoryName(path)!);
+        File.WriteAllText(path, content);
+    }
+
+    private static string Fixture(string framework, string file, [CallerFilePath] string thisFile = "") =>
+        File.ReadAllText(Path.Combine(Path.GetDirectoryName(thisFile)!, "Fixtures", "StockBlazor", framework, file + ".txt"));
+}
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net10/App.razor.txt b/ShellUI.Tests/Fixtures/StockBlazor/net10/App.razor.txt
new file mode 100644
index 0000000..2c0cb52
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net10/App.razor.txt
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <base href="/" />
+    <ResourcePreloader />
+    <link rel="stylesheet" href="@Assets["lib/bootstrap/dist/css/bootstrap.min.css"]" />
+    <link rel="stylesheet" href="@Assets["app.css"]" />
+    <link rel="stylesheet" href="@Assets["ShellStockProbe.styles.css"]" />
+    <ImportMap />
+    <link rel="icon" type="image/png" href="favicon.png" />
+    <HeadOutlet />
+</head>
+
+<body>
+    <Routes />
+    <script src="@Assets["_framework/blazor.web.js"]"></script>
+</body>
+
+</html>
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net10/Counter.razor.txt b/ShellUI.Tests/Fixtures/StockBlazor/net10/Counter.razor.txt
new file mode 100644
index 0000000..1a4f8e7
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net10/Counter.razor.txt
@@ -0,0 +1,19 @@
+@page "/counter"
+@rendermode InteractiveServer
+
+<PageTitle>Counter</PageTitle>
+
+<h1>Counter</h1>
+
+<p role="status">Current count: @currentCount</p>
+
+<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
+
+@code {
+    private int currentCount = 0;
+
+    private void IncrementCount()
+    {
+        currentCount++;
+    }
+}
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net10/Error.razor.txt b/ShellUI.Tests/Fixtures/StockBlazor/net10/Error.razor.txt
new file mode 100644
index 0000000..576cc2d
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net10/Error.razor.txt
@@ -0,0 +1,36 @@
+@page "/Error"
+@using System.Diagnostics
+
+<PageTitle>Error</PageTitle>
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>
+
+@if (ShowRequestId)
+{
+    <p>
+        <strong>Request ID:</strong> <code>@RequestId</code>
+    </p>
+}
+
+<h3>Development Mode</h3>
+<p>
+    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
+</p>
+<p>
+    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
+    It can result in displaying sensitive information from exceptions to end users.
+    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
+    and restarting the app.
+</p>
+
+@code{
+    [CascadingParameter]
+    private HttpContext? HttpContext { get; set; }
+
+    private string? RequestId { get; set; }
+    private bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+
+    protected override void OnInitialized() =>
+        RequestId = Activity.Current?.Id ?? HttpContext?.TraceIdentifier;
+}
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net10/Home.razor.txt b/ShellUI.Tests/Fixtures/StockBlazor/net10/Home.razor.txt
new file mode 100644
index 0000000..9001e0b
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net10/Home.razor.txt
@@ -0,0 +1,7 @@
+@page "/"
+
+<PageTitle>Home</PageTitle>
+
+<h1>Hello, world!</h1>
+
+Welcome to your new app.
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net10/MainLayout.razor.css.txt b/ShellUI.Tests/Fixtures/StockBlazor/net10/MainLayout.razor.css.txt
new file mode 100644
index 0000000..38d1f25
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net10/MainLayout.razor.css.txt
@@ -0,0 +1,98 @@
+.page {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+}
+
+main {
+    flex: 1;
+}
+
+.sidebar {
+    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
+}
+
+.top-row {
+    background-color: #f7f7f7;
+    border-bottom: 1px solid #d6d5d5;
+    justify-content: flex-end;
+    height: 3.5rem;
+    display: flex;
+    align-items: center;
+}
+
+    .top-row ::deep a, .top-row ::deep .btn-link {
+        white-space: nowrap;
+        margin-left: 1.5rem;
+        text-decoration: none;
+    }
+
+    .top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
+        text-decoration: underline;
+    }
+
+    .top-row ::deep a:first-child {
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+
+@media (max-width: 640.98px) {
+    .top-row {
+        justify-content: space-between;
+    }
+
+    .top-row ::deep a, .top-row ::deep .btn-link {
+        margin-left: 0;
+    }
+}
+
+@media (min-width: 641px) {
+    .page {
+        flex-direction: row;
+    }
+
+    .sidebar {
+        width: 250px;
+        height: 100vh;
+        position: sticky;
+        top: 0;
+    }
+
+    .top-row {
+        position: sticky;
+        top: 0;
+        z-index: 1;
+    }
+
+    .top-row.auth ::deep a:first-child {
+        flex: 1;
+        text-align: right;
+        width: 0;
+    }
+
+    .top-row, article {
+        padding-left: 2rem !important;
+        padding-right: 1.5rem !important;
+    }
+}
+
+#blazor-error-ui {
+    color-scheme: light only;
+    background: lightyellow;
+    bottom: 0;
+    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+    box-sizing: border-box;
+    display: none;
+    left: 0;
+    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+    position: fixed;
+    width: 100%;
+    z-index: 1000;
+}
+
+    #blazor-error-ui .dismiss {
+        cursor: pointer;
+        position: absolute;
+        right: 0.75rem;
+        top: 0.5rem;
+    }
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net10/MainLayout.razor.txt b/ShellUI.Tests/Fixtures/StockBlazor/net10/MainLayout.razor.txt
new file mode 100644
index 0000000..7cd63fe
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net10/MainLayout.razor.txt
@@ -0,0 +1,17 @@
+@inherits LayoutComponentBase
+
+<div class="page">
+    <div class="sidebar">
+        <NavMenu />
+    </div>
+
+    <main>
+        <div class="top-row px-4">
+            <a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
+        </div>
+
+        <article class="content px-4">
+            @Body
+        </article>
+    </main>
+</div>
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net10/NavMenu.razor.css.txt b/ShellUI.Tests/Fixtures/StockBlazor/net10/NavMenu.razor.css.txt
new file mode 100644
index 0000000..a2aeace
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net10/NavMenu.razor.css.txt
@@ -0,0 +1,105 @@
+.navbar-toggler {
+    appearance: none;
+    cursor: pointer;
+    width: 3.5rem;
+    height: 2.5rem;
+    color: white;
+    position: absolute;
+    top: 0.5rem;
+    right: 1rem;
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
+}
+
+.navbar-toggler:checked {
+    background-color: rgba(255, 255, 255, 0.5);
+}
+
+.top-row {
+    min-height: 3.5rem;
+    background-color: rgba(0,0,0,0.4);
+}
+
+.navbar-brand {
+    font-size: 1.1rem;
+}
+
+.bi {
+    display: inline-block;
+    position: relative;
+    width: 1.25rem;
+    height: 1.25rem;
+    margin-right: 0.75rem;
+    top: -1px;
+    background-size: cover;
+}
+
+.bi-house-door-fill-nav-menu {
+    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
+}
+
+.bi-plus-square-fill-nav-menu {
+    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
+}
+
+.bi-list-nested-nav-menu {
+    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
+}
+
+.nav-item {
+    font-size: 0.9rem;
+    padding-bottom: 0.5rem;
+}
+
+    .nav-item:first-of-type {
+        padding-top: 1rem;
+    }
+
+    .nav-item:last-of-type {
+        padding-bottom: 1rem;
+    }
+
+    .nav-item ::deep .nav-link {
+        color: #d7d7d7;
+        background: none;
+        border: none;
+        border-radius: 4px;
+        height: 3rem;
+        display: flex;
+        align-items: center;
+        line-height: 3rem;
+        width: 100%;
+    }
+
+.nav-item ::deep a.active {
+    background-color: rgba(255,255,255,0.37);
+    color: white;
+}
+
+.nav-item ::deep .nav-link:hover {
+    background-color: rgba(255,255,255,0.1);
+    color: white;
+}
+
+.nav-scrollable {
+    display: none;
+}
+
+.navbar-toggler:checked ~ .nav-scrollable {
+    display: block;
+}
+
+@media (min-width: 641px) {
+    .navbar-toggler {
+        display: none;
+    }
+
+    .nav-scrollable {
+        /* Never collapse the sidebar for wide screens */
+        display: block;
+
+        /* Allow sidebar to scroll for tall menus */
+        height: calc(100vh - 3.5rem);
+        overflow-y: auto;
+    }
+}
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net10/NavMenu.razor.txt b/ShellUI.Tests/Fixtures/StockBlazor/net10/NavMenu.razor.txt
new file mode 100644
index 0000000..c5e5ada
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net10/NavMenu.razor.txt
@@ -0,0 +1,24 @@
+<div class="top-row ps-3 navbar navbar-dark">
+    <div class="container-fluid">
+        <a class="navbar-brand" href="">ShellStockProbe</a>
+    </div>
+</div>
+
+<input type="checkbox" title="Navigation menu" class="navbar-toggler" />
+
+<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
+    <nav class="nav flex-column">
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
+                <span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
+            </NavLink>
+        </div>
+
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="weather">
+                <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
+            </NavLink>
+        </div>
+    </nav>
+</div>
+
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net10/Routes.razor.txt b/ShellUI.Tests/Fixtures/StockBlazor/net10/Routes.razor.txt
new file mode 100644
index 0000000..105855d
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net10/Routes.razor.txt
@@ -0,0 +1,6 @@
+<Router AppAssembly="typeof(Program).Assembly" NotFoundPage="typeof(Pages.NotFound)">
+    <Found Context="routeData">
+        <RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
+        <FocusOnNavigate RouteData="routeData" Selector="h1" />
+    </Found>
+</Router>
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net10/Weather.razor.txt b/ShellUI.Tests/Fixtures/StockBlazor/net10/Weather.razor.txt
new file mode 100644
index 0000000..f437e5e
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net10/Weather.razor.txt
@@ -0,0 +1,64 @@
+@page "/weather"
+@attribute [StreamRendering]
+
+<PageTitle>Weather</PageTitle>
+
+<h1>Weather</h1>
+
+<p>This component demonstrates showing data.</p>
+
+@if (forecasts == null)
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Date</th>
+                <th aria-label="Temperature in Celsius">Temp. (C)</th>
+                <th aria-label="Temperature in Fahrenheit">Temp. (F)</th>
+                <th>Summary</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var forecast in forecasts)
+            {
+                <tr>
+                    <td>@forecast.Date.ToShortDateString()</td>
+                    <td>@forecast.TemperatureC</td>
+                    <td>@forecast.TemperatureF</td>
+                    <td>@forecast.Summary</td>
+                </tr>
+            }
+        </tbody>
+    </table>
+}
+
+@code {
+    private WeatherForecast[]? forecasts;
+
+    protected override async Task OnInitializedAsync()
+    {
+        // Simulate asynchronous loading to demonstrate streaming rendering
+        await Task.Delay(500);
+
+        var startDate = DateOnly.FromDateTime(DateTime.Now);
+        var summaries = new[] { "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" };
+        forecasts = Enumerable.Range(1, 5).Select(index => new WeatherForecast
+        {
+            Date = startDate.AddDays(index),
+            TemperatureC = Random.Shared.Next(-20, 55),
+            Summary = summaries[Random.Shared.Next(summaries.Length)]
+        }).ToArray();
+    }
+
+    private class WeatherForecast
+    {
+        public DateOnly Date { get; set; }
+        public int TemperatureC { get; set; }
+        public string? Summary { get; set; }
+        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
+    }
+}
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net8/MainLayout.razor.txt b/ShellUI.Tests/Fixtures/StockBlazor/net8/MainLayout.razor.txt
new file mode 100644
index 0000000..7cd63fe
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net8/MainLayout.razor.txt
@@ -0,0 +1,17 @@
+@inherits LayoutComponentBase
+
+<div class="page">
+    <div class="sidebar">
+        <NavMenu />
+    </div>
+
+    <main>
+        <div class="top-row px-4">
+            <a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
+        </div>
+
+        <article class="content px-4">
+            @Body
+        </article>
+    </main>
+</div>
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net8/NavMenu.razor.txt b/ShellUI.Tests/Fixtures/StockBlazor/net8/NavMenu.razor.txt
new file mode 100644
index 0000000..c6ba2a1
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net8/NavMenu.razor.txt
@@ -0,0 +1,24 @@
+<div class="top-row ps-3 navbar navbar-dark">
+    <div class="container-fluid">
+        <a class="navbar-brand" href="">ShellStockProbe</a>
+    </div>
+</div>
+
+<input type="checkbox" title="Navigation menu" class="navbar-toggler" />
+
+<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
+    <nav class="flex-column">
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
+                <span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
+            </NavLink>
+        </div>
+
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="weather">
+                <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
+            </NavLink>
+        </div>
+    </nav>
+</div>
+
diff --git a/ShellUI.Tests/Fixtures/StockBlazor/net8/Weather.razor.txt b/ShellUI.Tests/Fixtures/StockBlazor/net8/Weather.razor.txt
new file mode 100644
index 0000000..43a1ecb
--- /dev/null
+++ b/ShellUI.Tests/Fixtures/StockBlazor/net8/Weather.razor.txt
@@ -0,0 +1,64 @@
+@page "/weather"
+@attribute [StreamRendering]
+
+<PageTitle>Weather</PageTitle>
+
+<h1>Weather</h1>
+
+<p>This component demonstrates showing data.</p>
+
+@if (forecasts == null)
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Date</th>
+                <th>Temp. (C)</th>
+                <th>Temp. (F)</th>
+                <th>Summary</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var forecast in forecasts)
+            {
+                <tr>
+                    <td>@forecast.Date.ToShortDateString()</td>
+                    <td>@forecast.TemperatureC</td>
+                    <td>@forecast.TemperatureF</td>
+                    <td>@forecast.Summary</td>
+                </tr>
+            }
+        </tbody>
+    </table>
+}
+
+@code {
+    private WeatherForecast[]? forecasts;
+
+    protected override async Task OnInitializedAsync()
+    {
+        // Simulate asynchronous loading to demonstrate streaming rendering
+        await Task.Delay(500);
+
+        var startDate = DateOnly.FromDateTime(DateTime.Now);
+        var summaries = new[] { "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" };
+        forecasts = Enumerable.Range(1, 5).Select(index => new WeatherForecast
+        {
+            Date = startDate.AddDays(index),
+            TemperatureC = Random.Shared.Next(-20, 55),
+            Summary = summaries[Random.Shared.Next(summaries.Length)]
+        }).ToArray();
+    }
+
+    private class WeatherForecast
+    {
+        public DateOnly Date { get; set; }
+        public int TemperatureC { get; set; }
+        public string? Summary { get; set; }
+        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
+    }
+}
diff --git a/ShellUI.Tests/InitBootstrapTests.cs b/ShellUI.Tests/InitBootstrapTests.cs
index bedaecd..4394e8e 100644
--- a/ShellUI.Tests/InitBootstrapTests.cs
+++ b/ShellUI.Tests/InitBootstrapTests.cs
@@ -1,4 +1,5 @@
 using ShellUI.CLI.Services;
+using ShellUI.Templates;
 using Xunit;
 
 namespace ShellUI.Tests;
@@ -28,6 +29,27 @@ public class InitBootstrapTests
 </html>
 ";
 
+    [Theory]
+    [InlineData(@"    <link rel=""stylesheet"" href=""@Assets[""lib/bootstrap/dist/css/bootstrap.min.css""]"" />")]
+    [InlineData(@"    <link rel=""stylesheet"" href=""bootstrap/bootstrap.min.css"" />")]
+    public void RewriteAppRazor_RemovesTheDeletedLocalBootstrapLink(string link)
+    {
+        var app = FreshAppRazor.Replace("    <link rel=\"stylesheet\" href=\"@Assets[\"app.css\"]\" />", link + "\n    <link rel=\"stylesheet\" href=\"@Assets[\"app.css\"]\" />");
+
+        var result = InitService.RewriteAppRazor(app);
+
+        Assert.DoesNotContain("bootstrap.min.css", result);
+        Assert.Contains("@Assets[\"app.css\"]", result);
+    }
+
+    [Fact]
+    public void RewriteAppRazor_KeepsCdnBootstrap()
+    {
+        const string cdn = @"<link rel=""stylesheet"" href=""https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"" />";
+
+        Assert.Contains(cdn, InitService.RewriteAppRazor(FreshAppRazor.Replace("<ImportMap />", cdn + "\n    <ImportMap />")));
+    }
+
     [Fact]
     public void RewriteAppRazor_AddsRenderModeToHeadOutletAndRoutes()
     {
@@ -138,7 +160,7 @@ public class RequiredImportsTests
     [Fact]
     public void VariantsAndModelsFiles_AddTheirNamespaces()
     {
-        var imports = ComponentInstaller.RequiredImports("App", new[] { "Button.razor", "Variants/ButtonVariants.cs", "Models/CommandModels.cs" }).ToList();
+        var imports = ComponentInstaller.RequiredImports("App", Contents("button", "button-variants", "command-models")).ToList();
 
         Assert.Equal(new[] { "@using App.Components.UI.Variants", "@using App.Components.Models" }, imports);
     }
@@ -146,8 +168,18 @@ public void VariantsAndModelsFiles_AddTheirNamespaces()
     [Fact]
     public void PlainComponents_AddNothing()
     {
-        Assert.Empty(ComponentInstaller.RequiredImports("App", new[] { "Kbd.razor", "../../wwwroot/shellui.js" }));
+        Assert.Empty(ComponentInstaller.RequiredImports("App", Contents("kbd", "shellui-js")));
     }
+
+    [Fact]
+    public void VariantsFileInTheUiNamespace_AddsNothing()
+    {
+        // AvatarVariants sits in Variants/ but declares Components.UI; a Variants using would not compile.
+        Assert.Empty(ComponentInstaller.RequiredImports("App", Contents("avatar", "avatar-variants")));
+    }
+
+    private static IEnumerable<string> Contents(params string[] names) =>
+        names.Select(n => ComponentRegistry.GetComponentContent(n) ?? throw new InvalidOperationException(n));
 }
 
 public class InputCssTests
diff --git a/ShellUI.Tests/LoadersTests.cs b/ShellUI.Tests/LoadersTests.cs
new file mode 100644
index 0000000..e6f8bbb
--- /dev/null
+++ b/ShellUI.Tests/LoadersTests.cs
@@ -0,0 +1,43 @@
+using System.Linq;
+using ShellUI.CLI.Services;
+using Xunit;
+
+namespace ShellUI.Tests;
+
+public class LoadersTests
+{
+    [Fact]
+    public void SnakeSpinner_WalksTheGridEdgeWithAThreeDotTrail()
+    {
+        var frames = SnakeSpinner.Instance.Frames;
+
+        Assert.Equal(8, frames.Count);
+        Assert.Equal(8, frames.Distinct().Count());
+        foreach (var frame in frames)
+        {
+            Assert.Equal(2, frame.Length);
+            Assert.All(frame, ch => Assert.InRange(ch, '⠀', '⣿'));
+            Assert.Equal(3, frame.Sum(ch => System.Numerics.BitOperations.PopCount((uint)(ch - 0x2800))));
+        }
+
+        // The centre cell (row 1, column 1 → first character, dot 0x10) is never part of the snake path.
+        Assert.DoesNotContain(frames, f => ((f[0] - 0x2800) & 0x10) != 0);
+    }
+
+    [Fact]
+    public void Braille_MapsGridCellsToDots()
+    {
+        Assert.Equal("⠉⠁", SnakeSpinner.Braille(i => i < 3));
+        Assert.Equal("⠇⠀", SnakeSpinner.Braille(i => i % 3 == 0));
+    }
+
+    [Fact]
+    public void LogoLoader_BuildsTheMarkAlongTheDiagonalThenClearsIt()
+    {
+        Assert.Equal(new[] { "X....", ".....", ".....", ".....", "....." }, LogoLoader.Frame(0));
+        Assert.Equal(new[] { "X...X", ".X..X", "..X.X", ".X..X", "X...X" }, LogoLoader.Frame(8));
+        Assert.Equal(LogoLoader.Frame(8), LogoLoader.Frame(14));
+        Assert.Equal(new[] { ".....", ".....", ".....", ".....", "....." }, LogoLoader.Frame(29));
+        Assert.Equal(LogoLoader.Frame(0), LogoLoader.Frame(30));
+    }
+}
diff --git a/ShellUI.Tests/StockPagesTests.cs b/ShellUI.Tests/StockPagesTests.cs
new file mode 100644
index 0000000..e5b07a8
--- /dev/null
+++ b/ShellUI.Tests/StockPagesTests.cs
@@ -0,0 +1,90 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using ShellUI.CLI.Services;
+using Xunit;
+
+namespace ShellUI.Tests;
+
+public class StockPagesTests
+{
+    [Theory]
+    [InlineData("net10", "Home.razor")]
+    [InlineData("net10", "Counter.razor")]
+    [InlineData("net10", "Weather.razor")]
+    [InlineData("net10", "Error.razor")]
+    [InlineData("net8", "Weather.razor")]
+    public void Restyle_ReplacesBootstrapInStockPages(string framework, string file)
+    {
+        var content = Fixture(framework, file);
+        Assert.True(StockPages.IsStock(file, content));
+
+        var restyled = StockPages.Restyle(file, content);
+
+        Assert.False(StockPages.UsesBootstrap(restyled));
+        Assert.DoesNotContain("class=\"table\"", restyled);
+        Assert.DoesNotContain("<h1>", restyled);
+        Assert.False(StockPages.IsStock(file, restyled));
+        if (file != "Home.razor")
+            Assert.Equal(restyled, StockPages.Restyle(file, restyled));
+    }
+
+    [Fact]
+    public void Restyle_TurnsStockHomeIntoThemeCard()
+    {
+        var home = StockPages.Restyle("Home.razor", Fixture("net10", "Home.razor"));
+
+        Assert.StartsWith("@page \"/\"", home);
+        Assert.Contains("<PageTitle>Home</PageTitle>", home);
+        Assert.Contains("shellui theme apply https://tweakcn.com/themes/&lt;id&gt;", home);
+        Assert.Contains("href=\"https://tweakcn.com\"", home);
+        Assert.Contains("\r\n", home);
+    }
+
+    [Fact]
+    public void Restyle_KeepsCounterBehavior()
+    {
+        var restyled = StockPages.Restyle("Counter.razor", Fixture("net10", "Counter.razor"));
+
+        Assert.Contains("@rendermode InteractiveServer", restyled);
+        Assert.Contains("@onclick=\"IncrementCount\"", restyled);
+        Assert.Contains("bg-primary", restyled);
+    }
+
+    [Fact]
+    public void Apply_RestylesStockPagesAndReportsEditedOnes()
+    {
+        var root = Path.Combine(Path.GetTempPath(), "shellui-pages-" + Guid.NewGuid().ToString("N"));
+        try
+        {
+            Write(root, "Components/Pages/Counter.razor", Fixture("net10", "Counter.razor"));
+            Write(root, "Components/Pages/Weather.razor", Fixture("net10", "Weather.razor") + "\n<p>mine</p>");
+            Write(root, "Components/Account/Pages/Login.razor", "<button class=\"w-100 btn btn-lg btn-primary\">Log in</button>");
+            Write(root, "Components/UI/Button.razor", "<button class=\"btn\"></button>");
+
+            var result = StockPages.Apply(root, new[] { "Components/UI", "Components/Layout" });
+
+            Assert.Equal(new[] { "Components/Pages/Counter.razor" }, result.Restyled);
+            Assert.False(StockPages.UsesBootstrap(File.ReadAllText(Path.Combine(root, "Components/Pages/Counter.razor"))));
+            Assert.Equal(2, result.Notes.Count);
+            Assert.Contains(result.Notes, n => n.Contains("Components/Pages/Weather.razor") && n.Contains("modified"));
+            Assert.Contains(result.Notes, n => n.StartsWith("1 Identity page"));
+            Assert.Contains("<p>mine</p>", File.ReadAllText(Path.Combine(root, "Components/Pages/Weather.razor")));
+        }
+        finally
+        {
+            Directory.Delete(root, true);
+        }
+    }
+
+    private static void Write(string root, string relative, string content)
+    {
+        var path = Path.Combine(root, relative);
+        Directory.CreateDirectory(Path.GetDirectoryName(path)!);
+        File.WriteAllText(path, content);
+    }
+
+    private static string Fixture(string framework, string file, [CallerFilePath] string thisFile = "") =>
+        File.ReadAllText(Path.Combine(Path.GetDirectoryName(thisFile)!, "Fixtures", "StockBlazor", framework, file + ".txt"));
+}

From 54471bde678b4f4df37892eccce83ab083b1be02 Mon Sep 17 00:00:00 2001
From: Shewatipa Tseisi <shewatipa@chips.co.zw>
Date: Tue, 29 Sep 2026 09:37:22 +0200
Subject: [PATCH 6/6] test: don't depend on checkout line endings in the Home
 restyle test

---
 ShellUI.Tests/StockPagesTests.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ShellUI.Tests/StockPagesTests.cs b/ShellUI.Tests/StockPagesTests.cs
index e5b07a8..292e361 100644
--- a/ShellUI.Tests/StockPagesTests.cs
+++ b/ShellUI.Tests/StockPagesTests.cs
@@ -30,16 +30,20 @@ public void Restyle_ReplacesBootstrapInStockPages(string framework, string file)
             Assert.Equal(restyled, StockPages.Restyle(file, restyled));
     }
 
-    [Fact]
-    public void Restyle_TurnsStockHomeIntoThemeCard()
+    [Theory]
+    [InlineData("\n")]
+    [InlineData("\r\n")]
+    public void Restyle_TurnsStockHomeIntoThemeCard_KeepingLineEndings(string newline)
     {
-        var home = StockPages.Restyle("Home.razor", Fixture("net10", "Home.razor"));
+        var stock = Fixture("net10", "Home.razor").Replace("\r\n", "\n").Replace("\n", newline);
+
+        var home = StockPages.Restyle("Home.razor", stock);
 
         Assert.StartsWith("@page \"/\"", home);
         Assert.Contains("<PageTitle>Home</PageTitle>", home);
         Assert.Contains("shellui theme apply https://tweakcn.com/themes/&lt;id&gt;", home);
         Assert.Contains("href=\"https://tweakcn.com\"", home);
-        Assert.Contains("\r\n", home);
+        Assert.Equal(newline == "\r\n", home.Contains("\r\n"));
     }
 
     [Fact]