From 5dd42e91dbe1f6a68b5a2a415221de9e75d6ae9a Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Wed, 25 Dec 2024 09:37:50 +0330
Subject: [PATCH 01/28] feat(blazorui): add BitProLayout component #9502
 (#9509)

---
 .../Components/ProLayout/BitCascadingValue.cs |  44 ++++++
 .../ProLayout/BitCascadingValueProvider.cs    |  69 +++++++++
 .../Components/ProLayout/BitProLayout.razor   |  23 +++
 .../ProLayout/BitProLayout.razor.cs           |  38 +++++
 .../Components/ProLayout/BitProLayout.scss    |  54 +++++++
 .../ProLayout/BitProLayoutClassStyles.cs      |  39 +++++
 .../Bit.BlazorUI.Extras/Scripts/general.ts    |   4 +
 .../Styles/bit.blazorui.extras.scss           |   3 +-
 .../Styles/components.scss                    |   1 +
 .../Styles/extra-variables.scss               |  17 +++
 .../Bit.BlazorUI.Extras/Styles/general.scss   |  21 +++
 .../Components/ComponentExampleBox.razor      |  51 ++++---
 .../Extras/ProLayout/BitProLayoutDemo.razor   |  24 ++++
 .../ProLayout/BitProLayoutDemo.razor.cs       | 133 ++++++++++++++++++
 .../ProLayout/BitProLayoutDemo.razor.scss     |   0
 .../Pages/Home/ComponentsSection.razor        |   3 +
 .../Shared/NavMenu.razor.cs                   |   1 +
 17 files changed, 502 insertions(+), 23 deletions(-)
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValue.cs
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValueProvider.cs
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor.cs
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.scss
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayoutClassStyles.cs
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Scripts/general.ts
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Styles/extra-variables.scss
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Styles/general.scss
 create mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor
 create mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.cs
 create mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.scss

diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValue.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValue.cs
new file mode 100644
index 0000000000..16f09199d0
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValue.cs
@@ -0,0 +1,44 @@
+namespace Bit.BlazorUI;
+
+/// <summary>
+/// The cascading value to be provided using the <see cref="BitCascadingValueProvider"/> component.
+/// </summary>
+public class BitCascadingValue
+{
+    /// <summary>
+    /// The optional name of the cascading value.
+    /// </summary>
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// The value to be provided.
+    /// </summary>
+    public object? Value { get; set; }
+
+    /// <summary>
+    /// If true, indicates that <see cref="Value"/> will not change.
+    /// </summary>
+    public bool IsFixed { get; set; }
+
+
+
+    public BitCascadingValue() { }
+    public BitCascadingValue(object? value, string? name = null) : this(value, name, false) { }
+    public BitCascadingValue(object? value, bool isFixed) : this(value, null, isFixed) { }
+    public BitCascadingValue(object? value, string? name, bool isFixed)
+    {
+        Value = value;
+        Name = name;
+        IsFixed = isFixed;
+    }
+
+
+
+    public static implicit operator BitCascadingValue(int value) => new(value);
+    public static implicit operator BitCascadingValue(int? value) => new(value);
+    public static implicit operator BitCascadingValue(bool value) => new(value);
+    public static implicit operator BitCascadingValue(bool? value) => new(value);
+    public static implicit operator BitCascadingValue(string value) => new(value);
+    public static implicit operator BitCascadingValue(BitDir? value) => new(value);
+    public static implicit operator BitCascadingValue(RouteData value) => new(value);
+}
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValueProvider.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValueProvider.cs
new file mode 100644
index 0000000000..4dc929cf99
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValueProvider.cs
@@ -0,0 +1,69 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace Bit.BlazorUI;
+
+/// <summary>
+/// A component that provides a list of cascading values to all descendant components.
+/// </summary>
+public class BitCascadingValueProvider : ComponentBase
+{
+    /// <summary>
+    /// The content to which the values should be provided.
+    /// </summary>
+    [Parameter] public RenderFragment? ChildContent { get; set; }
+
+    /// <summary>
+    /// The cascading values to be provided for the children.
+    /// </summary>
+    [Parameter] public IEnumerable<BitCascadingValue>? Values { get; set; }
+
+
+
+    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+    private Type _cascadingValueType = typeof(CascadingValue<>);
+
+
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitCascadingValue))]
+    protected override void BuildRenderTree(RenderTreeBuilder builder)
+    {
+        var seq = 0;
+        RenderFragment? rf = ChildContent;
+
+        foreach (var value in Values ?? [])
+        {
+            if (value.Value is null) continue;
+
+            var r = rf;
+            var s = seq;
+            var v = value;
+
+            rf = b => { CreateCascadingValue(b, s, v.Name, v.Value, v.IsFixed, r); };
+
+            seq += v.Name.HasValue() ? 5 : 4;
+        }
+
+        builder.AddContent(seq, rf);
+    }
+
+
+    private void CreateCascadingValue(RenderTreeBuilder builder,
+        int seq,
+        string? name,
+        object value,
+        bool isFixed,
+        RenderFragment? childContent)
+    {
+#pragma warning disable IL2055 // Either the type on which the MakeGenericType is called can't be statically determined, or the type parameters to be used for generic arguments can't be statically determined.
+        builder.OpenComponent(seq, _cascadingValueType.MakeGenericType(value.GetType()));
+#pragma warning restore IL2055 // Either the type on which the MakeGenericType is called can't be statically determined, or the type parameters to be used for generic arguments can't be statically determined.
+        if (string.IsNullOrEmpty(name) is false)
+        {
+            builder.AddComponentParameter(++seq, "Name", name);
+        }
+        builder.AddComponentParameter(++seq, "Value", value);
+        builder.AddComponentParameter(++seq, "IsFixed", isFixed);
+        builder.AddComponentParameter(++seq, "ChildContent", childContent);
+        builder.CloseComponent();
+    }
+}
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor
new file mode 100644
index 0000000000..0b25c15ac0
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor
@@ -0,0 +1,23 @@
+@namespace Bit.BlazorUI
+@inherits BitComponentBase
+
+<div @ref="RootElement"
+     @attributes="HtmlAttributes"
+     id="@_Id"
+     style="@StyleBuilder.Value"
+     class="@ClassBuilder.Value"
+     dir="@Dir?.ToString().ToLower()">
+    <div style="@Styles?.Top" class="bit-ply-top @Classes?.Top" />
+    <div style="@Styles?.Center"
+         class="bit-ply-center @Classes?.Center"
+         dir="@Dir?.ToString().ToLower()">
+        <div style="@Styles?.Left" class="bit-ply-left @Classes?.Left"></div>
+        <div style="@Styles?.Main" class="bit-ply-main @Classes?.Main">
+            <BitCascadingValueProvider Values="CascadingValues">
+                @ChildContent
+            </BitCascadingValueProvider>
+        </div>
+        <div style="@Styles?.Right" class="bit-ply-right @Classes?.Right"></div>
+    </div>
+    <div style="@Styles?.Bottom" class="bit-ply-bottom @Classes?.Bottom"></div>
+</div>
\ No newline at end of file
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor.cs
new file mode 100644
index 0000000000..af75a24d4a
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor.cs
@@ -0,0 +1,38 @@
+namespace Bit.BlazorUI;
+
+public partial class BitProLayout : BitComponentBase
+{
+    /// <summary>
+    /// The cascading values to be provided for the children of the layout.
+    /// </summary>
+    [Parameter] public IEnumerable<BitCascadingValue>? CascadingValues { get; set; }
+
+    /// <summary>
+    /// The content of the layout.
+    /// </summary>
+    [Parameter] public RenderFragment? ChildContent { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes for different parts of the layout.
+    /// </summary>
+    [Parameter] public BitProLayoutClassStyles? Classes { get; set; }
+
+    /// <summary>
+    /// Custom CSS styles for different parts of the layout.
+    /// </summary>
+    [Parameter] public BitProLayoutClassStyles? Styles { get; set; }
+
+
+
+    protected override string RootElementClass => "bit-ply";
+
+    protected override void RegisterCssClasses()
+    {
+        ClassBuilder.Register(() => Classes?.Root);
+    }
+
+    protected override void RegisterCssStyles()
+    {
+        StyleBuilder.Register(() => Styles?.Root);
+    }
+}
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.scss
new file mode 100644
index 0000000000..81b2fa70d4
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.scss
@@ -0,0 +1,54 @@
+@import '../../Styles/extra-variables.scss';
+@import '../../../Bit.BlazorUI/Styles/functions.scss';
+
+.bit-ply {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    background-color: $clr-bg-pri;
+}
+
+.bit-ply-top {
+    width: 100%;
+    z-index: 999999;
+    height: $bit-env-inset-top;
+    background-color: $clr-bg-pri;
+}
+
+.bit-ply-bottom {
+    width: 100%;
+    z-index: 999999;
+    height: $bit-env-inset-bottom;
+    background-color: $clr-bg-pri;
+}
+
+.bit-ply-center {
+    width: 100%;
+    display: flex;
+    height: calc(100% - $bit-env-inset-top - $bit-env-inset-bottom);
+}
+
+.bit-ply-main {
+    height: 100%;
+    display: flex;
+    overflow: auto;
+    position: relative;
+    scroll-behavior: smooth;
+    overscroll-behavior: none;
+    width: calc(100% - $bit-env-inset-left - $bit-env-inset-right);
+}
+
+.bit-ply-left {
+    height: 100%;
+    z-index: 999999;
+    width: $bit-env-inset-left;
+    background-color: $clr-bg-pri;
+}
+
+.bit-ply-right {
+    height: 100%;
+    z-index: 999999;
+    width: $bit-env-inset-right;
+    background-color: $clr-bg-pri;
+}
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayoutClassStyles.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayoutClassStyles.cs
new file mode 100644
index 0000000000..6793afc5ca
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayoutClassStyles.cs
@@ -0,0 +1,39 @@
+namespace Bit.BlazorUI;
+
+public class BitProLayoutClassStyles
+{
+    /// <summary>
+    /// Custom CSS classes/styles for the root of the BitProLayout.
+    /// </summary>
+    public string? Root { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the top area of the BitProLayout.
+    /// </summary>
+    public string? Top { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the center area of the BitProLayout.
+    /// </summary>
+    public string? Center { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the left area of the BitProLayout.
+    /// </summary>
+    public string? Left { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the main area of the BitProLayout.
+    /// </summary>
+    public string? Main { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the right area of the BitProLayout.
+    /// </summary>
+    public string? Right { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the bottom area of the BitProLayout.
+    /// </summary>
+    public string? Bottom { get; set; }
+}
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Scripts/general.ts b/src/BlazorUI/Bit.BlazorUI.Extras/Scripts/general.ts
new file mode 100644
index 0000000000..d19e62953b
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Scripts/general.ts
@@ -0,0 +1,4 @@
+window.addEventListener('load', () => {
+    document.documentElement.style.setProperty('--bit-env-win-width', `${window.innerWidth}px`);
+    document.documentElement.style.setProperty('--bit-env-win-height', `${window.innerHeight}px`);
+});
\ No newline at end of file
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Styles/bit.blazorui.extras.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/bit.blazorui.extras.scss
index 4d58f1782c..eb02b8b603 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Styles/bit.blazorui.extras.scss
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/bit.blazorui.extras.scss
@@ -1,2 +1,3 @@
-@import "components.scss";
+@import "general.scss";
+@import "components.scss";
 @import "fabric.mdl2.bit.blazoui.extras.scss";
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Styles/components.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/components.scss
index ca46bd9aef..7dcba98b06 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Styles/components.scss
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/components.scss
@@ -2,3 +2,4 @@
 @import "../Components/DataGrid/Pagination/BitDataGridPaginator.scss";
 @import "../Components/PdfReader/BitPdfReader.scss";
 @import "../Components/ProPanel/BitProPanel.scss";
+@import "../Components/ProLayout/BitProLayout.scss";
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Styles/extra-variables.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/extra-variables.scss
new file mode 100644
index 0000000000..8f09e8a4e9
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/extra-variables.scss
@@ -0,0 +1,17 @@
+$bit-env-inset-top: var(--bit-env-inset-top);
+$bit-env-inset-left: var(--bit-env-inset-left);
+$bit-env-inset-right: var(--bit-env-inset-right);
+$bit-env-inset-bottom: var(--bit-env-inset-bottom);
+//--
+$bit-env-width-vw: var(--bit-env-width-vw);
+$bit-env-height-vh: var(--bit-env-height-vh);
+$bit-env-width-percent: var(--bit-env-width-per);
+$bit-env-height-percent: var(--bit-env-height-per);
+$bit-env-width-available: var(--bit-env-width-avl);
+$bit-env-height-available: var(--bit-env-height-avl);
+//--
+$bit-env-inset-inline-start: var(--bit-env-inset-inline-start);
+$bit-env-inset-inline-end: var(--bit-env-inset-inline-end);
+//--
+$bit-env-window-width: var(--bit-env-win-width);
+$bit-env-window-height: var(--bit-env-win-height);
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Styles/general.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/general.scss
new file mode 100644
index 0000000000..d77e2b499d
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/general.scss
@@ -0,0 +1,21 @@
+:root {
+    --bit-env-inset-top: env(safe-area-inset-top, 0px);
+    --bit-env-inset-left: env(safe-area-inset-left, 0px);
+    --bit-env-inset-right: env(safe-area-inset-right, 0px);
+    --bit-env-inset-bottom: env(safe-area-inset-bottom, 0px);
+    //--
+    --bit-env-width-vw: calc(100vw - var(--bit-env-inset-left) - var(--bit-env-inset-right));
+    --bit-env-height-vh: calc(100vh - var(--bit-env-inset-top) - var(--bit-env-inset-bottom));
+    --bit-env-width-per: calc(100% - var(--bit-env-inset-left) - var(--bit-env-inset-right));
+    --bit-env-height-per: calc(100% - var(--bit-env-inset-top) - var(--bit-env-inset-bottom));
+    --bit-env-width-avl: calc(var(--bit-env-win-width) - var(--bit-env-inset-left) - var(--bit-env-inset-right));
+    --bit-env-height-avl: calc(var(--bit-env-win-height) - var(--bit-env-inset-top) - var(--bit-env-inset-bottom));
+    //--
+    --bit-env-inset-inline-start: var(--bit-env-inset-left);
+    --bit-env-inset-inline-end: var(--bit-env-inset-right);
+
+    [dir="rtl"] {
+        --bit-env-inset-inline-start: var(--bit-env-inset-right);
+        --bit-env-inset-inline-end: var(--bit-env-inset-left);
+    }
+}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Components/ComponentExampleBox.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Components/ComponentExampleBox.razor
index dd473865ca..f8a69fc59a 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Components/ComponentExampleBox.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Components/ComponentExampleBox.razor
@@ -3,25 +3,28 @@
 <section class="box">
     <div class="box-header">
         <BitText Typography="BitTypography.H5" Class="section-title" Id="@Id" example-section-title>@Title</BitText>
-        <div class="header-btn-group">
-            <BitActionButton OnClick="() => showCode = !showCode"
-                             Class="@($"header-btn show-code{(showCode ? " code-shown":"")}")"
-                             Classes="@(new() { Content = "show-code-lbl" })"
-                             IconName="@BitIconName.CodeEdit"
-                             Title="@(showCode ? "Hide code" : "Show code")">
-                @(showCode ? "Hide code" : "Show code")
-            </BitActionButton>
-            <BitActionButton Class="@($"header-btn copy-link {(isLinkCopied ? "copied" : "")}")"
-                             Styles="@(new() { Content = (isLinkCopied ? "" : "display: none") })"
-                             Title="@copyLinkMessage"
-                             IconName="@linkIcon"
-                             OnClick="@CopyLinkToClipboard">
-                @if (isLinkCopied)
-                {
-                    <span>@copyLinkMessage</span>
-                }
-            </BitActionButton>
-        </div>
+        @if (RazorCode is not null || CsharpCode is not null)
+        {
+            <div class="header-btn-group">
+                <BitActionButton OnClick="() => showCode = !showCode"
+                                 Class="@($"header-btn show-code{(showCode ? " code-shown":"")}")"
+                                 Classes="@(new() { Content = "show-code-lbl" })"
+                                 IconName="@BitIconName.CodeEdit"
+                                 Title="@(showCode ? "Hide code" : "Show code")">
+                    @(showCode ? "Hide code" : "Show code")
+                </BitActionButton>
+                <BitActionButton Class="@($"header-btn copy-link {(isLinkCopied ? "copied" : "")}")"
+                                 Styles="@(new() { Content = (isLinkCopied ? "" : "display: none") })"
+                                 Title="@copyLinkMessage"
+                                 IconName="@linkIcon"
+                                 OnClick="@CopyLinkToClipboard">
+                    @if (isLinkCopied)
+                    {
+                        <span>@copyLinkMessage</span>
+                    }
+                </BitActionButton>
+            </div>
+        }
     </div>
 
     <div class="box-content">
@@ -39,14 +42,18 @@
             </BitActionButton>
 
             <pre class="code">
-                <code class="language-cshtml">@RazorCode.Trim()</code>
+                
+                <code class="language-cshtml">
+                    @RazorCode?.Trim()
+                </code>
 
                 @if (CsharpCode.HasValue())
                 {
                     <code class="language-csharp">
 &#64code {
-     @CsharpCode.Trim().Replace("\n", "\n     ")
-}</code>
+    @CsharpCode?.Trim().Replace("\n", "\n     ")
+}
+                    </code>
                 }
             </pre>
         }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor
new file mode 100644
index 0000000000..c8f12f1d69
--- /dev/null
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor
@@ -0,0 +1,24 @@
+@page "/components/prolayout"
+
+@inherits AppComponentBase
+
+<PageOutlet Url="components/prolayout"
+            Title="ProLayout"
+            Description="prolayout component of the bit BlazorUI components" />
+
+<ComponentDemo ComponentName="ProLayout"
+               ComponentDescription="BitProLayout is an advanced container to handle the nuances of a cross-platform layout."
+               Notes="To use this component, you need to install the `Bit.BlazorUI.Extras` nuget package, as described in the Optional steps of the Getting started page."
+               ComponentParameters="componentParameters"
+               ComponentSubClasses="componentSubClasses">
+    <ComponentExampleBox Title="Basic" Id="example1">
+        <ExamplePreview>
+            <div>Since this component is a base layout container, it is not possible to show its capabilities in a demo sample here.</div>
+            <div>
+                You can always check our Boilerplate project template samples
+                (<a href="https://adminpanel.bitplatform.dev" target="_blank">AdminPanel</a> & <a href="https://todo.bitplatform.dev" target="_blank">Todo</a>)
+                to see the BitProLayout in action.
+            </div>
+        </ExamplePreview>
+    </ComponentExampleBox>
+</ComponentDemo>
\ No newline at end of file
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.cs
new file mode 100644
index 0000000000..714dbf8819
--- /dev/null
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.cs
@@ -0,0 +1,133 @@
+namespace Bit.BlazorUI.Demo.Client.Core.Pages.Components.Extras.ProLayout;
+
+public partial class BitProLayoutDemo
+{
+    private readonly List<ComponentParameter> componentParameters =
+    [
+         new()
+         {
+            Name = "CascadingValues",
+            Type = "IEnumerable<BitCascadingValue>?",
+            DefaultValue = "null",
+            Description = "The cascading values to be provided for the children of the layout.",
+            LinkType = LinkType.Link,
+            Href = "#cascading-value"
+         },
+         new()
+         {
+            Name = "ChildContent",
+            Type = "RenderFragment?",
+            DefaultValue = "null",
+            Description = "The content of the layout.",
+         },
+         new()
+         {
+            Name = "Classes",
+            Type = "BitProLayoutClassStyles?",
+            DefaultValue = "null",
+            Description = "Custom CSS classes for different parts of the layout.",
+            LinkType = LinkType.Link,
+            Href = "#class-styles"
+         },
+         new()
+         {
+            Name = "Styles",
+            Type = "BitProLayoutClassStyles?",
+            DefaultValue = "null",
+            Description = "Custom CSS styles for different parts of the layout.",
+            LinkType = LinkType.Link,
+            Href = "#class-styles"
+         },
+    ];
+
+    private readonly List<ComponentSubClass> componentSubClasses =
+    [new()
+        {
+            Id = "cascading-value",
+            Title = "BitCascadingValue",
+            Description = "The cascading value to be provided using the BitCascadingValueProvider component.",
+            Parameters =
+            [
+                new()
+                {
+                    Name = "Name",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "The optional name of the cascading value.",
+                },
+                new()
+                {
+                    Name = "Value",
+                    Type = "object?",
+                    DefaultValue = "null",
+                    Description = "The value to be provided.",
+                },
+                new()
+                {
+                    Name = "IsFixed",
+                    Type = "bool",
+                    DefaultValue = "null",
+                    Description = "If true, indicates that Value will not change.",
+                }
+            ]
+        },
+        new()
+        {
+            Id = "class-styles",
+            Title = "BitProLayoutClassStyles",
+            Parameters =
+            [
+                new()
+                {
+                    Name = "Root",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the root of the BitProLayout.",
+                },
+                new()
+                {
+                    Name = "Top",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the top area of the BitProLayout.",
+                },
+                new()
+                {
+                    Name = "Center",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the top center of the BitProLayout.",
+                },
+                new()
+                {
+                    Name = "Left",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the top left of the BitProLayout.",
+                },
+                new()
+                {
+                    Name = "Main",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the main area of the BitProLayout.",
+                },
+                new()
+                {
+                    Name = "Right",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the right area of the BitProLayout.",
+                },
+                new()
+                {
+                    Name = "Bottom",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the bottom area of the BitProLayout.",
+                },
+            ]
+        }
+    ];
+
+}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/ComponentsSection.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/ComponentsSection.razor
index b3e28e6a15..79f9ec0e34 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/ComponentsSection.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/ComponentsSection.razor
@@ -253,6 +253,9 @@
             <BitLink Href="/components/pdfreader" title="PdfReader" Style="display: flex">
                 <BitText Typography="BitTypography.Subtitle1">PdfReader</BitText>
             </BitLink>
+            <BitLink Href="/components/prolayout" title="ProLayout" Style="display: flex">
+                <BitText Typography="BitTypography.Subtitle1">ProLayout</BitText>
+            </BitLink>
             <BitLink Href="/components/propanel" title="ProPanel" Style="display: flex">
                 <BitText Typography="BitTypography.Subtitle1">ProPanel</BitText>
             </BitLink>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.cs
index 84b6f10f89..88e59091ab 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.cs
@@ -156,6 +156,7 @@ public partial class NavMenu : IDisposable
                 new() { Text = "DataGrid", Url = "/components/datagrid", AdditionalUrls = ["/components/data-grid"] },
                 new() { Text = "Chart", Url = "/components/chart" },
                 new() { Text = "PdfReader", Url = "/components/pdfreader" },
+                new() { Text = "ProLayout", Url = "/components/prolayout" },
                 new() { Text = "ProPanel", Url = "/components/propanel" },
                 new() 
                 { 

From 44afd49c4454fb82a3b0aa760820f6af35c389a8 Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Wed, 25 Dec 2024 16:38:47 +0100
Subject: [PATCH 02/28] feat(websites): add offline todo web app demo #9542
 (#9543)

---
 .github/workflows/admin-sample.cd.yml |   2 +-
 .github/workflows/todo-sample.cd.yml  | 100 +++++++++++++++++++++++++-
 README.md                             |  14 ++--
 3 files changed, 106 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/admin-sample.cd.yml b/.github/workflows/admin-sample.cd.yml
index 20c90a0b1e..cb4d62d3d5 100644
--- a/.github/workflows/admin-sample.cd.yml
+++ b/.github/workflows/admin-sample.cd.yml
@@ -186,7 +186,7 @@ jobs:
         cd src\Templates\Boilerplate && dotnet build -c Release
         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
         dotnet new install Bit.Boilerplate.0.0.0.nupkg
-        cd ..\..\..\ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --windows --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --captcha reCaptcha --signalR --offlineDb --framework net9.0
+        cd ..\..\..\ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --windows --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --captcha reCaptcha --signalR --framework net9.0
   
     - name: Update core appsettings.json
       uses: devops-actions/variable-substitution@v1.2 
diff --git a/.github/workflows/todo-sample.cd.yml b/.github/workflows/todo-sample.cd.yml
index b668a00726..4b1cc935cb 100644
--- a/.github/workflows/todo-sample.cd.yml
+++ b/.github/workflows/todo-sample.cd.yml
@@ -121,8 +121,8 @@ jobs:
           CLOUDFLARE_ZONE: ${{ secrets.BITPLATFORM_DEV_CLOUDFLARE_ZONE }}
           CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
 
-  deploy_blazor_wasm_standalone:
-    name: build blazor wasm standalone
+  deploy_blazor_wasm_standalone_aot:
+    name: build blazor wasm standalone (AOT)
     runs-on: ubuntu-24.04
 
     steps:
@@ -166,7 +166,101 @@ jobs:
     - name: Upload to asw
       run: |
           npm install -g @azure/static-web-apps-cli
-          swa deploy --deployment-token ${{ secrets.TODO_ASW_TOKEN }} --env production --app-location ${{env.DOTNET_ROOT}}/client/wwwroot
+          swa deploy --deployment-token ${{ secrets.TODO_AOT_ASW_TOKEN }} --env production --app-location ${{env.DOTNET_ROOT}}/client/wwwroot
+
+  deploy_blazor_wasm_standalone_offlineDb:
+    name: build blazor wasm standalone (Offline database)
+    runs-on: ubuntu-24.04
+
+    steps:
+    
+    - name: Checkout source code
+      uses: actions/checkout@v4
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        global-json-file: src/global.json
+
+    - name: Create project from Boilerplate
+      run: |
+       cd src/Templates/Boilerplate && dotnet build -c Release
+       dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
+       dotnet new install Bit.Boilerplate.0.0.0.nupkg
+       cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --offlineDb --signalR --framework net9.0
+       
+    - name: Update core appsettings.json
+      uses: devops-actions/variable-substitution@v1.2 
+      with:
+        files: 'TodoSample/src/Shared/appsettings.json, TodoSample/src/Client/TodoSample.Client.Core/appsettings.json, TodoSample/src/Client/TodoSample.Client.Web/appsettings.json, TodoSample/src/Client/TodoSample.Client.Web/appsettings.Production.json'
+      env:
+        ServerAddress: ${{ env.SERVER_ADDRESS }}
+        GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
+
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 22
+        
+    - name: Install wasm
+      run:  cd src && dotnet workload install wasm-tools
+      
+    - name: Generate CSS/JS files
+      run: dotnet build TodoSample/src/Client/TodoSample.Client.Core/TodoSample.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore -c Release
+      
+    - name: Publish
+      run: dotnet publish TodoSample/src/Client/TodoSample.Client.Web/TodoSample.Client.Web.csproj -c Release -p:PwaEnabled=true -o ${{env.DOTNET_ROOT}}/client -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}"
+
+    - name: Upload to asw
+      run: |
+          npm install -g @azure/static-web-apps-cli
+          swa deploy --deployment-token ${{ secrets.TODO_OFFLINE_ASW_TOKEN }} --env production --app-location ${{env.DOTNET_ROOT}}/client/wwwroot
+
+  deploy_blazor_wasm_standalone_small:
+    name: build blazor wasm standalone (small)
+    runs-on: ubuntu-24.04
+
+    steps:
+    
+    - name: Checkout source code
+      uses: actions/checkout@v4
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        global-json-file: src/global.json
+
+    - name: Create project from Boilerplate
+      run: |
+       cd src/Templates/Boilerplate && dotnet build -c Release
+       dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
+       dotnet new install Bit.Boilerplate.0.0.0.nupkg
+       cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --framework net9.0
+       
+    - name: Update core appsettings.json
+      uses: devops-actions/variable-substitution@v1.2 
+      with:
+        files: 'TodoSample/src/Shared/appsettings.json, TodoSample/src/Client/TodoSample.Client.Core/appsettings.json, TodoSample/src/Client/TodoSample.Client.Web/appsettings.json, TodoSample/src/Client/TodoSample.Client.Web/appsettings.Production.json'
+      env:
+        ServerAddress: ${{ env.SERVER_ADDRESS }}
+        GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
+
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 22
+        
+    - name: Install wasm
+      run:  cd src && dotnet workload install wasm-tools
+      
+    - name: Generate CSS/JS files
+      run: dotnet build TodoSample/src/Client/TodoSample.Client.Core/TodoSample.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore -c Release
+      
+    - name: Publish
+      run: dotnet publish TodoSample/src/Client/TodoSample.Client.Web/TodoSample.Client.Web.csproj -c Release -p:PwaEnabled=true -o ${{env.DOTNET_ROOT}}/client -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:MultilingualEnabled=false
+
+    - name: Upload to asw
+      run: |
+          npm install -g @azure/static-web-apps-cli
+          swa deploy --deployment-token ${{ secrets.TODO_SMALL_ASW_TOKEN }} --env production --app-location ${{env.DOTNET_ROOT}}/client/wwwroot
 
   build_blazor_hybrid_windows:
     name: build blazor hybrid (windows)
diff --git a/README.md b/README.md
index e6111238e8..f57456a326 100644
--- a/README.md
+++ b/README.md
@@ -44,12 +44,14 @@ The following apps are our open-source projects powered by the bit platform show
 | AdminPanel | [![Prerendered PWA](https://github-production-user-asset-6210df.s3.amazonaws.com/6169846/251381583-8b8eb895-80c9-4811-9641-57a5a08db163.png)](https://adminpanel.bitplatform.dev) | [![iOS app](https://github-production-user-asset-6210df.s3.amazonaws.com/6169846/251381842-e72976ce-fd20-431d-a677-ca1ed625b83b.png)](https://apps.apple.com/us/app/bit-adminpanel/id6450611349) | [![Android app](https://github-production-user-asset-6210df.s3.amazonaws.com/6169846/251381958-24931682-87f6-44fc-a1c7-eecf46387005.png)](https://play.google.com/store/apps/details?id=com.bitplatform.AdminPanel.Template) | [![Windows app](https://github-production-user-asset-6210df.s3.amazonaws.com/6169846/251382080-9ae97fea-934c-4097-aca4-124a2aed1595.png)](https://windows-admin.bitplatform.dev/AdminPanel.Client.Windows-win-Setup.exe) | [![macOS app](https://github-production-user-asset-6210df.s3.amazonaws.com/6169846/251382211-0d58f9ba-1a1f-4481-a0ca-b23a393cca9f.png)](https://apps.apple.com/nl/app/bit-adminpanel/id6450611349) |
 | bitplatform | [![SPA](https://github-production-user-asset-6210df.s3.amazonaws.com/6169846/251395129-71a5a79c-af74-4d4e-a0f7-ed9a15cf2e46.png)](https://bitplatform.dev)|
 
-1. [bitplatform.dev](https://bitplatform.dev): .NET 9 Pre-rendered SPA with Blazor WebAssembly
-2. [blazorui.bitplatform.dev](https://blazorui.bitplatform.dev): .NET 9 Pre-rendered PWA with Blazor WebAssembly
-3. [todo.bitplatform.dev](https://todo.bitplatform.dev): .NET 8 Pre-rendered PWA with Blazor WebAssembly
-5. [adminpanel.bitplatform.dev](https://adminpanel.bitplatform.dev): .NET 9 PWA with Blazor WebAssembly
-6. [adminpanel.bitplatform.cc](https://adminpanel.bitplatform.cc): .NET 9 PWA with Blazor WebAssembly Standalone (Free Azure static web app)
-7. [todo.bitplatform.cc](https://todo.bitplatform.cc): AOT Compiled .NET 9 PWA with Blazor WebAssembly Standalone (Free Azure static web app)
+1. [bitplatform.dev](https://bitplatform.dev): .NET 9 Pre-rendered SPA with Blazor WebAssembly (Azure Web App + Cloudflare CDN)
+2. [blazorui.bitplatform.dev](https://blazorui.bitplatform.dev): .NET 9 Pre-rendered PWA with Blazor WebAssembly (Azure Web App + Cloudflare CDN)
+3. [todo.bitplatform.dev](https://todo.bitplatform.dev): .NET 8 Pre-rendered PWA with Blazor WebAssembly (Azure Web App + Cloudflare CDN)
+5. [adminpanel.bitplatform.dev](https://adminpanel.bitplatform.dev): .NET 9 PWA with Blazor WebAssembly (Azure Web App + Cloudflare CDN)
+6. [adminpanel.bitplatform.cc](https://adminpanel.bitplatform.cc): .NET 9 PWA with Blazor WebAssembly Standalone (Azure static web app)
+7. [todo-aot.bitplatform.cc](https://todo-aot.bitplatform.cc): .NET 9 AOT Compiled PWA with Blazor WebAssembly Standalone (Azure static web app)
+8. [todo-small.bitplatform.cc](https://todo-small.bitplatform.cc): .NET 9 Todo demo app with smaller download footprint (Azure static web app)
+9. [todo-offline.bitplatform.cc](https://todo-offline.bitplatform.cc): .NET 9 Todo demo app with ef-core & sqlite (Azure static web app)
 
 [Todo](https://todo.bitplatform.dev) & [Adminpanel](https://adminpanel.bitplatform.dev) web apps will launch their respective Android and iOS applications if you have already installed them, mirroring the behavior of apps like YouTube and Instagram. 
 

From 3a3bfaf20d3df7bc6e14c8dd9e33269797872ae4 Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Thu, 26 Dec 2024 08:39:44 +0100
Subject: [PATCH 03/28] feat(templates): pass logger to velopack app #9544
 (#9545)

---
 .../src/Client/Boilerplate.Client.Windows/Program.cs           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs
index 4a5405502e..5f994c7865 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs
@@ -3,6 +3,7 @@
 using Microsoft.Web.WebView2.Core;
 using Boilerplate.Client.Core.Components;
 using Boilerplate.Client.Windows.Services;
+using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.Components.WebView.WindowsForms;
 
 namespace Boilerplate.Client.Windows;
@@ -42,7 +43,7 @@ public static void Main(string[] args)
         });
 
         // https://github.com/velopack/velopack
-        VelopackApp.Build().Run();
+        VelopackApp.Build().Run(Services.GetRequiredService<ILogger<VelopackApp>>());
         _ = Task.Run(async () =>
         {
             try

From 0d4f11662beae0fc0b670084a1072ccee6e69192 Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Thu, 26 Dec 2024 20:56:14 +0100
Subject: [PATCH 04/28] feat(deps): update project dependencies #9547 (#9548)

---
 .../Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj     |  4 ++--
 .../Bit.BlazorUI.Demo.Server.csproj                  |  8 ++++----
 .../Bit.BlazorUI.Demo.Client.Windows.csproj          |  2 +-
 .../Bit.Boilerplate/src/Directory.Packages.props     | 12 ++++++------
 .../Bit.Boilerplate/src/Directory.Packages8.props    | 12 ++++++------
 .../Bit.Websites.Careers.Server.csproj               |  8 ++++----
 .../Bit.Websites.Platform.Server.csproj              |  8 ++++----
 .../Bit.Websites.Sales.Server.csproj                 |  8 ++++----
 8 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj b/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj
index cb16dd5cbb..fb70e9cf9e 100644
--- a/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj
+++ b/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj
@@ -15,8 +15,8 @@
 	<ItemGroup>
 		<PackageReference Include="bunit.web" Version="1.37.7" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.6.4" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.6.4" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
 		<PackageReference Include="coverlet.collector" Version="6.0.2">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
index a0b7a01a85..80815d7c14 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
@@ -16,10 +16,10 @@
         <PackageReference Include="Microsoft.AspNetCore.OData" Version="9.1.1" />
         <PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
-        <PackageReference Include="AspNetCore.HealthChecks.System" Version="8.0.1" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
+        <PackageReference Include="AspNetCore.HealthChecks.System" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
         <PackageReference Include="Riok.Mapperly" Version="4.1.1" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
     </ItemGroup>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
index bb00b11acf..0964aff69a 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
@@ -41,7 +41,7 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="9.0.21" />
         <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
-        <PackageReference Include="Velopack" Version="0.0.942" />
+        <PackageReference Include="Velopack" Version="0.0.1015" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <Content Include="..\Bit.BlazorUI.Demo.Client.Maui\wwwroot\index.html" Link="wwwroot\index.html">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
index 4ba12eda15..31ed6df3e0 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
@@ -22,16 +22,16 @@
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="9.0.21" />
         <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
         <PackageVersion Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
-        <PackageVersion Include="Velopack" Version="0.0.942" />
+        <PackageVersion Include="Velopack" Version="0.0.1015" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
         <PackageVersion Include="Microsoft.Extensions.Logging.EventLog" Version="9.0.0" />
         <PackageVersion Include="Microsoft.Extensions.Logging.EventSource" Version="9.0.0" />
         <!--/+:msbuild-conditional:noEmit -->
-        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.AspNetCore" Version="4.13.0" />
-        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Extensions.Logging" Version="4.13.0" />
-        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Maui" Version="4.13.0" />
+        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.AspNetCore" Version="5.0.0" />
+        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Extensions.Logging" Version="5.0.0" />
+        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Maui" Version="5.0.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.AndroidX.Activity" Version="1.9.3.1" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.AndroidX.Activity.Ktx" Version="1.9.3.1" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.AndroidX.Collection" Version="1.4.5.1" />
@@ -92,7 +92,7 @@
         <PackageVersion Include="FakeItEasy" Version="8.3.0" />
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageVersion Include="Microsoft.Playwright.MSTest" Version="1.49.0" />
-        <PackageVersion Include="MSTest.TestAdapter" Version="3.6.4" />
-        <PackageVersion Include="MSTest.TestFramework" Version="3.6.4" />
+        <PackageVersion Include="MSTest.TestAdapter" Version="3.7.0" />
+        <PackageVersion Include="MSTest.TestFramework" Version="3.7.0" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
index c3684fd67c..226b07c7ca 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
@@ -22,16 +22,16 @@
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="8.0.100" />
         <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
         <PackageVersion Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
-        <PackageVersion Include="Velopack" Version="0.0.942" />
+        <PackageVersion Include="Velopack" Version="0.0.1015" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
         <PackageVersion Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.1" />
         <PackageVersion Include="Microsoft.Extensions.Logging.EventSource" Version="8.0.1" />
         <!--/+:msbuild-conditional:noEmit -->
-        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.AspNetCore" Version="4.13.0" />
-        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Extensions.Logging" Version="4.13.0" />
-        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Maui" Version="4.13.0" />
+        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.AspNetCore" Version="5.0.0" />
+        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Extensions.Logging" Version="5.0.0" />
+        <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Maui" Version="5.0.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.AndroidX.Activity" Version="1.9.3.1" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.AndroidX.Activity.Ktx" Version="1.9.3.1" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.AndroidX.Collection" Version="1.4.5.1" />
@@ -92,7 +92,7 @@
         <PackageVersion Include="FakeItEasy" Version="8.3.0" />
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageVersion Include="Microsoft.Playwright.MSTest" Version="1.49.0" />
-        <PackageVersion Include="MSTest.TestAdapter" Version="3.6.4" />
-        <PackageVersion Include="MSTest.TestFramework" Version="3.6.4" />
+        <PackageVersion Include="MSTest.TestAdapter" Version="3.7.0" />
+        <PackageVersion Include="MSTest.TestFramework" Version="3.7.0" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
index ab68d34fb2..639d2f8331 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
@@ -19,10 +19,10 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
-        <PackageReference Include="AspNetCore.HealthChecks.System" Version="8.0.1" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
+        <PackageReference Include="AspNetCore.HealthChecks.System" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
         <PackageReference Include="Riok.Mapperly" Version="4.1.1" />
     </ItemGroup>
 
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
index 85b4fb2147..bdca6c4f9f 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
@@ -19,10 +19,10 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
-        <PackageReference Include="AspNetCore.HealthChecks.System" Version="8.0.1" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
+        <PackageReference Include="AspNetCore.HealthChecks.System" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
         <PackageReference Include="Riok.Mapperly" Version="4.1.1" />
     </ItemGroup>
 
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
index 6c400b121f..1234b62265 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
@@ -19,10 +19,10 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
-        <PackageReference Include="AspNetCore.HealthChecks.System" Version="8.0.1" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
+        <PackageReference Include="AspNetCore.HealthChecks.System" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
         <PackageReference Include="Riok.Mapperly" Version="4.1.1" />
     </ItemGroup>
 

From 03829a54a9b1a217f49a4fa0745db46b4269b6c9 Mon Sep 17 00:00:00 2001
From: Mohammad Aminsafaei <m.aminsafaei@outlook.com>
Date: Fri, 27 Dec 2024 16:53:43 +0330
Subject: [PATCH 05/28] feat(blazorui): add Classes/Styles parameters to
 BitButtonGroup #9514 (#9546)

---
 .../BitButtonGroup/BitButtonGroup.razor       |   6 +-
 .../BitButtonGroup/BitButtonGroup.razor.cs    |  50 ++
 .../BitButtonGroupClassStyles.cs              |  29 +
 .../ButtonGroup/BitButtonGroupDemo.razor.cs   |  61 ++
 .../ButtonGroup/BitButtonGroupDemo.razor.scss |   6 +
 .../_BitButtonGroupCustomDemo.razor           | 315 ++++++-----
 ..._BitButtonGroupCustomDemo.razor.samples.cs | 290 +++++-----
 .../ButtonGroup/_BitButtonGroupItemDemo.razor | 305 +++++-----
 .../_BitButtonGroupItemDemo.razor.samples.cs  | 238 ++++----
 .../_BitButtonGroupOptionDemo.razor           | 527 +++++++++---------
 ..._BitButtonGroupOptionDemo.razor.samples.cs | 332 +++++------
 11 files changed, 1196 insertions(+), 963 deletions(-)
 create mode 100644 src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroupClassStyles.cs

diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor
index 34a0df0ad6..790fc14f3f 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor
@@ -22,7 +22,7 @@
                 disabled="@(isEnabled is false)"
                 aria-disabled="@(isEnabled is false)"
                 title="@GetItemTitle(item)"
-                style="@GetStyle(item)"
+                style="@GetItemStyle(item)"
                 class="@GetItemClass(item)">
             @if (template is not null)
             {
@@ -37,13 +37,13 @@
                 var iconName = GetItemIconName(item);
                 @if (iconName.HasValue())
                 {
-                    <i class="bit-icon bit-icon--@iconName" />
+                    <i style="@Styles?.Icon" class="bit-icon bit-icon--@iconName @Classes?.Icon" />
                 }
 
                 var text = GetItemText(item);
                 if (text.HasValue())
                 {
-                    <span class="bit-btg-btx">@text</span>
+                    <span style="@Styles?.Text" class="bit-btg-btx @Classes?.Text">@text</span>
                 }
             }
         </button>
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs
index 73b9ff5894..f51e18e0c9 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs
@@ -21,6 +21,11 @@ public partial class BitButtonGroup<TItem> : BitComponentBase where TItem : clas
     /// </summary>
     [Parameter] public RenderFragment? ChildContent { get; set; }
 
+    /// <summary>
+    /// Custom CSS classes for different parts of the ButtonGroup.
+    /// </summary>
+    [Parameter] public BitButtonGroupClassStyles? Classes { get; set; }
+
     /// <summary>
     /// Defines the general colors available in the bit BlazorUI.
     /// </summary>
@@ -63,6 +68,11 @@ public partial class BitButtonGroup<TItem> : BitComponentBase where TItem : clas
     [Parameter, ResetClassBuilder]
     public BitSize? Size { get; set; }
 
+    /// <summary>
+    /// Custom CSS styles for different parts of the ButtonGroup.
+    /// </summary>
+    [Parameter] public BitButtonGroupClassStyles? Styles { get; set; }
+
     /// <summary>
     /// Display ButtonGroup with toggle mode enabled for each button.
     /// </summary>
@@ -103,6 +113,8 @@ internal void UnregisterOption(BitButtonGroupOption option)
 
     protected override void RegisterCssClasses()
     {
+        ClassBuilder.Register(() => Classes?.Root);
+
         ClassBuilder.Register(() => Variant switch
         {
             BitVariant.Fill => "bit-btg-fil",
@@ -144,6 +156,11 @@ protected override void RegisterCssClasses()
         ClassBuilder.Register(() => Vertical ? "bit-btg-vrt" : string.Empty);
     }
 
+    protected override void RegisterCssStyles()
+    {
+        StyleBuilder.Register(() => Styles?.Root);
+    }
+
     protected override void OnParametersSet()
     {
         base.OnParametersSet();
@@ -211,6 +228,11 @@ private async Task HandleOnItemClick(TItem item)
         if (_toggleItem == item)
         {
             classes.Add("bit-btg-chk");
+
+            if (Classes?.ToggledButton.HasValue() ?? false)
+            {
+                classes.Add(Classes.ToggledButton!);
+            }
         }
 
         var classItem = GetClass(item);
@@ -219,9 +241,37 @@ private async Task HandleOnItemClick(TItem item)
             classes.Add(classItem!);
         }
 
+        if (Classes?.Button.HasValue() ?? false)
+        {
+            classes.Add(Classes.Button!);
+        }
+
         return string.Join(' ', classes);
     }
 
+    private string? GetItemStyle(TItem? item)
+    {
+        List<string> styles = new();
+
+        var style = GetStyle(item);
+        if (style.HasValue())
+        {
+            styles.Add(style!.Trim(';'));
+        }
+
+        if (Styles?.Button.HasValue() ?? false)
+        {
+            styles.Add(Styles.Button!.Trim(';'));
+        }
+
+        if (_toggleItem == item && (Styles?.ToggledButton.HasValue() ?? false))
+        {
+            styles.Add(Styles.ToggledButton!);
+        }
+
+        return string.Join(';', styles);
+    }
+
     private string? GetItemText(TItem? item)
     {
         if (IconOnly) return null;
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroupClassStyles.cs b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroupClassStyles.cs
new file mode 100644
index 0000000000..66dc6fb58e
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroupClassStyles.cs
@@ -0,0 +1,29 @@
+namespace Bit.BlazorUI;
+
+public class BitButtonGroupClassStyles
+{
+    /// <summary>
+    /// Custom CSS classes/styles for the root element of the BitButtonGroup.
+    /// </summary>
+    public string? Root { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the internal button of the BitButtonGroup.
+    /// </summary>
+    public string? Button { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the icon of the BitButtonGroup.
+    /// </summary>
+    public string? Icon { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the text of the BitButtonGroup.
+    /// </summary>
+    public string? Text { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the button when in toggle mode of the BitButtonGroup.
+    /// </summary>
+    public string? ToggledButton { get; set; }
+}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs
index c4b9b4d2d7..2de44d898a 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs
@@ -19,6 +19,15 @@ public partial class BitButtonGroupDemo
             Description = "Determines that only the icon should be rendered.",
         },
         new()
+        {
+            Name = "Classes",
+            Type = "BitButtonGroupClassStyles?",
+            DefaultValue = "null",
+            Description = "Custom CSS classes for different parts of the ButtonGroup.",
+            LinkType = LinkType.Link,
+            Href = "#class-styles",
+        },
+        new()
         {
             Name = "Color",
             Type = "BitColor?",
@@ -82,6 +91,15 @@ public partial class BitButtonGroupDemo
             Href = "#button-size-enum",
         },
         new()
+        {
+            Name = "Styles",
+            Type = "BitButtonGroupClassStyles?",
+            DefaultValue = "null",
+            Description = "Custom CSS styles for different parts of the ButtonGroup.",
+            LinkType = LinkType.Link,
+            Href = "#class-styles",
+        },
+        new()
         {
             Name = "Variant",
             Type = "BitVariant?",
@@ -342,6 +360,49 @@ public partial class BitButtonGroupDemo
             ]
         },
         new()
+        {
+            Id = "class-styles",
+            Title = "BitButtonGroupClassStyles",
+            Parameters =
+            [
+               new()
+               {
+                   Name = "Root",
+                   Type = "string?",
+                   DefaultValue = "null",
+                   Description = "Custom CSS classes/styles for the root element of the BitButtonGroup.",
+               },
+               new()
+               {
+                   Name = "Button",
+                   Type = "string?",
+                   DefaultValue = "null",
+                   Description = "Custom CSS classes/styles for the internal button of the BitButtonGroup.",
+               },
+               new()
+               {
+                   Name = "Icon",
+                   Type = "string?",
+                   DefaultValue = "null",
+                   Description = "Custom CSS classes/styles for the icon of the BitButtonGroup."
+               },
+               new()
+               {
+                   Name = "Text",
+                   Type = "string?",
+                   DefaultValue = "null",
+                   Description = "Custom CSS classes/styles for the text of the BitButtonGroup."
+               },
+               new()
+               {
+                   Name = "ToggledButton",
+                   Type = "string?",
+                   DefaultValue = "null",
+                   Description = "Custom CSS classes/styles for the button when in toggle mode of the BitButtonGroup.",
+               },
+            ],
+        },
+        new()
         {
             Id = "name-selectors",
             Title = "BitButtonGroupNameSelectors",
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.scss
index d477618eb1..daf5d6992e 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.scss
@@ -26,4 +26,10 @@
         color: peachpuff;
         background-color: tomato;
     }
+
+    .custom-btn {
+        color: aliceblue;
+        border-color: aliceblue;
+        background-color: crimson;
+    }
 }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor
index 8552384e10..0d5e331a08 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor
@@ -33,134 +33,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Color" RazorCode="@example3RazorCode" CsharpCode="@example3CsharpCode" Id="example3">
-    <ExamplePreview>
-        <div>Offering a range of specialized colors, providing visual cues for specific states within your application.</div>
-        <br /><br />
-        <div class="example-content">
-            <div>Primary</div>
-            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Secondary</div>
-            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Tertiary</div>
-            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Info</div>
-            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Success</div>
-            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Warning</div>
-            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>SevereWarning</div>
-            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Error</div>
-            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div style="background:var(--bit-clr-fg-sec);padding:1rem">
-            <div class="example-content">
-                <div style="color:var(--bit-clr-bg-pri)">PrimaryBackground</div>
-                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-            </div>
-            <br /><br />
-            <div class="example-content">
-                <div style="color:var(--bit-clr-bg-pri)">SecondaryBackground</div>
-                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-            </div>
-            <br /><br />
-            <div class="example-content">
-                <div style="color:var(--bit-clr-bg-pri)">TertiaryBackground</div>
-                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-            </div>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>PrimaryForeground</div>
-            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>SecondaryForeground</div>
-            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>TertiaryForeground</div>
-            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>PrimaryBorder</div>
-            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>SecondaryBorder</div>
-            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>TertiaryBorder</div>
-            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
-            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
-        </div>
-    </ExamplePreview>
-</ComponentExampleBox>
-
-<ComponentExampleBox Title="Icon" RazorCode="@example4RazorCode" CsharpCode="@example4CsharpCode" Id="example4">
+<ComponentExampleBox Title="Icon" RazorCode="@example3RazorCode" CsharpCode="@example3CsharpCode" Id="example3">
     <ExamplePreview>
         <div>Each item in the ButtonGroup can have an icon.</div>
         <br /><br />
@@ -187,7 +60,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="IconOnly" RazorCode="@example5RazorCode" CsharpCode="@example5CsharpCode" Id="example5">
+<ComponentExampleBox Title="IconOnly" RazorCode="@example4RazorCode" CsharpCode="@example4CsharpCode" Id="example4">
     <ExamplePreview>
         <div>The IconOnly allows buttons to display only icons without any text, ideal for minimalistic designs or limited space.</div>
         <br /><br />
@@ -237,7 +110,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="ReversedIcon" RazorCode="@example6RazorCode" CsharpCode="@example6CsharpCode" Id="example6">
+<ComponentExampleBox Title="ReversedIcon" RazorCode="@example5RazorCode" CsharpCode="@example5CsharpCode" Id="example5">
     <ExamplePreview>
         <div>Reverses the positions of the icon and the main content of the button.</div>
         <br /><br />
@@ -267,7 +140,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Toggled" RazorCode="@example7RazorCode" CsharpCode="@example7CsharpCode" Id="example7">
+<ComponentExampleBox Title="Toggled" RazorCode="@example6RazorCode" CsharpCode="@example6CsharpCode" Id="example6">
     <ExamplePreview>
         <div>The Toggled in BitButtonGroup allows you to control the active or inactive state of each button, providing clear visual feedback to users about which buttons are selected or currently in use.</div>
         <br /><br />
@@ -309,7 +182,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Vertical" RazorCode="@example8RazorCode" CsharpCode="@example8CsharpCode" Id="example8">
+<ComponentExampleBox Title="Vertical" RazorCode="@example7RazorCode" CsharpCode="@example7CsharpCode" Id="example7">
     <ExamplePreview>
         <div>By default the BitButtonGroup component is horizontal, but can be turned vertical by adding the <strong>Vertical</strong> property.</div>
         <br /><br />
@@ -332,6 +205,29 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
+<ComponentExampleBox Title="Events" RazorCode="@example8RazorCode" CsharpCode="@example8CsharpCode" Id="example8">
+    <ExamplePreview>
+        <div>Managing button click events.</div>
+        <br /><br />
+        <div class="example-content">
+            <div>Component's ItemClick event:</div>
+            <BitButtonGroup Items="basicCustoms"
+                            NameSelectors="nameSelector"
+                            OnItemClick="(Operation item) => clickedCustom = item.Name" />
+            <div>Clicked item: <b>@clickedCustom</b></div>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Item's Click event:</div>
+            <BitButtonGroup Items="eventsCustoms"
+                            NameSelectors="@(new() { Text = { Selector = i => i.Name },
+                                                     IconName = { Selector = i => i.Icon },
+                                                     OnClick = { Selector = i => i.Clicked } })" />
+            <div>Click count: <b>@clickCounter</b></div>
+        </div>
+    </ExamplePreview>
+</ComponentExampleBox>
+
 <ComponentExampleBox Title="Size" RazorCode="@example9RazorCode" CsharpCode="@example9CsharpCode" Id="example9">
     <ExamplePreview>
         <div>Different sizes for buttons to meet design needs, ensuring flexibility within your application.</div>
@@ -359,7 +255,134 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Style & Class" RazorCode="@example10RazorCode" CsharpCode="@example10CsharpCode" Id="example10">
+<ComponentExampleBox Title="Color" RazorCode="@example10RazorCode" CsharpCode="@example10CsharpCode" Id="example10">
+    <ExamplePreview>
+        <div>Offering a range of specialized colors, providing visual cues for specific states within your application.</div>
+        <br /><br />
+        <div class="example-content">
+            <div>Primary</div>
+            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Secondary</div>
+            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Tertiary</div>
+            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Info</div>
+            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Success</div>
+            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Warning</div>
+            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>SevereWarning</div>
+            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Error</div>
+            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div style="background:var(--bit-clr-fg-sec);padding:1rem">
+            <div class="example-content">
+                <div style="color:var(--bit-clr-bg-pri)">PrimaryBackground</div>
+                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+            </div>
+            <br /><br />
+            <div class="example-content">
+                <div style="color:var(--bit-clr-bg-pri)">SecondaryBackground</div>
+                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+            </div>
+            <br /><br />
+            <div class="example-content">
+                <div style="color:var(--bit-clr-bg-pri)">TertiaryBackground</div>
+                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+            </div>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>PrimaryForeground</div>
+            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>SecondaryForeground</div>
+            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>TertiaryForeground</div>
+            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>PrimaryBorder</div>
+            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>SecondaryBorder</div>
+            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>TertiaryBorder</div>
+            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+    </ExamplePreview>
+</ComponentExampleBox>
+
+<ComponentExampleBox Title="Style & Class" RazorCode="@example11RazorCode" CsharpCode="@example11CsharpCode" Id="example11">
     <ExamplePreview>
         <div>Empower customization by overriding default styles and classes, allowing tailored design modifications to suit specific UI requirements.</div>
         <br /><br />
@@ -376,28 +399,18 @@
                             NameSelectors="@(new() { Text = { Selector = i => i.Name },
                                                      IconName = { Selector = i => i.Icon } })" />
         </div>
-    </ExamplePreview>
-</ComponentExampleBox>
-
-<ComponentExampleBox Title="Events" RazorCode="@example11RazorCode" CsharpCode="@example11CsharpCode" Id="example11">
-    <ExamplePreview>
-        <div>Managing button click events.</div>
         <br /><br />
         <div class="example-content">
-            <div>Component's ItemClick event:</div>
+            <div><b>Styles</b> & <b>Classes</b>:</div>
             <BitButtonGroup Items="basicCustoms"
+                            Variant="BitVariant.Text"
                             NameSelectors="nameSelector"
-                            OnItemClick="(Operation item) => clickedCustom = item.Name" />
-            <div>Clicked item: <b>@clickedCustom</b></div>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Item's Click event:</div>
-            <BitButtonGroup Items="eventsCustoms"
-                            NameSelectors="@(new() { Text = { Selector = i => i.Name },
-                                                     IconName = { Selector = i => i.Icon },
-                                                     OnClick = { Selector = i => i.Clicked } })" />
-            <div>Click count: <b>@clickCounter</b></div>
+                            Styles="@(new() { Button = "color: darkcyan; border-color: deepskyblue; background-color: azure;" })" />
+
+            <BitButtonGroup Items="basicCustoms"
+                            Variant="BitVariant.Text"
+                            NameSelectors="nameSelector"
+                            Classes="@(new() { Button = "custom-btn" })" />
         </div>
     </ExamplePreview>
 </ComponentExampleBox>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs
index 76886dd07e..f84fb7e28e 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs
@@ -49,90 +49,6 @@ public class Operation
 ];";
 
     private readonly string example3RazorCode = @"
-<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-
-<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-
-<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-
-<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-
-<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
-<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />";
-    private readonly string example3CsharpCode = @"
-private BitButtonGroupNameSelectors<Operation> nameSelector = new() { Text = { Selector = i => i.Name } };
-
-public class Operation
-{
-    public string? Name { get; set; }
-}
-
-private List<Operation> basicCustoms =
-[
-    new() { Name = ""Add"" }, new() { Name = ""Edit"" }, new() { Name = ""Delete"" }
-];";
-
-    private readonly string example4RazorCode = @"
 <BitButtonGroup Variant=""BitVariant.Fill"" Items=""iconCustoms""
                 NameSelectors=""@(new() { Text = { Selector = i => i.Name },
                                          IconName = { Selector = i => i.Icon } })"" />
@@ -144,7 +60,7 @@ public class Operation
 <BitButtonGroup Variant=""BitVariant.Text"" Items=""iconCustoms""
                 NameSelectors=""@(new() { Text = { Selector = i => i.Name },
                                          IconName = { Selector = i => i.Icon } })"" />";
-    private readonly string example4CsharpCode = @"
+    private readonly string example3CsharpCode = @"
 public class Operation
 {
     public string? Name { get; set; }
@@ -158,7 +74,7 @@ public class Operation
     new() { Name = ""Delete"", Icon = BitIconName.Delete }
 ];";
 
-    private readonly string example5RazorCode = @"
+    private readonly string example4RazorCode = @"
 <BitButtonGroup Variant=""BitVariant.Fill"" Items=""iconCustoms""
                 NameSelectors=""@(new() { Text = { Selector = i => i.Name },
                                          IconName = { Selector = i => i.Icon } })"" IconOnly />
@@ -183,7 +99,7 @@ public class Operation
 <BitButtonGroup Variant=""BitVariant.Text"" Items=""onlyIconCustoms""
                 NameSelectors=""@(new() { Text = { Selector = i => i.Name },
                                          IconName = { Selector = i => i.Icon } })"" />";
-    private readonly string example5CsharpCode = @"
+    private readonly string example4CsharpCode = @"
 public class Operation
 {
     public string? Name { get; set; }
@@ -204,7 +120,7 @@ public class Operation
     new() { Name = ""Delete"", Icon = BitIconName.Delete }
 ];";
 
-    private readonly string example6RazorCode = @"
+    private readonly string example5RazorCode = @"
 <BitButtonGroup Variant=""BitVariant.Fill"" Items=""reversedIconCustoms""
                 NameSelectors=""@(new() { Text = { Selector = i => i.Name },
                                             IconName = { Selector = i => i.Icon },
@@ -219,7 +135,7 @@ public class Operation
                 NameSelectors=""@(new() { Text = { Selector = i => i.Name },
                                             IconName = { Selector = i => i.Icon },
                                             ReversedIcon = { Selector = i => i.ReversedIcon } })"" />";
-    private readonly string example6CsharpCode = @"
+    private readonly string example5CsharpCode = @"
 public class Operation
 {
     public string? Name { get; set; }
@@ -234,7 +150,7 @@ public class Operation
     new() { Name = ""Delete"", Icon = BitIconName.Delete, ReversedIcon = true }
 ];";
 
-    private readonly string example7RazorCode = @"
+    private readonly string example6RazorCode = @"
 <BitButtonGroup Variant=""BitVariant.Fill"" Items=""toggledCustoms""
                 NameSelectors=""@(new() { OnText = { Selector = i => i.OnName },
                                           OffText = { Selector = i => i.OffName },
@@ -261,7 +177,7 @@ public class Operation
                                           OnIconName = { Selector = i => i.OnIcon },
                                           OffIconName = { Selector = i => i.OffIcon },
                                           ReversedIcon = { Selector = i => i.ReversedIcon } })"" Toggled />";
-    private readonly string example7CsharpCode = @"
+    private readonly string example6CsharpCode = @"
 public class Operation
 {
     public string? OnIcon { get; set; }
@@ -280,11 +196,11 @@ public class Operation
     new() { OnName = ""Forward (2X)"", OffName = ""Forward"", OnIcon = BitIconName.FastForwardTwoX, OffIcon = BitIconName.FastForward, ReversedIcon = true }
 ];";
 
-    private readonly string example8RazorCode = @"
+    private readonly string example7RazorCode = @"
 <BitButtonGroup Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" Vertical />
 <BitButtonGroup Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" Vertical />
 <BitButtonGroup Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" Vertical />";
-    private readonly string example8CsharpCode = @"
+    private readonly string example7CsharpCode = @"
 private BitButtonGroupNameSelectors<Operation> nameSelector = new() { Text = { Selector = i => i.Name } };
 
 public class Operation
@@ -297,6 +213,48 @@ public class Operation
     new() { Name = ""Add"" }, new() { Name = ""Edit"" }, new() { Name = ""Delete"" }
 ];";
 
+    private readonly string example8RazorCode = @"
+<BitButtonGroup Items=""basicCustoms""
+                NameSelectors=""nameSelector""
+                OnItemClick=""(Operation item) => clickedCustom = item.Name"" />
+<div>Clicked item: <b>@clickedCustom</b></div>
+
+<BitButtonGroup Items=""eventsCustoms""
+                NameSelectors=""@(new() { Text = { Selector = i => i.Name },
+                                         IconName = { Selector = i => i.Icon },
+                                         OnClick = { Selector = i => i.Clicked } })"" />
+<div>Click count: <b>@clickCounter</b></div>";
+    private readonly string example8CsharpCode = @"
+private BitButtonGroupNameSelectors<Operation> nameSelector = new() { Text = { Selector = i => i.Name } };
+
+public class Operation
+{
+    public string? Name { get; set; }
+    public string? Icon { get; set; }
+    public Action<Operation>? Clicked { get; set; }
+}
+
+private int clickCounter;
+
+private List<Operation> basicCustoms =
+[
+    new() { Name = ""Add"" }, new() { Name = ""Edit"" }, new() { Name = ""Delete"" }
+];
+
+private List<Operation> eventsCustoms =
+[
+    new() { Name = ""Increase"", Icon = BitIconName.Add },
+    new() { Name = ""Reset"", Icon = BitIconName.Reset },
+    new() { Name = ""Decrease"", Icon = BitIconName.Remove }
+];
+
+protected override void OnInitialized()
+{
+    eventsCustoms[0].Clicked = _ => { clickCounter++; StateHasChanged(); };
+    eventsCustoms[1].Clicked = _ => { clickCounter = 0; StateHasChanged(); };
+    eventsCustoms[2].Clicked = _ => { clickCounter--; StateHasChanged(); };
+}";
+
     private readonly string example9RazorCode = @"
 <BitButtonGroup Size=""BitSize.Small"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
 <BitButtonGroup Size=""BitSize.Small"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
@@ -323,6 +281,90 @@ public class Operation
 ];";
 
     private readonly string example10RazorCode = @"
+<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+
+<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+
+<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+
+<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+
+<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />";
+    private readonly string example10CsharpCode = @"
+private BitButtonGroupNameSelectors<Operation> nameSelector = new() { Text = { Selector = i => i.Name } };
+
+public class Operation
+{
+    public string? Name { get; set; }
+}
+
+private List<Operation> basicCustoms =
+[
+    new() { Name = ""Add"" }, new() { Name = ""Edit"" }, new() { Name = ""Delete"" }
+];";
+
+    private readonly string example11RazorCode = @"
 <style>
     .custom-class {
         margin-inline: 1rem;
@@ -345,6 +387,12 @@ public class Operation
         color: peachpuff;
         background-color: tomato;
     }
+
+    .custom-btn {
+        color: aliceblue;
+        border-color: aliceblue;
+        background-color: crimson;
+    }
 </style>
 
 
@@ -354,8 +402,18 @@ public class Operation
 <BitButtonGroup Items=""styleClassCustoms""
                 Variant=""BitVariant.Text""
                 NameSelectors=""@(new() { Text = { Selector = i => i.Name },
-                                         IconName = { Selector = i => i.Icon } })"" />";
-    private readonly string example10CsharpCode = @"
+                                         IconName = { Selector = i => i.Icon } })"" />
+
+<BitButtonGroup Items=""basicCustoms""
+                Variant=""BitVariant.Text""
+                NameSelectors=""nameSelector""
+                Styles=""@(new() { Button = ""color: darkcyan; border-color: deepskyblue; background-color: azure;"" })"" />
+
+<BitButtonGroup Items=""basicCustoms""
+                Variant=""BitVariant.Text""
+                NameSelectors=""nameSelector""
+                Classes=""@(new() { Button = ""custom-btn"" })"" />";
+    private readonly string example11CsharpCode = @"
 private BitButtonGroupNameSelectors<Operation> nameSelector = new() { Text = { Selector = i => i.Name } };
 
 public class Operation
@@ -387,48 +445,6 @@ public class Operation
     }
 ];";
 
-    private readonly string example11RazorCode = @"
-<BitButtonGroup Items=""basicCustoms""
-                NameSelectors=""nameSelector""
-                OnItemClick=""(Operation item) => clickedCustom = item.Name"" />
-<div>Clicked item: <b>@clickedCustom</b></div>
-
-<BitButtonGroup Items=""eventsCustoms""
-                NameSelectors=""@(new() { Text = { Selector = i => i.Name },
-                                         IconName = { Selector = i => i.Icon },
-                                         OnClick = { Selector = i => i.Clicked } })"" />
-<div>Click count: <b>@clickCounter</b></div>";
-    private readonly string example11CsharpCode = @"
-private BitButtonGroupNameSelectors<Operation> nameSelector = new() { Text = { Selector = i => i.Name } };
-
-public class Operation
-{
-    public string? Name { get; set; }
-    public string? Icon { get; set; }
-    public Action<Operation>? Clicked { get; set; }
-}
-
-private int clickCounter;
-
-private List<Operation> basicCustoms =
-[
-    new() { Name = ""Add"" }, new() { Name = ""Edit"" }, new() { Name = ""Delete"" }
-];
-
-private List<Operation> eventsCustoms =
-[
-    new() { Name = ""Increase"", Icon = BitIconName.Add },
-    new() { Name = ""Reset"", Icon = BitIconName.Reset },
-    new() { Name = ""Decrease"", Icon = BitIconName.Remove }
-];
-
-protected override void OnInitialized()
-{
-    eventsCustoms[0].Clicked = _ => { clickCounter++; StateHasChanged(); };
-    eventsCustoms[1].Clicked = _ => { clickCounter = 0; StateHasChanged(); };
-    eventsCustoms[2].Clicked = _ => { clickCounter--; StateHasChanged(); };
-}";
-
     private readonly string example12RazorCode = @"
 <BitButtonGroup Dir=""BitDir.Rtl""
                 Items=""rtlCustoms""
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor
index f8988ea109..1ea39f8981 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor
@@ -33,134 +33,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Color" RazorCode="@example3RazorCode" CsharpCode="@example3CsharpCode" Id="example3">
-    <ExamplePreview>
-        <div>Offering a range of specialized colors, providing visual cues for specific states within your application.</div>
-        <br /><br />
-        <div class="example-content">
-            <div>Primary</div>
-            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Secondary</div>
-            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Tertiary</div>
-            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Info</div>
-            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Success</div>
-            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Warning</div>
-            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>SevereWarning</div>
-            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Error</div>
-            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div style="background:var(--bit-clr-fg-sec);padding:1rem">
-            <div class="example-content">
-                <div style="color:var(--bit-clr-bg-pri)">PrimaryBackground</div>
-                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Fill" Items="basicItems" />
-                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Outline" Items="basicItems" />
-                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Text" Items="basicItems" />
-            </div>
-            <br /><br />
-            <div class="example-content">
-                <div style="color:var(--bit-clr-bg-pri)">SecondaryBackground</div>
-                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Fill" Items="basicItems" />
-                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Outline" Items="basicItems" />
-                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Text" Items="basicItems" />
-            </div>
-            <br /><br />
-            <div class="example-content">
-                <div style="color:var(--bit-clr-bg-pri)">TertiaryBackground</div>
-                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Fill" Items="basicItems" />
-                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Outline" Items="basicItems" />
-                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Text" Items="basicItems" />
-            </div>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>PrimaryForeground</div>
-            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>SecondaryForeground</div>
-            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>TertiaryForeground</div>
-            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>PrimaryBorder</div>
-            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>SecondaryBorder</div>
-            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>TertiaryBorder</div>
-            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Fill" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Outline" Items="basicItems" />
-            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Text" Items="basicItems" />
-        </div>
-    </ExamplePreview>
-</ComponentExampleBox>
-
-<ComponentExampleBox Title="Icon" RazorCode="@example4RazorCode" CsharpCode="@example4CsharpCode" Id="example4">
+<ComponentExampleBox Title="Icon" RazorCode="@example3RazorCode" CsharpCode="@example3CsharpCode" Id="example3">
     <ExamplePreview>
         <div>Each item in the ButtonGroup can have an icon.</div>
         <br /><br />
@@ -181,7 +54,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="IconOnly" RazorCode="@example5RazorCode" CsharpCode="@example5CsharpCode" Id="example5">
+<ComponentExampleBox Title="IconOnly" RazorCode="@example4RazorCode" CsharpCode="@example4CsharpCode" Id="example4">
     <ExamplePreview>
         <div>The IconOnly allows buttons to display only icons without any text, ideal for minimalistic designs or limited space.</div>
         <br /><br />
@@ -219,7 +92,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="ReversedIcon" RazorCode="@example6RazorCode" CsharpCode="@example6CsharpCode" Id="example6">
+<ComponentExampleBox Title="ReversedIcon" RazorCode="@example5RazorCode" CsharpCode="@example5CsharpCode" Id="example5">
     <ExamplePreview>
         <div>Reverses the positions of the icon and the main content of the button.</div>
         <br /><br />
@@ -240,7 +113,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Toggled" RazorCode="@example7RazorCode" CsharpCode="@example7CsharpCode" Id="example7">
+<ComponentExampleBox Title="Toggled" RazorCode="@example6RazorCode" CsharpCode="@example6CsharpCode" Id="example6">
     <ExamplePreview>
         <div>The Toggled in BitButtonGroup allows you to control the active or inactive state of each button, providing clear visual feedback to users about which buttons are selected or currently in use.</div>
         <br /><br />
@@ -261,7 +134,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Vertical" RazorCode="@example8RazorCode" CsharpCode="@example8CsharpCode" Id="example8">
+<ComponentExampleBox Title="Vertical" RazorCode="@example7RazorCode" CsharpCode="@example7CsharpCode" Id="example7">
     <ExamplePreview>
         <div>By default the BitButtonGroup component is horizontal, but can be turned vertical by adding the <strong>Vertical</strong> property.</div>
         <br /><br />
@@ -284,6 +157,24 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
+<ComponentExampleBox Title="Events" RazorCode="@example8RazorCode" CsharpCode="@example8CsharpCode" Id="example8">
+    <ExamplePreview>
+        <div>Managing button click events.</div>
+        <br /><br />
+        <div class="example-content">
+            <div>Component's ItemClick event:</div>
+            <BitButtonGroup Items="basicItems" OnItemClick="(BitButtonGroupItem item) => clickedItem = item.Text" />
+            <div>Clicked item: <b>@clickedItem</b></div>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Item's Click event:</div>
+            <BitButtonGroup Items="eventsItems" />
+            <div>Click count: <b>@clickCounter</b></div>
+        </div>
+    </ExamplePreview>
+</ComponentExampleBox>
+
 <ComponentExampleBox Title="Size" RazorCode="@example9RazorCode" CsharpCode="@example9CsharpCode" Id="example9">
     <ExamplePreview>
         <div>Different sizes for buttons to meet design needs, ensuring flexibility within your application.</div>
@@ -311,37 +202,157 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Style & Class" RazorCode="@example10RazorCode" CsharpCode="@example10CsharpCode" Id="example10">
+<ComponentExampleBox Title="Color" RazorCode="@example10RazorCode" CsharpCode="@example10CsharpCode" Id="example10">
     <ExamplePreview>
-        <div>Empower customization by overriding default styles and classes, allowing tailored design modifications to suit specific UI requirements.</div>
+        <div>Offering a range of specialized colors, providing visual cues for specific states within your application.</div>
         <br /><br />
         <div class="example-content">
-            <div>Component's style & class:</div>
-            <BitButtonGroup Items="basicItems" Style="border-radius: 1rem; margin: 1rem; box-shadow: tomato 0 0 1rem;" />
-            <BitButtonGroup Items="basicItems" Class="custom-class" Variant="BitVariant.Outline" />
+            <div>Primary</div>
+            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Text" Items="basicItems" />
         </div>
         <br /><br />
         <div class="example-content">
-            <div>Item's style & class:</div>
-            <BitButtonGroup Items="styleClassItems" Variant="BitVariant.Text" />
+            <div>Secondary</div>
+            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Tertiary</div>
+            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Info</div>
+            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Success</div>
+            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Warning</div>
+            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>SevereWarning</div>
+            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Error</div>
+            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div style="background:var(--bit-clr-fg-sec);padding:1rem">
+            <div class="example-content">
+                <div style="color:var(--bit-clr-bg-pri)">PrimaryBackground</div>
+                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Fill" Items="basicItems" />
+                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Outline" Items="basicItems" />
+                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Text" Items="basicItems" />
+            </div>
+            <br /><br />
+            <div class="example-content">
+                <div style="color:var(--bit-clr-bg-pri)">SecondaryBackground</div>
+                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Fill" Items="basicItems" />
+                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Outline" Items="basicItems" />
+                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Text" Items="basicItems" />
+            </div>
+            <br /><br />
+            <div class="example-content">
+                <div style="color:var(--bit-clr-bg-pri)">TertiaryBackground</div>
+                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Fill" Items="basicItems" />
+                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Outline" Items="basicItems" />
+                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Text" Items="basicItems" />
+            </div>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>PrimaryForeground</div>
+            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>SecondaryForeground</div>
+            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>TertiaryForeground</div>
+            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>PrimaryBorder</div>
+            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>SecondaryBorder</div>
+            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>TertiaryBorder</div>
+            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Text" Items="basicItems" />
         </div>
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Events" RazorCode="@example11RazorCode" CsharpCode="@example11CsharpCode" Id="example11">
+<ComponentExampleBox Title="Style & Class" RazorCode="@example11RazorCode" CsharpCode="@example11CsharpCode" Id="example11">
     <ExamplePreview>
-        <div>Managing button click events.</div>
+        <div>Empower customization by overriding default styles and classes, allowing tailored design modifications to suit specific UI requirements.</div>
         <br /><br />
         <div class="example-content">
-            <div>Component's ItemClick event:</div>
-            <BitButtonGroup Items="basicItems" OnItemClick="(BitButtonGroupItem item) => clickedItem = item.Text" />
-            <div>Clicked item: <b>@clickedItem</b></div>
+            <div>Component's style & class:</div>
+            <BitButtonGroup Items="basicItems" Style="border-radius: 1rem; margin: 1rem; box-shadow: tomato 0 0 1rem;" />
+            <BitButtonGroup Items="basicItems" Class="custom-class" Variant="BitVariant.Outline" />
         </div>
         <br /><br />
         <div class="example-content">
-            <div>Item's Click event:</div>
-            <BitButtonGroup Items="eventsItems" />
-            <div>Click count: <b>@clickCounter</b></div>
+            <div>Item's style & class:</div>
+            <BitButtonGroup Items="styleClassItems" Variant="BitVariant.Text" />
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div><b>Styles</b> & <b>Classes</b>:</div>
+            <BitButtonGroup Items="basicItems"
+                            Variant="BitVariant.Text"
+                            Styles="@(new() { Button = "color: darkcyan; border-color: deepskyblue; background-color: azure;" })" />
+
+            <BitButtonGroup Items="basicItems"
+                            Variant="BitVariant.Text"
+                            Classes="@(new() { Button = "custom-btn" })" />
         </div>
     </ExamplePreview>
 </ComponentExampleBox>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs
index e41be97a4f..5431abfd76 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs
@@ -34,87 +34,10 @@ public partial class _BitButtonGroupItemDemo
 ];";
 
     private readonly string example3RazorCode = @"
-<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-
-<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-
-<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-
-<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Text"" Items=""basicItems"" />
-
-<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
-<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Text"" Items=""basicItems"" />";
-    private readonly string example3CsharpCode = @"
-private List<BitButtonGroupItem> basicItems = 
-[
-    new() { Text = ""Add"" }, new() { Text = ""Edit"" }, new() { Text = ""Delete"" }
-];";
-
-    private readonly string example4RazorCode = @"
 <BitButtonGroup Variant=""BitVariant.Fill"" Items=""iconItems"" />
 <BitButtonGroup Variant=""BitVariant.Outline"" Items=""iconItems"" />
 <BitButtonGroup Variant=""BitVariant.Text"" Items=""iconItems"" />";
-    private readonly string example4CsharpCode = @"
+    private readonly string example3CsharpCode = @"
 private List<BitButtonGroupItem> iconItems = 
 [
     new() { Text = ""Add"", IconName = BitIconName.Add },
@@ -122,7 +45,7 @@ public partial class _BitButtonGroupItemDemo
     new() { Text = ""Delete"", IconName = BitIconName.Delete }
 ];";
 
-    private readonly string example5RazorCode = @"
+    private readonly string example4RazorCode = @"
 <BitButtonGroup Variant=""BitVariant.Fill"" Items=""iconItems"" IconOnly />
 <BitButtonGroup Variant=""BitVariant.Outline"" Items=""iconItems"" IconOnly />
 <BitButtonGroup Variant=""BitVariant.Text"" Items=""iconItems"" IconOnly />
@@ -130,7 +53,7 @@ public partial class _BitButtonGroupItemDemo
 <BitButtonGroup Variant=""BitVariant.Fill"" Items=""onlyIconItems"" />
 <BitButtonGroup Variant=""BitVariant.Outline"" Items=""onlyIconItems"" />
 <BitButtonGroup Variant=""BitVariant.Text"" Items=""onlyIconItems"" />";
-    private readonly string example5CsharpCode = @"
+    private readonly string example4CsharpCode = @"
 private List<BitButtonGroupItem> iconItems = 
 [
     new() { Text = ""Add"", IconName = BitIconName.Add },
@@ -145,11 +68,11 @@ public partial class _BitButtonGroupItemDemo
     new() { Text = ""Delete"", IconName = BitIconName.Delete }
 ];";
 
-    private readonly string example6RazorCode = @"
+    private readonly string example5RazorCode = @"
 <BitButtonGroup Variant=""BitVariant.Fill"" Items=""reversedIconItems"" />
 <BitButtonGroup Variant=""BitVariant.Outline"" Items=""reversedIconItems"" />
 <BitButtonGroup Variant=""BitVariant.Text"" Items=""reversedIconItems"" />";
-    private readonly string example6CsharpCode = @"
+    private readonly string example5CsharpCode = @"
 private List<BitButtonGroupItem> reversedIconItems =
 [
     new() { Text = ""Add"", IconName = BitIconName.Add, ReversedIcon = true },
@@ -157,11 +80,11 @@ public partial class _BitButtonGroupItemDemo
     new() { Text = ""Delete"", IconName = BitIconName.Delete, ReversedIcon = true }
 ];";
 
-    private readonly string example7RazorCode = @"
+    private readonly string example6RazorCode = @"
 <BitButtonGroup Variant=""BitVariant.Fill"" Items=""toggledItems"" Toggled />
 <BitButtonGroup Variant=""BitVariant.Outline"" Items=""toggledItems"" Toggled />
 <BitButtonGroup Variant=""BitVariant.Text"" Items=""toggledItems"" Toggled />";
-    private readonly string example7CsharpCode = @"
+    private readonly string example6CsharpCode = @"
 private List<BitButtonGroupItem> toggledItems =
 [
     new() { OnText = ""Back (2X)"", OffText = ""Back"", OnIconName = BitIconName.RewindTwoX, OffIconName = BitIconName.Rewind },
@@ -169,16 +92,40 @@ public partial class _BitButtonGroupItemDemo
     new() { OnText = ""Forward (2X)"", OffText = ""Forward"", OnIconName = BitIconName.FastForwardTwoX, OffIconName = BitIconName.FastForward, ReversedIcon = true }
 ];";
 
-    private readonly string example8RazorCode = @"
+    private readonly string example7RazorCode = @"
 <BitButtonGroup Variant=""BitVariant.Fill"" Items=""basicItems"" Vertical />
 <BitButtonGroup Variant=""BitVariant.Outline"" Items=""basicItems"" Vertical />
 <BitButtonGroup Variant=""BitVariant.Text"" Items=""basicItems"" Vertical />";
-    private readonly string example8CsharpCode = @"
+    private readonly string example7CsharpCode = @"
 private List<BitButtonGroupItem> basicItems =
 [
     new() { Text = ""Add"" }, new() { Text = ""Edit"" }, new() { Text = ""Delete"" }
 ];";
 
+    private readonly string example8RazorCode = @"
+<BitButtonGroup Items=""basicItems"" OnItemClick=""(BitButtonGroupItem item) => clickedItem = item.Text"" />
+<div>Clicked item: <b>@clickedItem</b></div>
+
+<BitButtonGroup Items=""eventsItems"" />
+<div>Click count: <b>@clickCounter</b></div>";
+    private readonly string example8CsharpCode = @"
+private int clickCounter;
+private string? clickedItem;
+
+private List<BitButtonGroupItem> eventsItems =
+[
+    new() { Text = ""Increase"", IconName = BitIconName.Add },
+    new() { Text = ""Reset"", IconName = BitIconName.Reset },
+    new() { Text = ""Decrease"", IconName = BitIconName.Remove }
+];
+
+protected override void OnInitialized()
+{
+    eventsItems[0].OnClick = _ => { clickCounter++; StateHasChanged(); };
+    eventsItems[1].OnClick = _ => { clickCounter = 0; StateHasChanged(); };
+    eventsItems[2].OnClick = _ => { clickCounter--; StateHasChanged(); };
+}";
+
     private readonly string example9RazorCode = @"
 <BitButtonGroup Size=""BitSize.Small"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
 <BitButtonGroup Size=""BitSize.Small"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
@@ -198,6 +145,83 @@ public partial class _BitButtonGroupItemDemo
 ];";
 
     private readonly string example10RazorCode = @"
+<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Secondary"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Tertiary"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Info"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Success"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Warning"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.SevereWarning"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.Error"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+
+<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.PrimaryBackground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.SecondaryBackground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.TertiaryBackground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+
+<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.PrimaryForeground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.SecondaryForeground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.TertiaryForeground"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+
+<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.PrimaryBorder"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.SecondaryBorder"" Variant=""BitVariant.Text"" Items=""basicItems"" />
+
+<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Text"" Items=""basicItems"" />";
+    private readonly string example10CsharpCode = @"
+private List<BitButtonGroupItem> basicItems = 
+[
+    new() { Text = ""Add"" }, new() { Text = ""Edit"" }, new() { Text = ""Delete"" }
+];";
+
+    private readonly string example11RazorCode = @"
 <style>
     .custom-class {
         margin-inline: 1rem;
@@ -220,14 +244,28 @@ public partial class _BitButtonGroupItemDemo
         color: peachpuff;
         background-color: tomato;
     }
+
+    .custom-btn {
+        color: aliceblue;
+        border-color: aliceblue;
+        background-color: crimson;
+    }
 </style>
 
 
 <BitButtonGroup Items=""basicItems"" Style=""border-radius: 1rem; margin: 1rem; box-shadow: tomato 0 0 1rem;"" />
 <BitButtonGroup Items=""basicItems"" Class=""custom-class"" Variant=""BitVariant.Outline"" />
 
-<BitButtonGroup Items=""styleClassItems"" Variant=""BitVariant.Text"" />";
-    private readonly string example10CsharpCode = @"
+<BitButtonGroup Items=""styleClassItems"" Variant=""BitVariant.Text"" />
+
+<BitButtonGroup Items=""basicItems""
+                Variant=""BitVariant.Text""
+                Styles=""@(new() { Button = ""color: darkcyan; border-color: deepskyblue; background-color: azure;"" })"" />
+
+<BitButtonGroup Items=""basicItems""
+                Variant=""BitVariant.Text""
+                Classes=""@(new() { Button = ""custom-btn"" })"" />";
+    private readonly string example11CsharpCode = @"
 private List<BitButtonGroupItem> basicItems =
 [
     new() { Text = ""Add"" }, new() { Text = ""Edit"" }, new() { Text = ""Delete"" }
@@ -249,30 +287,6 @@ public partial class _BitButtonGroupItemDemo
     }
 ];";
 
-    private readonly string example11RazorCode = @"
-<BitButtonGroup Items=""basicItems"" OnItemClick=""(BitButtonGroupItem item) => clickedItem = item.Text"" />
-<div>Clicked item: <b>@clickedItem</b></div>
-
-<BitButtonGroup Items=""eventsItems"" />
-<div>Click count: <b>@clickCounter</b></div>";
-    private readonly string example11CsharpCode = @"
-private int clickCounter;
-private string? clickedItem;
-
-private List<BitButtonGroupItem> eventsItems =
-[
-    new() { Text = ""Increase"", IconName = BitIconName.Add },
-    new() { Text = ""Reset"", IconName = BitIconName.Reset },
-    new() { Text = ""Decrease"", IconName = BitIconName.Remove }
-];
-
-protected override void OnInitialized()
-{
-    eventsItems[0].OnClick = _ => { clickCounter++; StateHasChanged(); };
-    eventsItems[1].OnClick = _ => { clickCounter = 0; StateHasChanged(); };
-    eventsItems[2].OnClick = _ => { clickCounter--; StateHasChanged(); };
-}";
-
     private readonly string example12RazorCode = @"
 <BitButtonGroup Dir=""BitDir.Rtl"" Variant=""BitVariant.Fill"" Items=""rtlItems"" />
 <BitButtonGroup Dir=""BitDir.Rtl"" Variant=""BitVariant.Outline"" Items=""rtlItems"" />
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor
index 6828f69be3..f34499d397 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor
@@ -55,236 +55,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Color" RazorCode="@example3RazorCode" Id="example3">
-    <ExamplePreview>
-        <div>Offering a range of specialized colors, providing visual cues for specific states within your application.</div>
-        <br /><br />
-        <div class="example-content">
-            <div>Primary</div>
-            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Secondary</div>
-            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Tertiary</div>
-            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Info</div>
-            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Success</div>
-            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Warning</div>
-            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>SevereWarning</div>
-            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Error</div>
-            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div style="background:var(--bit-clr-fg-sec);padding:1rem">
-            <div class="example-content">
-                <div style="color:var(--bit-clr-bg-pri)">PrimaryBackground</div>
-                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-                </BitButtonGroup>
-                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-                </BitButtonGroup>
-                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-                </BitButtonGroup>
-            </div>
-            <br /><br />
-            <div class="example-content">
-                <div style="color:var(--bit-clr-bg-pri)">SecondaryBackground</div>
-                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-                </BitButtonGroup>
-                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-                </BitButtonGroup>
-                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-                </BitButtonGroup>
-            </div>
-            <br /><br />
-            <div class="example-content">
-                <div style="color:var(--bit-clr-bg-pri)">TertiaryBackground</div>
-                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-                </BitButtonGroup>
-                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-                </BitButtonGroup>
-                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-                </BitButtonGroup>
-            </div>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>PrimaryForeground</div>
-            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>SecondaryForeground</div>
-            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>TertiaryForeground</div>
-            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>PrimaryBorder</div>
-            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>SecondaryBorder</div>
-            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>TertiaryBorder</div>
-            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
-            </BitButtonGroup>
-        </div>
-    </ExamplePreview>
-</ComponentExampleBox>
-
-<ComponentExampleBox Title="Icon" RazorCode="@example4RazorCode" Id="example4">
+<ComponentExampleBox Title="Icon" RazorCode="@example3RazorCode" Id="example3">
     <ExamplePreview>
         <div>Each item in the ButtonGroup can have an icon.</div>
         <br /><br />
@@ -317,7 +88,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="IconOnly" RazorCode="@example5RazorCode" Id="example5">
+<ComponentExampleBox Title="IconOnly" RazorCode="@example4RazorCode" Id="example4">
     <ExamplePreview>
         <div>The IconOnly allows buttons to display only icons without any text, ideal for minimalistic designs or limited space.</div>
         <br /><br />
@@ -379,7 +150,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="ReversedIcon" RazorCode="@example6RazorCode" Id="example6">
+<ComponentExampleBox Title="ReversedIcon" RazorCode="@example5RazorCode" Id="example5">
     <ExamplePreview>
         <div>Reverses the positions of the icon and the main content of the button.</div>
         <br /><br />
@@ -412,7 +183,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Toggled" RazorCode="@example7RazorCode" Id="example7">
+<ComponentExampleBox Title="Toggled" RazorCode="@example6RazorCode" Id="example6">
     <ExamplePreview>
         <div>The Toggled in BitButtonGroup allows you to control the active or inactive state of each button, providing clear visual feedback to users about which buttons are selected or currently in use.</div>
         <br /><br />
@@ -445,7 +216,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Vertical" RazorCode="@example8RazorCode" Id="example8">
+<ComponentExampleBox Title="Vertical" RazorCode="@example7RazorCode" Id="example7">
     <ExamplePreview>
         <div>By default the BitButtonGroup component is horizontal, but can be turned vertical by adding the <strong>Vertical</strong> property.</div>
         <br /><br />
@@ -474,6 +245,32 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
+<ComponentExampleBox Title="Events" RazorCode="@example8RazorCode" CsharpCode="@example8CsharpCode" Id="example8">
+    <ExamplePreview>
+        <div>Managing button click events.</div>
+        <br /><br />
+        <div class="example-content">
+            <div>Component's ItemClick event:</div>
+            <BitButtonGroup OnItemClick="item => clickedOption = item.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" />
+                <BitButtonGroupOption Text="Edit" />
+                <BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <div>Clicked item: <b>@clickedOption</b></div>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Item's Click event:</div>
+            <BitButtonGroup TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Increase" IconName="@BitIconName.Add" OnClick="_ => { clickCounter++; StateHasChanged(); }" />
+                <BitButtonGroupOption Text="Reset" IconName="@BitIconName.Reset" OnClick="_ => { clickCounter=0; StateHasChanged(); }" />
+                <BitButtonGroupOption Text="Decrease" IconName="@BitIconName.Remove" OnClick="_ => { clickCounter--; StateHasChanged(); }" />
+            </BitButtonGroup>
+            <div>Click count: <b>@clickCounter</b></div>
+        </div>
+    </ExamplePreview>
+</ComponentExampleBox>
+
 <ComponentExampleBox Title="Size" RazorCode="@example9RazorCode" Id="example9">
     <ExamplePreview>
         <div>Different sizes for buttons to meet design needs, ensuring flexibility within your application.</div>
@@ -519,7 +316,236 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Style & Class" RazorCode="@example10RazorCode" Id="example10">
+<ComponentExampleBox Title="Color" RazorCode="@example10RazorCode" Id="example10">
+    <ExamplePreview>
+        <div>Offering a range of specialized colors, providing visual cues for specific states within your application.</div>
+        <br /><br />
+        <div class="example-content">
+            <div>Primary</div>
+            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Primary" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Secondary</div>
+            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Secondary" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Tertiary</div>
+            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Tertiary" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Info</div>
+            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Info" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Success</div>
+            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Success" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Warning</div>
+            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Warning" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>SevereWarning</div>
+            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.SevereWarning" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>Error</div>
+            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.Error" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div style="background:var(--bit-clr-fg-sec);padding:1rem">
+            <div class="example-content">
+                <div style="color:var(--bit-clr-bg-pri)">PrimaryBackground</div>
+                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+                </BitButtonGroup>
+                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+                </BitButtonGroup>
+                <BitButtonGroup Color="BitColor.PrimaryBackground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+                </BitButtonGroup>
+            </div>
+            <br /><br />
+            <div class="example-content">
+                <div style="color:var(--bit-clr-bg-pri)">SecondaryBackground</div>
+                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+                </BitButtonGroup>
+                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+                </BitButtonGroup>
+                <BitButtonGroup Color="BitColor.SecondaryBackground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+                </BitButtonGroup>
+            </div>
+            <br /><br />
+            <div class="example-content">
+                <div style="color:var(--bit-clr-bg-pri)">TertiaryBackground</div>
+                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+                </BitButtonGroup>
+                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+                </BitButtonGroup>
+                <BitButtonGroup Color="BitColor.TertiaryBackground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                    <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+                </BitButtonGroup>
+            </div>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>PrimaryForeground</div>
+            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.PrimaryForeground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>SecondaryForeground</div>
+            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.SecondaryForeground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>TertiaryForeground</div>
+            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.TertiaryForeground" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>PrimaryBorder</div>
+            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.PrimaryBorder" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>SecondaryBorder</div>
+            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.SecondaryBorder" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+        <br /><br />
+        <div class="example-content">
+            <div>TertiaryBorder</div>
+            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup Color="BitColor.TertiaryBorder" Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+    </ExamplePreview>
+</ComponentExampleBox>
+
+<ComponentExampleBox Title="Style & Class" RazorCode="@example11RazorCode" Id="example11">
     <ExamplePreview>
         <div>Empower customization by overriding default styles and classes, allowing tailored design modifications to suit specific UI requirements.</div>
         <br /><br />
@@ -541,31 +567,20 @@
                 <BitButtonGroupOption Text="Classed" IconName="@BitIconName.FormatPainter" Class="custom-item" />
             </BitButtonGroup>
         </div>
-    </ExamplePreview>
-</ComponentExampleBox>
-
-<ComponentExampleBox Title="Events" RazorCode="@example11RazorCode" CsharpCode="@example11CsharpCode" Id="example11">
-    <ExamplePreview>
-        <div>Managing button click events.</div>
         <br /><br />
         <div class="example-content">
-            <div>Component's ItemClick event:</div>
-            <BitButtonGroup OnItemClick="item => clickedOption = item.Text" TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Add" />
-                <BitButtonGroupOption Text="Edit" />
-                <BitButtonGroupOption Text="Delete" />
+            <div><b>Styles</b> & <b>Classes</b>:</div>
+            <BitButtonGroup Variant="BitVariant.Text"
+                            TItem="BitButtonGroupOption"
+                            Styles="@(new() { Button = "color: darkcyan; border-color: deepskyblue; background-color: azure;" })">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
             </BitButtonGroup>
-            <div>Clicked item: <b>@clickedOption</b></div>
-        </div>
-        <br /><br />
-        <div class="example-content">
-            <div>Item's Click event:</div>
-            <BitButtonGroup TItem="BitButtonGroupOption">
-                <BitButtonGroupOption Text="Increase" IconName="@BitIconName.Add" OnClick="_ => { clickCounter++; StateHasChanged(); }" />
-                <BitButtonGroupOption Text="Reset" IconName="@BitIconName.Reset" OnClick="_ => { clickCounter=0; StateHasChanged(); }" />
-                <BitButtonGroupOption Text="Decrease" IconName="@BitIconName.Remove" OnClick="_ => { clickCounter--; StateHasChanged(); }" />
+
+            <BitButtonGroup Variant="BitVariant.Text"
+                            TItem="BitButtonGroupOption"
+                            Classes="@(new() { Button = "custom-btn" })">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
             </BitButtonGroup>
-            <div>Click count: <b>@clickCounter</b></div>
         </div>
     </ExamplePreview>
 </ComponentExampleBox>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs
index 796c28abae..8c30e6d21c 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs
@@ -41,6 +41,164 @@ public partial class _BitButtonGroupOptionDemo
 </BitButtonGroup>";
 
     private readonly string example3RazorCode = @"
+<BitButtonGroup Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
+    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
+    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
+    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
+</BitButtonGroup>";
+
+    private readonly string example4RazorCode = @"
+<BitButtonGroup Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"" IconOnly>
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
+    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"" IconOnly>
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
+    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"" IconOnly>
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
+    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
+</BitButtonGroup>
+
+
+
+<BitButtonGroup Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
+    <BitButtonGroupOption IconName=""@BitIconName.Edit"" />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
+    <BitButtonGroupOption IconName=""@BitIconName.Edit"" />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
+    <BitButtonGroupOption IconName=""@BitIconName.Edit"" />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
+</BitButtonGroup>";
+
+    private readonly string example5RazorCode = @"
+<BitButtonGroup Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" ReversedIcon />
+    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" ReversedIcon />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" ReversedIcon />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" ReversedIcon />
+    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" ReversedIcon />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" ReversedIcon />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" ReversedIcon />
+    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" ReversedIcon />
+    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" ReversedIcon />
+</BitButtonGroup>";
+
+    private readonly string example6RazorCode = @"
+<BitButtonGroup Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"" Toggled>
+    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
+    <BitButtonGroupOption OnTitle=""Resume"" OffTitle=""Play"" OnIconName=""@BitIconName.PlayResume"" OffIconName=""@BitIconName.Play"" />
+    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"" Toggled>
+    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
+    <BitButtonGroupOption OnTitle=""Resume"" OffTitle=""Play"" OnIconName=""@BitIconName.PlayResume"" OffIconName=""@BitIconName.Play"" />
+    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"" Toggled>
+    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
+    <BitButtonGroupOption OnTitle=""Resume"" OffTitle=""Play"" OnIconName=""@BitIconName.PlayResume"" OffIconName=""@BitIconName.Play"" />
+    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
+</BitButtonGroup>";
+
+    private readonly string example7RazorCode = @"
+<BitButtonGroup Variant=""BitVariant.Fill"" Vertical TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Outline"" Vertical TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+
+<BitButtonGroup Variant=""BitVariant.Text"" Vertical TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>";
+
+    private readonly string example8RazorCode = @"
+<BitButtonGroup OnItemClick=""item => clickedOption = item.Text"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" />
+    <BitButtonGroupOption Text=""Edit"" />
+    <BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+<div>Clicked item: <b>@clickedOption</b></div>
+
+<BitButtonGroup TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Increase"" IconName=""@BitIconName.Add"" OnClick=""_ => { clickCounter++; StateHasChanged(); }"" />
+    <BitButtonGroupOption Text=""Reset"" IconName=""@BitIconName.Reset"" OnClick=""_ => { clickCounter=0; StateHasChanged(); }"" />
+    <BitButtonGroupOption Text=""Decrease"" IconName=""@BitIconName.Remove"" OnClick=""_ => { clickCounter--; StateHasChanged(); }"" />
+</BitButtonGroup>
+<div>Click count: <b>@clickCounter</b></div>";
+    private readonly string example8CsharpCode = @"
+private int clickCounter;
+private string? clickedOption;";
+
+    private readonly string example9RazorCode = @"
+<BitButtonGroup Size=""BitSize.Small"" Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+<BitButtonGroup Size=""BitSize.Small"" Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+<BitButtonGroup Size=""BitSize.Small"" Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+
+<BitButtonGroup Size=""BitSize.Medium"" Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+<BitButtonGroup Size=""BitSize.Medium"" Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+<BitButtonGroup Size=""BitSize.Medium"" Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+
+<BitButtonGroup Size=""BitSize.Large"" Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+<BitButtonGroup Size=""BitSize.Large"" Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+<BitButtonGroup Size=""BitSize.Large"" Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>";
+
+    private readonly string example10RazorCode = @"
 <BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
     <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
 </BitButtonGroup>
@@ -214,147 +372,7 @@ public partial class _BitButtonGroupOptionDemo
     <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
 </BitButtonGroup>";
 
-    private readonly string example4RazorCode = @"
-<BitButtonGroup Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
-    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
-    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
-    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
-</BitButtonGroup>";
-
-    private readonly string example5RazorCode = @"
-<BitButtonGroup Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"" IconOnly>
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
-    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"" IconOnly>
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
-    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"" IconOnly>
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
-    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
-</BitButtonGroup>
-
-
-
-<BitButtonGroup Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
-    <BitButtonGroupOption IconName=""@BitIconName.Edit"" />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
-    <BitButtonGroupOption IconName=""@BitIconName.Edit"" />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" />
-    <BitButtonGroupOption IconName=""@BitIconName.Edit"" />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" />
-</BitButtonGroup>";
-
-    private readonly string example6RazorCode = @"
-<BitButtonGroup Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" ReversedIcon />
-    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" ReversedIcon />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" ReversedIcon />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" ReversedIcon />
-    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" ReversedIcon />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" ReversedIcon />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" IconName=""@BitIconName.Add"" ReversedIcon />
-    <BitButtonGroupOption Text=""Edit"" IconName=""@BitIconName.Edit"" ReversedIcon />
-    <BitButtonGroupOption Text=""Delete"" IconName=""@BitIconName.Delete"" ReversedIcon />
-</BitButtonGroup>";
-
-    private readonly string example7RazorCode = @"
-<BitButtonGroup Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"" Toggled>
-    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
-    <BitButtonGroupOption OnTitle=""Resume"" OffTitle=""Play"" OnIconName=""@BitIconName.PlayResume"" OffIconName=""@BitIconName.Play"" />
-    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"" Toggled>
-    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
-    <BitButtonGroupOption OnTitle=""Resume"" OffTitle=""Play"" OnIconName=""@BitIconName.PlayResume"" OffIconName=""@BitIconName.Play"" />
-    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"" Toggled>
-    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
-    <BitButtonGroupOption OnTitle=""Resume"" OffTitle=""Play"" OnIconName=""@BitIconName.PlayResume"" OffIconName=""@BitIconName.Play"" />
-    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
-</BitButtonGroup>";
-
-    private readonly string example8RazorCode = @"
-<BitButtonGroup Variant=""BitVariant.Fill"" Vertical TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Outline"" Vertical TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>
-
-<BitButtonGroup Variant=""BitVariant.Text"" Vertical TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>";
-
-    private readonly string example9RazorCode = @"
-<BitButtonGroup Size=""BitSize.Small"" Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>
-<BitButtonGroup Size=""BitSize.Small"" Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>
-<BitButtonGroup Size=""BitSize.Small"" Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>
-
-<BitButtonGroup Size=""BitSize.Medium"" Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>
-<BitButtonGroup Size=""BitSize.Medium"" Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>
-<BitButtonGroup Size=""BitSize.Medium"" Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>
-
-<BitButtonGroup Size=""BitSize.Large"" Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>
-<BitButtonGroup Size=""BitSize.Large"" Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>
-<BitButtonGroup Size=""BitSize.Large"" Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
-</BitButtonGroup>";
-
-    private readonly string example10RazorCode = @"
+    private readonly string example11RazorCode = @"
 <style>
     .custom-class {
         margin-inline: 1rem;
@@ -377,6 +395,12 @@ public partial class _BitButtonGroupOptionDemo
         color: peachpuff;
         background-color: tomato;
     }
+
+    .custom-btn {
+        color: aliceblue;
+        border-color: aliceblue;
+        background-color: crimson;
+    }
 </style>
 
 
@@ -392,25 +416,19 @@ public partial class _BitButtonGroupOptionDemo
 <BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
     <BitButtonGroupOption Text=""Styled"" IconName=""@BitIconName.Brush"" Style=""color: tomato; border-color: brown; background-color: peachpuff;"" />
     <BitButtonGroupOption Text=""Classed"" IconName=""@BitIconName.FormatPainter"" Class=""custom-item"" />
-</BitButtonGroup>";
-
-    private readonly string example11RazorCode = @"
-<BitButtonGroup OnItemClick=""item => clickedOption = item.Text"" TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Add"" />
-    <BitButtonGroupOption Text=""Edit"" />
-    <BitButtonGroupOption Text=""Delete"" />
 </BitButtonGroup>
-<div>Clicked item: <b>@clickedOption</b></div>
 
-<BitButtonGroup TItem=""BitButtonGroupOption"">
-    <BitButtonGroupOption Text=""Increase"" IconName=""@BitIconName.Add"" OnClick=""_ => { clickCounter++; StateHasChanged(); }"" />
-    <BitButtonGroupOption Text=""Reset"" IconName=""@BitIconName.Reset"" OnClick=""_ => { clickCounter=0; StateHasChanged(); }"" />
-    <BitButtonGroupOption Text=""Decrease"" IconName=""@BitIconName.Remove"" OnClick=""_ => { clickCounter--; StateHasChanged(); }"" />
+<BitButtonGroup Variant=""BitVariant.Text""
+                TItem=""BitButtonGroupOption""
+                Styles=""@(new() { Button = ""color: darkcyan; border-color: deepskyblue; background-color: azure;"" })"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
 </BitButtonGroup>
-<div>Click count: <b>@clickCounter</b></div>";
-    private readonly string example11CsharpCode = @"
-private int clickCounter;
-private string? clickedOption;";
+
+<BitButtonGroup Variant=""BitVariant.Text""
+                TItem=""BitButtonGroupOption""
+                Classes=""@(new() { Button = ""custom-btn"" })"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>";
 
     private readonly string example12RazorCode = @"
 <BitButtonGroup Dir=""BitDir.Rtl"" Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">

From 4a66fe2a4053778e586329b01d6eff369508a085 Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Fri, 27 Dec 2024 21:15:50 +0100
Subject: [PATCH 06/28] feat(templates): improve boilerplate maui project #9549
 (#9550)

---
 .github/workflows/bit.full.ci.yml             | 12 +--
 .../Extensions/IConfigurationExtensions.cs    |  2 +-
 .../Boilerplate.Client.Maui/App.xaml.cs       | 88 ++++++++++++++++---
 .../Boilerplate.Client.Maui.csproj            |  8 ++
 .../Components/Pages/AboutPage.razor.cs       | 23 +++--
 .../Boilerplate.Client.Maui/MauiProgram.cs    | 15 +++-
 .../Services/WindowsLocalHttpServer.cs        |  2 +-
 .../src/Directory.Packages.props              |  3 +
 .../Program.Services.cs                       |  2 +-
 .../Server/Boilerplate.Server.Api/Program.cs  |  2 +-
 .../Server/Boilerplate.Server.Web/Program.cs  |  2 +-
 .../src/Shared/Resources/AppStrings.fa.resx   |  4 +-
 .../src/Shared/Resources/AppStrings.nl.resx   |  4 +-
 .../src/Shared/Resources/AppStrings.resx      |  4 +-
 .../Services/AppPlatform.cs                   |  2 +-
 .../src/Shared/Services/CultureInfoManager.cs |  2 +-
 16 files changed, 135 insertions(+), 40 deletions(-)
 rename src/Templates/Boilerplate/Bit.Boilerplate/src/{Client/Boilerplate.Client.Core => Shared}/Services/AppPlatform.cs (95%)

diff --git a/.github/workflows/bit.full.ci.yml b/.github/workflows/bit.full.ci.yml
index 003f326ba4..bb30fe241c 100644
--- a/.github/workflows/bit.full.ci.yml
+++ b/.github/workflows/bit.full.ci.yml
@@ -146,33 +146,33 @@ jobs:
       continue-on-error: true
       run: |
         dotnet new bit-bp --name TestPostgreSQL --database PostgreSQL --framework net8.0 --signalR
-        cd TestPostgreSQL/src/Server/TestPostgreSQL.Server.Api/
+        cd TestPostgreSQL/src/Server/TestPostgreSQL.Server.Web/
         dotnet build
         cd ../../../../
         dotnet new bit-bp --name TestMySql --database MySql --framework net8.0 --sample Admin --offlineDb
-        cd TestMySql/src/Server/TestMySql.Server.Api/
+        cd TestMySql/src/Server/TestMySql.Server.Web/
         dotnet build
         cd ../../../../
         dotnet new bit-bp --name TestOther --database Other --framework net9.0 --sample Todo --sentry
-        cd TestOther/src/Server/TestOther.Server.Api/
+        cd TestOther/src/Server/TestOther.Server.Web/
         dotnet build
 
     - name: Test file storage options
       continue-on-error: true
       run: |
         dotnet new bit-bp --name TestLocal --filesStorage Local --framework net8.0 --appInsights
-        cd TestLocal/src/Server/TestLocal.Server.Api/
+        cd TestLocal/src/Server/TestLocal.Server.Web/
         dotnet build
         cd ../../../../
         dotnet new bit-bp --name TestAzureBlobStorage --filesStorage AzureBlobStorage --framework net9.0 --captcha reCaptcha  --notification
-        cd TestAzureBlobStorage/src/Server/TestAzureBlobStorage.Server.Api/
+        cd TestAzureBlobStorage/src/Server/TestAzureBlobStorage.Server.Web/
         dotnet build
 
     - name: Test backend setup options
       continue-on-error: true
       run: |
         dotnet new bit-bp --name TestStandalone --api Standalone --framework net8.0
-        cd TestStandalone/src/Server/TestStandalone.Server.Api/
+        cd TestStandalone/src/Server/TestStandalone.Server.Web/
         dotnet build
         cd ../
         cd TestStandalone.Server.Web/
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IConfigurationExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IConfigurationExtensions.cs
index b4ec8c4355..ba80cbb651 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IConfigurationExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IConfigurationExtensions.cs
@@ -13,7 +13,7 @@ public static string GetServerAddress(this IConfiguration configuration)
 
         if (AppEnvironment.IsDev() &&
             serverAddress.Contains("localhost", StringComparison.InvariantCultureIgnoreCase) &&
-            OperatingSystem.IsAndroid())
+            AppPlatform.IsAndroid)
         {
             const string androidEmulatorDevMachineIP = "10.0.2.2"; // Special alias to your host loopback interface in Android Emulators (127.0.0.1 on your development machine)
             serverAddress = serverAddress.Replace("localhost", androidEmulatorDevMachineIP, StringComparison.InvariantCultureIgnoreCase);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
index 0e8c2635b4..cf447680d7 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
@@ -1,24 +1,55 @@
-[assembly: XamlCompilation(XamlCompilationOptions.Compile)]
+//+:cnd:noEmit
+//#if (framework == 'net9.0')
+using Maui.AppStores;
+using Maui.InAppReviews;
+using System.Runtime.InteropServices;
+//#endif
+
+[assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 
 namespace Boilerplate.Client.Maui;
 
 public partial class App
 {
     private readonly Page mainPage;
+    //#if (framework == 'net9.0')
+    private readonly IStorageService storageService;
+    //#endif
     private readonly IExceptionHandler exceptionHandler;
     private readonly IBitDeviceCoordinator deviceCoordinator;
     private readonly IStringLocalizer<AppStrings> localizer;
 
     public App(MainPage mainPage,
+        //#if (framework == 'net9.0')
+        PubSubService pubSubService,
+        IStorageService storageService,
+        //#endif
         IExceptionHandler exceptionHandler,
         IBitDeviceCoordinator deviceCoordinator,
-        IStorageService storageService,
         IStringLocalizer<AppStrings> localizer)
     {
+        this.localizer = localizer;
+        //#if (framework == 'net9.0')
+        this.storageService = storageService;
+        //#endif
         this.exceptionHandler = exceptionHandler;
         this.deviceCoordinator = deviceCoordinator;
         this.mainPage = new NavigationPage(mainPage);
-        this.localizer = localizer;
+
+        //#if (framework == 'net9.0')
+        pubSubService.Subscribe(ClientPubSubMessages.PROFILE_UPDATED, async _ =>
+        {
+            // It's an opportune moment to request a store review. (:
+            await Dispatcher.DispatchAsync(async () =>
+            {
+                if ((await storageService.GetItem("StoreReviewRequested")) is not "true")
+                {
+                    await storageService.SetItem("StoreReviewRequested", "true");
+                    ReviewStatus status = await InAppReview.Current.RequestAsync();
+                }
+            });
+        });
+        //#endif
 
         InitializeComponent();
     }
@@ -28,7 +59,7 @@ protected override Window CreateWindow(IActivationState? activationState)
         return new Window(mainPage) { };
     }
 
-    protected async override void OnStart()
+    protected override async void OnStart()
     {
         try
         {
@@ -36,9 +67,8 @@ protected async override void OnStart()
 
             await deviceCoordinator.ApplyTheme(AppInfo.Current.RequestedTheme is AppTheme.Dark);
 
-//-:cnd:noEmit
+            //-:cnd:noEmit
 #if Android
-
             //+:cnd:noEmit
             //#if (framework == 'net9.0')
             const int minimumSupportedWebViewVersion = 94;
@@ -51,20 +81,58 @@ protected async override void OnStart()
             */
             //#endif
             //#endif
-            //-:cnd:noEmit
 
             if (Version.TryParse(Android.Webkit.WebView.CurrentWebViewPackage?.VersionName, out var webViewVersion) &&
-        webViewVersion.Major < minimumSupportedWebViewVersion)
+                webViewVersion.Major < minimumSupportedWebViewVersion)
             {
-                await App.Current!.Windows.First().Page!.DisplayAlert("Boilerplate", localizer[nameof(AppStrings.UpdateWebViewThroughGooglePlay)], localizer[nameof(AppStrings.Ok)]);
+                await App.Current!.Windows[0].Page!.DisplayAlert("Boilerplate", localizer[nameof(AppStrings.UpdateWebViewThroughGooglePlay)], localizer[nameof(AppStrings.Ok)]);
                 await Launcher.OpenAsync($"https://play.google.com/store/apps/details?id={Android.Webkit.WebView.CurrentWebViewPackage.PackageName}");
             }
-//-:cnd:noEmit
+            //-:cnd:noEmit
 #endif
+            //+:cnd:noEmit
+
+            //#if (framework == 'net9.0')
+            await CheckForUpdates();
+            //#endif
         }
         catch (Exception exp)
         {
             exceptionHandler.Handle(exp);
         }
     }
+
+    //#if (framework == 'net9.0')
+    private async Task CheckForUpdates()
+    {
+        if (AppPlatform.IsAndroid)
+            return; // Android has in-app update feature.
+
+        await Task.Delay(TimeSpan.FromSeconds(3)); // No rush to check for updates.
+
+        try
+        {
+            if (await AppStoreInfo.Current.IsUsingLatestVersionAsync() is false)
+            {
+                var newVersion = await AppStoreInfo.Current.GetLatestVersionAsync();
+                var releaseNotes = (await AppStoreInfo.Current.GetInformationAsync()).ReleaseNotes;
+
+                if (await storageService.GetItem($"{newVersion}_UpdateFromVersionIsRequested") is not "true")
+                {
+                    await storageService.SetItem($"{newVersion}_UpdateFromVersionIsRequested", "true");
+
+                    // It's an opportune moment to request an update. (:
+                    // https://github.com/oscoreio/Maui.AppStoreInfo
+                    if (await App.Current!.Windows[0].Page!.DisplayAlert(localizer[nameof(AppStrings.NewVersionIsAvailable), newVersion], localizer[nameof(AppStrings.UpdateToNewVersion), releaseNotes], localizer[nameof(AppStrings.Yes)], localizer[nameof(AppStrings.No)]) is true)
+                    {
+                        await AppStoreInfo.Current.OpenApplicationInStoreAsync();
+                    }
+                }
+            }
+        }
+        catch (InvalidOperationException) when ((AppPlatform.IsIOS || AppPlatform.IsMacOS) && AppEnvironment.IsDev()) { }
+        catch (FileNotFoundException) { }
+        catch (COMException) { }
+    }
+    //#endif
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj
index 725fdf6be1..7fc1cf70dc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj
@@ -167,6 +167,14 @@
         <!--/-:msbuild-conditional:noEmit -->
     </ItemGroup>
 
+    <!--/+:msbuild-conditional:noEmit -->
+    <ItemGroup Condition="'$(framework)' == 'net9.0' OR '$(framework)' == ''">
+        <PackageReference Include="Oscore.Maui.AppStoreInfo" />
+        <PackageReference Include="Oscore.Maui.InAppReviews" />
+        <PackageReference Include="Oscore.Maui.Android.InAppUpdates" />
+    </ItemGroup>
+    <!--/-:msbuild-conditional:noEmit -->
+
     <Target Name="BeforeBuildTasks" AfterTargets="CoreCompile">
         <Error Text="Enable long paths in Windows. https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=powershell#enable-long-paths-in-windows-10-version-1607-and-later" Condition=" $([MSBuild]::IsOSPlatform('windows')) AND $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem', 'LongPathsEnabled', null, RegistryView.Registry64)) != '1' " />
         <CallTarget Targets="BuildCssFiles" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs
index 699fbf5340..0115021d51 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs
@@ -1,4 +1,8 @@
-//-:cnd:noEmit
+//+:cnd:noEmit
+
+//#if (framework == 'net9.0')
+using Maui.AppStores;
+//#endif
 
 namespace Boilerplate.Client.Maui.Components.Pages;
 
@@ -10,12 +14,12 @@ public partial class AboutPage
     protected override string? Subtitle => string.Empty;
 
 
+    private string oem = default!;
     private string appName = default!;
-    private string appVersion = default!;
-    private string processId = default!;
-    private string platform = default!;
     private string webView = default!;
-    private string oem = default!;
+    private string platform = default!;
+    private string processId = default!;
+    private string appVersion = default!;
 
     protected async override Task OnInitAsync()
     {
@@ -23,11 +27,14 @@ protected async override Task OnInitAsync()
         // call third-party Java, Kotlin, Swift, and Objective-C libraries.
         // https://stackoverflow.com/a/2941199/2720104
         appName = AppInfo.Name;
-        appVersion = telemetryContext.AppVersion!;
-        platform = telemetryContext.Platform!;
         webView = telemetryContext.WebView!;
-        processId = Environment.ProcessId.ToString();
+        platform = telemetryContext.Platform!;
         oem = DeviceInfo.Current.Manufacturer;
+        appVersion = telemetryContext.AppVersion!;
+        processId = Environment.ProcessId.ToString();
+        //#if (framework == 'net9.0')
+        appVersion += $" / {await AppStoreInfo.Current.GetLatestVersionAsync(CurrentCancellationToken)}";
+        //#endif
 
         await base.OnInitAsync();
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.cs
index 6259f4c1dc..ff88c32bbf 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.cs
@@ -1,13 +1,17 @@
-//-:cnd:noEmit
+//+:cnd:noEmit
 using Microsoft.Maui.Platform;
 using Microsoft.Maui.LifecycleEvents;
-//+:cnd:noEmit
 //#if (notification == true)
 using Plugin.LocalNotification;
 //#endif
-//-:cnd:noEmit
 using Boilerplate.Client.Core.Styles;
 using Boilerplate.Client.Maui.Services;
+//#if (framework == 'net9.0')
+using Maui.AppStores;
+using Maui.InAppReviews;
+using Maui.Android.InAppUpdates;
+//#endif
+//-:cnd:noEmit
 #if iOS || Mac
 using UIKit;
 using WebKit;
@@ -38,6 +42,11 @@ public static MauiApp CreateMauiApp()
         //+:cnd:noEmit
         builder
             .UseMauiApp<App>()
+            //#if (framework == 'net9.0')
+            .UseInAppReviews()
+            .UseAppStoreInfo()
+            .UseAndroidInAppUpdates()
+            //#endif
             //#if (sentry == true)
             .UseSentry(options =>
             {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs
index c670e1748f..2e4e7772f3 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs
@@ -32,7 +32,7 @@ public int Start(CancellationToken cancellationToken)
 
                     ctx.Redirect(url);
 
-                    Application.OpenForms[0]!.Activate();
+                    await Application.OpenForms[0]!.InvokeAsync(() => Application.OpenForms[0]!.Activate(), cancellationToken);
 
                     await Routes.OpenUniversalLink(ctx.Request.Url.PathAndQuery, replace: true);
                 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
index 31ed6df3e0..236556000f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
@@ -29,6 +29,9 @@
         <PackageVersion Include="Microsoft.Extensions.Logging.EventLog" Version="9.0.0" />
         <PackageVersion Include="Microsoft.Extensions.Logging.EventSource" Version="9.0.0" />
         <!--/+:msbuild-conditional:noEmit -->
+        <PackageVersion Include="Oscore.Maui.AppStoreInfo" Version="1.1.0" />
+        <PackageVersion Include="Oscore.Maui.InAppReviews" Version="1.1.0" />
+        <PackageVersion Include="Oscore.Maui.Android.InAppUpdates" Version="1.2.0" />
         <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.AspNetCore" Version="5.0.0" />
         <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Extensions.Logging" Version="5.0.0" />
         <PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Maui" Version="5.0.0" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
index b777853cb8..fd91fa54cd 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
@@ -288,7 +288,7 @@ private static void AddIdentity(WebApplicationBuilder builder)
         var identityOptions = appSettings.Identity;
 
         var certificatePath = Path.Combine(AppContext.BaseDirectory, "DataProtectionCertificate.pfx");
-        var certificate = new X509Certificate2(certificatePath, appSettings.DataProtectionCertificatePassword, OperatingSystem.IsWindows() ? X509KeyStorageFlags.EphemeralKeySet : X509KeyStorageFlags.DefaultKeySet);
+        var certificate = new X509Certificate2(certificatePath, appSettings.DataProtectionCertificatePassword, AppPlatform.IsWindows ? X509KeyStorageFlags.EphemeralKeySet : X509KeyStorageFlags.DefaultKeySet);
 
         services.AddDataProtection()
             .PersistKeysToDbContext<AppDbContext>()
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.cs
index 5f051f2b91..0c58fc6b62 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.cs
@@ -16,7 +16,7 @@ public static async Task Main(string[] args)
         //#endif
 
         // The following line (using the * in the URL), allows the emulators and mobile devices to access the app using the host IP address.
-        if (builder.Environment.IsDevelopment() && OperatingSystem.IsWindows())
+        if (builder.Environment.IsDevelopment() && AppPlatform.IsWindows)
         {
             builder.WebHost.UseUrls("http://localhost:5031", "http://*:5031");
         }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.cs
index 554278a1bf..3e6f3cc193 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.cs
@@ -27,7 +27,7 @@ public static async Task Main(string[] args)
         //#endif
 
         // The following line (using the * in the URL), allows the emulators and mobile devices to access the app using the host IP address.
-        if (builder.Environment.IsDevelopment() && OperatingSystem.IsWindows())
+        if (builder.Environment.IsDevelopment() && AppPlatform.IsWindows)
         {
             builder.WebHost.UseUrls("http://localhost:5030", "http://*:5030");
         }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
index 42ca3a8258..fc3341aaee 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
@@ -1012,10 +1012,10 @@
     <value>بروز رسانی</value>
   </data>
     <data name="NewVersionIsAvailable" xml:space="preserve">
-    <value>نسخه جدید در دسترس است</value>
+    <value>نسخه جدید {0} در دسترس است</value>
   </data>
     <data name="UpdateToNewVersion" xml:space="preserve">
-    <value>آیا می خواهید به نسخه جدید بروید؟</value>
+    <value>آیا می خواهید به نسخه جدید بروید؟ {0}</value>
   </data>
     <data name="AboutTitle" xml:space="preserve">
     <value>درباره</value>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
index 2c766e5494..7e788854da 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
@@ -1012,10 +1012,10 @@
     <value>Update</value>
   </data>
     <data name="NewVersionIsAvailable" xml:space="preserve">
-    <value>Nieuwe versie is beschikbaar</value>
+    <value>Nieuwe versie {0} is beschikbaar</value>
   </data>
     <data name="UpdateToNewVersion" xml:space="preserve">
-    <value>Wilt u updaten naar de nieuwe versie?</value>
+    <value>Wilt u updaten naar de nieuwe versie? {0}</value>
   </data>
     <data name="AboutTitle" xml:space="preserve">
     <value>Over</value>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
index 6b47a6a849..2073430021 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
@@ -1012,10 +1012,10 @@
     <value>Update</value>
   </data>
     <data name="NewVersionIsAvailable" xml:space="preserve">
-    <value>New version is available</value>
+    <value>New version {0} is available</value>
   </data>
     <data name="UpdateToNewVersion" xml:space="preserve">
-    <value>Would you like to update to the new version?</value>
+    <value>Would you like to update to the new version? {0}</value>
   </data>
     <data name="AboutTitle" xml:space="preserve">
     <value>About</value>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppPlatform.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/AppPlatform.cs
similarity index 95%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppPlatform.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/AppPlatform.cs
index 4c451e99bc..fa1fe8f882 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppPlatform.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/AppPlatform.cs
@@ -1,6 +1,6 @@
 using System.Runtime.Versioning;
 
-namespace Boilerplate.Client.Core.Services;
+namespace Boilerplate.Shared.Services;
 
 public static partial class AppPlatform
 {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs
index 982ae71684..14e0b9f3f2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs
@@ -27,7 +27,7 @@ public static (string DisplayName, CultureInfo Culture)[] SupportedCultures =>
 
     public static CultureInfo CreateCultureInfo(string name)
     {
-        var cultureInfo = OperatingSystem.IsBrowser() ? CultureInfo.CreateSpecificCulture(name) : new CultureInfo(name);
+        var cultureInfo = AppPlatform.IsBrowser ? CultureInfo.CreateSpecificCulture(name) : new CultureInfo(name);
 
         if (name == "fa-IR")
         {

From baf0aa52465cb0164260430ea9d4083607e271c1 Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Sat, 28 Dec 2024 18:05:32 +0330
Subject: [PATCH 07/28] feat(templates): make social sign-in buttons clearer in
 Boilerplate #9553 (#9554)

---
 .../Components/Pages/Identity/Components/SocialButton.razor     | 2 +-
 .../Components/Pages/Identity/Components/SocialRow.razor        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/Components/SocialButton.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/Components/SocialButton.razor
index ef24d9ac7c..833c437c9e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/Components/SocialButton.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/Components/SocialButton.razor
@@ -9,7 +9,7 @@
            OnClick="OnClick"
            Size="BitSize.Small"
            Class="social-button"
-           Variant="BitVariant.Text"
+           Variant="BitVariant.Fill"
            ButtonType="BitButtonType.Button"
            Color="BitColor.SecondaryBackground">
     @ChildContent
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/Components/SocialRow.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/Components/SocialRow.razor
index 36ef1224fd..3e17bd8b71 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/Components/SocialRow.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/Components/SocialRow.razor
@@ -1,7 +1,7 @@
 @inherits AppComponentBase
 
 <section>
-    <BitStack Horizontal Alignment="BitAlignment.Center" Gap="2rem">
+    <BitStack Horizontal Alignment="BitAlignment.SpaceBetween">
         <SocialButton OnClick="WrapHandled(HandleGoogle)" Title="@Localizer[AppStrings.GoogleSignInButtonText]">
             <GoogleIcon />
         </SocialButton>

From 7a0b43dd2823728ab6ee08d80157c9912a1c9f83 Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Sat, 28 Dec 2024 21:40:37 +0100
Subject: [PATCH 08/28] feat(templates): add support for Boilerplate multiple
 web apps on different domains with one backend #9551 (#9552)

---
 .github/workflows/admin-sample.cd.yml         | 13 +++++---
 .github/workflows/todo-sample.cd.yml          | 17 ++++++----
 .../.azure-devops/workflows/cd.yml            |  4 +--
 .../Bit.Boilerplate/.github/workflows/cd.yml  |  4 +--
 .../.template.config/ide.host.json            |  8 +++--
 .../.template.config/template.json            | 32 ++++++++++++++++---
 .../Components/AppDataAnnotationsValidator.cs |  2 +-
 .../Components/Layout/NavBar.razor.cs         |  6 ----
 .../Components/Layout/RootContainer.razor     | 28 ++++++++--------
 .../Components/Layout/RootContainer.razor.cs  |  1 -
 .../Components/Layout/RootLayout.razor        |  1 -
 .../Components/Layout/RootLayout.razor.cs     | 25 ++++-----------
 .../Dashboard/DashboardPage.razor.cs          |  2 +-
 .../Pages/Authorized/Todo/TodoPage.razor.cs   |  2 +-
 .../Components/Pages/TermsPage.razor          |  2 +-
 .../Components/Parameters.cs                  |  1 -
 .../Extensions/IConfigurationExtensions.cs    |  4 +--
 .../Services/AuthManager.cs                   |  5 +--
 .../Services/Contracts/ITelemetryContext.cs   |  2 +-
 .../ExceptionDelegatingHandler.cs             |  2 +-
 .../Services/ThemeService.cs                  |  1 -
 .../Boilerplate.Client.Maui/App.xaml.cs       |  3 --
 .../ClientMauiSettings.cs                     |  6 +++-
 .../Components/Pages/AboutPage.razor.cs       |  4 +--
 .../MauiProgram.Services.cs                   | 15 +++++++--
 .../Platforms/Android/MainActivity.cs         |  2 +-
 .../Platforms/Android/MainApplication.cs      |  8 ++---
 .../AndroidPushNotificationService.cs         |  2 +-
 .../MacCatalystPushNotificationService.cs     |  2 +-
 .../iOS/Entitlements.Development.plist        |  4 +--
 .../iOS/Entitlements.Production.plist         |  4 +--
 .../Services/iOSPushNotificationService.cs    |  2 +-
 .../Services/MauiLocalHttpServer.cs           |  9 +++++-
 .../appsettings.Production.json               |  2 +-
 .../Boilerplate.Client.Maui/appsettings.json  | 15 ++++++++-
 .../wwwroot/index.html                        |  2 +-
 .../Program.Services.cs                       |  9 +++++-
 .../Services/WebPushNotificationService.cs    |  2 +-
 .../Boilerplate.Client.Web/wwwroot/index.html |  2 +-
 .../Boilerplate.Client.Web/wwwroot/robots.txt |  4 +--
 .../.config/dotnet-tools.json                 |  2 +-
 .../ClientWindowsSettings.cs                  |  6 ++++
 .../Program.Services.cs                       |  7 ++--
 .../Services/WindowsLocalHttpServer.cs        | 12 +++++--
 .../appsettings.Production.json               |  2 +-
 .../appsettings.json                          | 15 ++++++++-
 .../ElevatedAccessTokenTemplate.razor         |  4 +--
 .../Components/EmailTokenTemplate.razor       |  4 +--
 .../Components/OtpTemplate.razor              |  6 ++--
 .../ResetPasswordTokenTemplate.razor          |  6 ++--
 .../Components/TwoFactorTokenTemplate.razor   |  6 ++--
 .../Controllers/AttachmentController.cs       |  5 +--
 .../IdentityController.EmailConfirmation.cs   |  2 +-
 .../IdentityController.ResetPassword.cs       |  2 +-
 .../IdentityController.SocialSignIn.cs        | 13 ++++----
 .../Identity/IdentityController.cs            |  2 +-
 .../Controllers/Identity/UserController.cs    |  2 +-
 .../Controllers/Products/ProductController.cs |  6 ++--
 .../Controllers/Todo/TodoItemController.cs    | 12 +++----
 .../Extensions/HttpRequestExtensions.cs       | 29 ++++++++++-------
 .../Program.Services.cs                       | 18 +----------
 .../ServerApiSettings.cs                      | 29 +++++++++++++----
 .../Services/EmailService.cs                  |  6 ++--
 .../Services/ODataOperationFilter.cs          |  4 +--
 .../Services/PushNotificationService.cs       |  2 +-
 .../Boilerplate.Server.Api/appsettings.json   |  2 ++
 .../Components/App.razor                      |  2 +-
 .../Components/App.razor.cs                   |  4 ++-
 .../Program.Services.cs                       |  2 ++
 .../IConfigurationBuilderExtensions.cs        |  2 +-
 .../Extensions/JsonSeralizerExtensions.cs     |  3 +-
 .../src/Shared/Extensions/TupleExtensions.cs  |  6 ++--
 .../src/Shared/Services/CultureInfoManager.cs |  2 +-
 .../src/Shared/SharedSettings.cs              |  6 ----
 .../src/Shared/appsettings.json               |  2 --
 75 files changed, 277 insertions(+), 215 deletions(-)

diff --git a/.github/workflows/admin-sample.cd.yml b/.github/workflows/admin-sample.cd.yml
index cb4d62d3d5..60dbe0e9d2 100644
--- a/.github/workflows/admin-sample.cd.yml
+++ b/.github/workflows/admin-sample.cd.yml
@@ -35,7 +35,7 @@ jobs:
        cd src/Templates/Boilerplate && dotnet build -c Release
        dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
        dotnet new install Bit.Boilerplate.0.0.0.nupkg
-       cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
+       cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
        
     - name: Update core appsettings.json
       uses: devops-actions/variable-substitution@v1.2 
@@ -88,7 +88,7 @@ jobs:
        cd src/Templates/Boilerplate && dotnet build -c Release
        dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
        dotnet new install Bit.Boilerplate.0.0.0.nupkg
-       cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
+       cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
        
     - name: Update core appsettings.json
       uses: devops-actions/variable-substitution@v1.2 
@@ -186,13 +186,14 @@ jobs:
         cd src\Templates\Boilerplate && dotnet build -c Release
         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
         dotnet new install Bit.Boilerplate.0.0.0.nupkg
-        cd ..\..\..\ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --windows --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --captcha reCaptcha --signalR --framework net9.0
+        cd ..\..\..\ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --windows --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --captcha reCaptcha --signalR --framework net9.0
   
     - name: Update core appsettings.json
       uses: devops-actions/variable-substitution@v1.2 
       with:
         files: 'AdminPanel\src\Shared\appsettings.json, AdminPanel\src\Client\AdminPanel.Client.Core\appsettings.json, AdminPanel\src\Client\AdminPanel.Client.Windows\appsettings.json'
       env:
+        WebAppUrl: ${{ env.SERVER_ADDRESS }}
         ServerAddress: ${{ env.SERVER_ADDRESS }}
         Logging.Sentry.Dsn: ${{ secrets.ADMINPANEL_SENTRY_DSN }}
         GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
@@ -234,7 +235,7 @@ jobs:
        cd src/Templates/Boilerplate && dotnet build -c Release
        dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
        dotnet new install Bit.Boilerplate.0.0.0.nupkg
-       cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
+       cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
 
     - uses: actions/setup-node@v4
       with:
@@ -259,6 +260,7 @@ jobs:
       with:
         files: 'AdminPanel/src/Shared/appsettings.json, AdminPanel/src/Client/AdminPanel.Client.Core/appsettings.json, AdminPanel/src/Client/AdminPanel.Client.Maui/appsettings.json'
       env:
+        WebAppUrl: ${{ env.SERVER_ADDRESS }}  
         ServerAddress: ${{ env.SERVER_ADDRESS }}
         Logging.Sentry.Dsn: ${{ secrets.ADMINPANEL_SENTRY_DSN }}
         GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
@@ -311,13 +313,14 @@ jobs:
         cd src/Templates/Boilerplate && dotnet build -c Release
         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
         dotnet new install Bit.Boilerplate.0.0.0.nupkg
-        cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
+        cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
   
     - name: Update core appsettings.json
       uses: devops-actions/variable-substitution@v1.2 
       with:
         files: 'AdminPanel/src/Shared/appsettings.json, AdminPanel/src/Client/AdminPanel.Client.Core/appsettings.json, AdminPanel/src/Client/AdminPanel.Client.Maui/appsettings.json'
       env:
+        WebAppUrl: ${{ env.SERVER_ADDRESS }}
         ServerAddress: ${{ env.SERVER_ADDRESS }}
         Logging.Sentry.Dsn: ${{ secrets.ADMINPANEL_SENTRY_DSN }}
         GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
diff --git a/.github/workflows/todo-sample.cd.yml b/.github/workflows/todo-sample.cd.yml
index 4b1cc935cb..ee7043d191 100644
--- a/.github/workflows/todo-sample.cd.yml
+++ b/.github/workflows/todo-sample.cd.yml
@@ -42,7 +42,7 @@ jobs:
         cd src/Templates/Boilerplate && dotnet build -c Release
         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
         dotnet new install Bit.Boilerplate.0.0.0.nupkg
-        cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
+        cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
 
     - name: Update core appsettings.json
       uses: devops-actions/variable-substitution@v1.2 
@@ -140,7 +140,7 @@ jobs:
        cd src/Templates/Boilerplate && dotnet build -c Release
        dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
        dotnet new install Bit.Boilerplate.0.0.0.nupkg
-       cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --framework net9.0
+       cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --framework net9.0
        
     - name: Update core appsettings.json
       uses: devops-actions/variable-substitution@v1.2 
@@ -187,7 +187,7 @@ jobs:
        cd src/Templates/Boilerplate && dotnet build -c Release
        dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
        dotnet new install Bit.Boilerplate.0.0.0.nupkg
-       cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --offlineDb --signalR --framework net9.0
+       cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --offlineDb --signalR --framework net9.0
        
     - name: Update core appsettings.json
       uses: devops-actions/variable-substitution@v1.2 
@@ -234,7 +234,7 @@ jobs:
        cd src/Templates/Boilerplate && dotnet build -c Release
        dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
        dotnet new install Bit.Boilerplate.0.0.0.nupkg
-       cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --framework net9.0
+       cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --framework net9.0
        
     - name: Update core appsettings.json
       uses: devops-actions/variable-substitution@v1.2 
@@ -289,13 +289,14 @@ jobs:
         cd src\Templates\Boilerplate && dotnet build -c Release
         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
         dotnet new install Bit.Boilerplate.0.0.0.nupkg
-        cd ..\..\..\ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --windows --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --captcha reCaptcha --signalR --framework net8.0
+        cd ..\..\..\ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --windows --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --captcha reCaptcha --signalR --framework net8.0
   
     - name: Update core appsettings.json
       uses: devops-actions/variable-substitution@v1.2 
       with:
         files: 'TodoSample\src\Shared\appsettings.json, TodoSample\src\Client\TodoSample.Client.Core\appsettings.json, TodoSample\src\Client\TodoSample.Client.Windows\appsettings.json'
       env:
+        WebAppUrl: ${{ env.SERVER_ADDRESS }}
         ServerAddress: ${{ env.SERVER_ADDRESS }}
         Logging.Sentry.Dsn: ${{ secrets.TODO_SENTRY_DSN }}
         WindowsUpdate.FilesUrl: https://windows-todo.bitplatform.dev
@@ -345,7 +346,7 @@ jobs:
         cd src/Templates/Boilerplate && dotnet build -c Release
         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
         dotnet new install Bit.Boilerplate.0.0.0.nupkg
-        cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
+        cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
   
     - name: Extract Android signing key from env
       uses: timheuer/base64-to-file@v1.2
@@ -366,6 +367,7 @@ jobs:
       with:
         files: 'TodoSample/src/Shared/appsettings.json, TodoSample/src/Client/TodoSample.Client.Core/appsettings.json, TodoSample/src/Client/TodoSample.Client.Maui/appsettings.json'
       env:
+        WebAppUrl: ${{ env.SERVER_ADDRESS }}
         ServerAddress: ${{ env.SERVER_ADDRESS }}
         Logging.Sentry.Dsn: ${{ secrets.TODO_SENTRY_DSN }}
         GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
@@ -442,13 +444,14 @@ jobs:
         cd src/Templates/Boilerplate && dotnet build -c Release
         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
         dotnet new install Bit.Boilerplate.0.0.0.nupkg
-        cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
+        cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
       
     - name: Update core appsettings.json
       uses: devops-actions/variable-substitution@v1.2 
       with:
         files: 'TodoSample/src/Shared/appsettings.json, TodoSample/src/Client/TodoSample.Client.Core/appsettings.json, TodoSample/src/Client/TodoSample.Client.Maui/appsettings.json'
       env:
+        WebAppUrl: ${{ env.SERVER_ADDRESS }}
         ServerAddress: ${{ env.SERVER_ADDRESS }}
         Logging.Sentry.Dsn: ${{ secrets.TODO_SENTRY_DSN }}
         GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml b/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml
index 0a8be9b251..62e7aa5a21 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml
@@ -8,8 +8,8 @@ variables:
   AZURE_SUBSCRIPTION: 'bp-test-service-connection' # https://learn.microsoft.com/en-us/azure/devops/pipelines/library/service-endpoints?view=azure-devops&tabs=yaml#azure-resource-manager-service-connection
   ConnectionStrings.SqlServerConnectionString: $(DB_CONNECTION_STRING)
   DataProtectionCertificatePassword: $(API_DATA_PROTECTION_CERTIFICATE_PASSWORD)
-  ServerAddress: 'https://use-your-server-url-here.com/'
-  WindowsUpdate.FilesUrl: 'https://use-your-server-url-here.com/windows' # Deploy the published Windows application files to your desired hosting location and use the host url here.
+  ServerAddress: 'https://use-your-api-server-url-here.com/'
+  WindowsUpdate.FilesUrl: 'https://use-your-api-server-url-here.com/windows' # Deploy the published Windows application files to your desired hosting location and use the host url here.
 
 jobs:
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml b/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml
index 4210c9210c..2ad78fa234 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml
@@ -3,7 +3,7 @@
 # https://bitplatform.dev/templates/dev-ops
 
 env:
-  SERVER_ADDRESS: 'https://use-your-server-url-here.com/'
+  SERVER_ADDRESS: 'https://use-your-api-server-url-here.com/'
   APP_SERVICE_NAME: 'app-service-bp-test'
   IOS_CODE_SIGN_PROVISION: 'Boilerplate'
 
@@ -150,7 +150,7 @@ jobs:
         files: 'src\Shared\appsettings.json, src\Client\Boilerplate.Client.Core\appsettings.json, src\Client\Boilerplate.Client.Windows\appsettings.json'
       env:
         ServerAddress: ${{ env.SERVER_ADDRESS }}
-        WindowsUpdate.FilesUrl: 'https://use-your-server-url-here.com/windows' # Deploy the published Windows application files to your desired hosting location and use the host url here.
+        WindowsUpdate.FilesUrl: 'https://use-your-api-server-url-here.com/windows' # Deploy the published Windows application files to your desired hosting location and use the host url here.
   
     - name: Generate CSS/JS files
       run: dotnet build src\Client\Boilerplate.Client.Core\Boilerplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore -c Release
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/ide.host.json b/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/ide.host.json
index 2a8b8763ec..08820af6a2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/ide.host.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/ide.host.json
@@ -1,4 +1,4 @@
-{
+{
     "$schema": "http://json.schemastore.org/vs-2017.3.host",
     "requiredComponents": [
         {
@@ -51,7 +51,11 @@
             "id": "notification"
         },
         {
-            "id": "serverUrl",
+            "id": "apiServerUrl",
+            "isVisible": false
+        },
+        {
+            "id": "webAppUrl",
             "isVisible": false
         },
         {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json b/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json
index 32f395e039..7289c1cfc1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json
@@ -285,19 +285,19 @@
             },
             "replaces": "4030"
         },
-        "serverUrl": {
+        "apiServerUrl": {
             "displayName": "Server url",
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "use-your-server-url-here.com",
-            "description": "The backend server url. You can change its value later if needed."
+            "defaultValue": "use-your-api-server-url-here.com",
+            "description": "The backend api server url. You can change its value later if needed."
         },
         "normalizedServerUrl": {
             "type": "generated",
             "generator": "regex",
             "dataType": "string",
             "parameters": {
-                "source": "serverUrl",
+                "source": "apiServerUrl",
                 "steps": [
                     {
                         "regex": "^(https|http):\/\/",
@@ -305,7 +305,29 @@
                     }
                 ]
             },
-            "replaces": "use-your-server-url-here.com"
+            "replaces": "use-your-api-server-url-here.com"
+        },
+        "webAppUrl": {
+            "displayName": "web app url",
+            "type": "parameter",
+            "datatype": "string",
+            "defaultValue": "use-your-web-app-url-here.com",
+            "description": "The web app url. You can change its value later if needed."
+        },
+        "normalizedWebAppUrl": {
+            "type": "generated",
+            "generator": "regex",
+            "dataType": "string",
+            "parameters": {
+                "source": "webAppUrl",
+                "steps": [
+                    {
+                        "regex": "^(https|http):\/\/",
+                        "replacement": ""
+                    }
+                ]
+            },
+            "replaces": "use-your-web-app-url-here.com"
         },
         "advancedTests": {
             "displayName": "Include advanced automated tests?",
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppDataAnnotationsValidator.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppDataAnnotationsValidator.cs
index 9b1044f72d..1a795f0981 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppDataAnnotationsValidator.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppDataAnnotationsValidator.cs
@@ -15,7 +15,7 @@ namespace Boilerplate.Client.Core.Components;
 public partial class AppDataAnnotationsValidator : AppComponentBase
 {
     [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "set_OtherPropertyDisplayName")]
-    extern static void SetOtherPropertyDisplayName(CompareAttribute valAttribute, string name);
+    static extern void SetOtherPropertyDisplayName(CompareAttribute valAttribute, string name);
 
     private bool disposed;
     private ValidationMessageStore validationMessageStore = default!;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor.cs
index c9d1de54e6..22c43408b0 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor.cs
@@ -2,10 +2,4 @@
 
 public partial class NavBar
 {
-    [CascadingParameter(Name = Parameters.CurrentUrl)] private string? currentUrl { get; set; }
-
-    private bool IsActive(string url)
-    {
-        return currentUrl == url;
-    }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor
index bc74c51314..5469518310 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor
@@ -1,22 +1,20 @@
 <CascadingValue Value="CurrentDir">
     <CascadingValue Value="CurrentTheme" Name="@Parameters.CurrentTheme">
-        <CascadingValue Value="CurrentUrl" Name="@Parameters.CurrentUrl">
-            <CascadingValue Value="CurrentRouteData" Name="@Parameters.CurrentRouteData">
-                <CascadingValue Value="IsAuthenticated" Name="@Parameters.IsAuthenticated">
-                    <CascadingValue Value="IsCrossLayoutPage" Name="@Parameters.IsCrossLayoutPage">
-                        <CascadingValue Value="IsOnline" Name="@Parameters.IsOnline">
-                            <div class="layout">
-                                <div class="inset-top"></div>
-                                <div class="inset-center" dir="@CurrentDir?.ToString().ToLower()">
-                                    <div class="inset-left"></div>
-                                    <div class="inset-main" id="bit-inset-main">
-                                        @ChildContent
-                                    </div>
-                                    <div class="inset-right"></div>
+        <CascadingValue Value="CurrentRouteData" Name="@Parameters.CurrentRouteData">
+            <CascadingValue Value="IsAuthenticated" Name="@Parameters.IsAuthenticated">
+                <CascadingValue Value="IsCrossLayoutPage" Name="@Parameters.IsCrossLayoutPage">
+                    <CascadingValue Value="IsOnline" Name="@Parameters.IsOnline">
+                        <div class="layout">
+                            <div class="inset-top"></div>
+                            <div class="inset-center" dir="@CurrentDir?.ToString().ToLower()">
+                                <div class="inset-left"></div>
+                                <div class="inset-main" id="bit-inset-main">
+                                    @ChildContent
                                 </div>
-                                <div class="inset-bottom"></div>
+                                <div class="inset-right"></div>
                             </div>
-                        </CascadingValue>
+                            <div class="inset-bottom"></div>
+                        </div>
                     </CascadingValue>
                 </CascadingValue>
             </CascadingValue>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.cs
index b4fffa2398..08bf0365c0 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.cs
@@ -9,7 +9,6 @@ public partial class RootContainer
     /// </summary>
     [Parameter] public bool? IsOnline { get; set; }
     [Parameter] public BitDir? CurrentDir { get; set; }
-    [Parameter] public string? CurrentUrl { get; set; }
     [Parameter] public bool? IsAuthenticated { get; set; }
     /// <summary>
     /// <inheritdoc cref="Parameters.IsCrossLayoutPage"/>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor
index 7016fe3615..d06dc35b58 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor
@@ -2,7 +2,6 @@
 
 <RootContainer IsOnline="isOnline"
                CurrentDir="currentDir"
-               CurrentUrl="@currentUrl"
                CurrentTheme="currentTheme"
                IsAuthenticated="isAuthenticated"
                CurrentRouteData="currentRouteData"
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.cs
index 8db7a84ec6..352b1f01d5 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.cs
@@ -3,10 +3,9 @@
 
 namespace Boilerplate.Client.Core.Components.Layout;
 
-public partial class RootLayout : IDisposable
+public partial class RootLayout : IAsyncDisposable
 {
     private BitDir? currentDir;
-    private string? currentUrl;
     private readonly BitModalParameters modalParameters = new() { Classes = new() { Root = "modal" } };
 
     /// <summary>
@@ -70,7 +69,6 @@ protected override async Task OnInitializedAsync()
             isAuthenticated = await prerenderStateService.GetValue(async () => (await AuthenticationStateTask).User.IsAuthenticated());
 
             SetCurrentDir();
-            SetCurrentUrl();
             currentTheme = await themeService.GetCurrentTheme();
 
             await base.OnInitializedAsync();
@@ -119,7 +117,6 @@ private async void AuthenticationStateChanged(Task<AuthenticationState> task)
 
     private void NavigationManagerLocationChanged(object? sender, Microsoft.AspNetCore.Components.Routing.LocationChangedEventArgs e)
     {
-        SetCurrentUrl();
         StateHasChanged();
     }
 
@@ -129,18 +126,6 @@ private void SetCurrentDir()
         currentDir = CultureInfo.CurrentUICulture.TextInfo.IsRightToLeft ? BitDir.Rtl : null;
     }
 
-    private void SetCurrentUrl()
-    {
-        var path = navigationManager.GetUriPath();
-
-        currentUrl = Urls.All.SingleOrDefault(pageUrl =>
-        {
-            return pageUrl == Urls.HomePage
-                    ? pageUrl == path
-                    : path.StartsWith(pageUrl);
-        });
-    }
-
     /// <summary>
     /// <inheritdoc cref="Parameters.IsCrossLayoutPage"/>
     /// </summary>
@@ -186,8 +171,7 @@ private string GetMainCssClass()
         return authClass + crossClass;
     }
 
-
-    public void Dispose()
+    public async ValueTask DisposeAsync()
     {
         navigationManager.LocationChanged -= NavigationManagerLocationChanged;
 
@@ -195,6 +179,9 @@ public void Dispose()
 
         unsubscribers.ForEach(d => d.Invoke());
 
-        _ = keyboard?.DisposeAsync();
+        if (keyboard is not null)
+        {
+            await keyboard.DisposeAsync();
+        }
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Dashboard/DashboardPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Dashboard/DashboardPage.razor.cs
index 6db19b111d..46dc3bb7b4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Dashboard/DashboardPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Dashboard/DashboardPage.razor.cs
@@ -15,7 +15,7 @@ public partial class DashboardPage
     private Action? unsubscribe;
     //#endif
 
-    protected async override Task OnInitAsync()
+    protected override async Task OnInitAsync()
     {
         //#if (signalR == true)
         unsubscribe = PubSubService.Subscribe(SharedPubSubMessages.DASHBOARD_DATA_CHANGED, async _ =>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Todo/TodoPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Todo/TodoPage.razor.cs
index 2c0c1e748f..a1807280e2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Todo/TodoPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Todo/TodoPage.razor.cs
@@ -28,7 +28,7 @@ public partial class TodoPage
 
     protected override async Task OnInitAsync()
     {
-        _ = keyboard.Add(ButilKeyCodes.KeyF, () => _ = searchBox.FocusAsync(), ButilModifiers.Ctrl);
+        _ = keyboard.Add(ButilKeyCodes.KeyF, () => searchBox.FocusAsync(), ButilModifiers.Ctrl);
 
         selectedFilter = nameof(AppStrings.All);
         selectedSort = nameof(AppStrings.Alphabetical);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/TermsPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/TermsPage.razor
index a10436fc2b..9ab8bf424b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/TermsPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/TermsPage.razor
@@ -9,7 +9,7 @@
         <BitText Typography="BitTypography.H3">Boilerplate license</BitText>
         <BitText>
             This EULA and Privacy Policy are written for individuals who use the Boilerplate Demo Version through the
-            <BitLink Href="https://use-your-server-url-here.com" Target="_blank">https://use-your-server-url-here.com</BitLink> website, or the
+            <BitLink Href="https://use-your-web-app-url-here.com" Target="_blank">https://use-your-web-app-url-here.com</BitLink> website, or the
             published version of this app on the bit platform's Google Play, Apple Store, and Microsoft Store accounts.
             <br />
             If you want to build your own project based on this Project Template, please refer to the
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Parameters.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Parameters.cs
index 9aabbca204..ebf5f6fedc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Parameters.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Parameters.cs
@@ -5,7 +5,6 @@ namespace Boilerplate.Client.Core.Components;
 public class Parameters
 {
     public const string CurrentDir = nameof(CurrentDir);
-    public const string CurrentUrl = nameof(CurrentUrl);
     public const string CurrentTheme = nameof(CurrentTheme);
     public const string IsAuthenticated = nameof(IsAuthenticated);
     public const string CurrentRouteData = nameof(CurrentRouteData);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IConfigurationExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IConfigurationExtensions.cs
index ba80cbb651..afe160601d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IConfigurationExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IConfigurationExtensions.cs
@@ -12,8 +12,8 @@ public static string GetServerAddress(this IConfiguration configuration)
         var serverAddress = settings.ServerAddress;
 
         if (AppEnvironment.IsDev() &&
-            serverAddress.Contains("localhost", StringComparison.InvariantCultureIgnoreCase) &&
-            AppPlatform.IsAndroid)
+            AppPlatform.IsAndroid &&
+            serverAddress.Contains("localhost", StringComparison.InvariantCultureIgnoreCase))
         {
             const string androidEmulatorDevMachineIP = "10.0.2.2"; // Special alias to your host loopback interface in Android Emulators (127.0.0.1 on your development machine)
             serverAddress = serverAddress.Replace("localhost", androidEmulatorDevMachineIP, StringComparison.InvariantCultureIgnoreCase);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthManager.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthManager.cs
index 8f8a0ac3c9..26fb1b29c5 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthManager.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthManager.cs
@@ -48,10 +48,7 @@ public async Task<bool> SignIn(SignInRequestDto request, CancellationToken cance
 
     public async Task StoreTokens(TokenResponseDto response, bool? rememberMe = null)
     {
-        if (rememberMe is null)
-        {
-            rememberMe = await storageService.IsPersistent("refresh_token");
-        }
+        rememberMe ??= await storageService.IsPersistent("refresh_token");
 
         await storageService.SetItem("access_token", response!.AccessToken, rememberMe is true);
         await storageService.SetItem("refresh_token", response!.RefreshToken, rememberMe is true);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs
index cc58092e7a..25ff971cbb 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs
@@ -55,7 +55,7 @@ public static ITelemetryContext? Current
 
     public Dictionary<string, object?> ToDictionary(Dictionary<string, object?>? additionalParameters = null)
     {
-        var data = new Dictionary<string, object?>(additionalParameters ??= [])
+        var data = new Dictionary<string, object?>(additionalParameters ?? [])
         {
             { nameof(UserId), UserId },
             { nameof(UserSessionId), UserSessionId },
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
index 44c34d4cf9..1ba1de0d26 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
@@ -35,7 +35,7 @@ response.IsSuccessStatusCode is false &&
 
                 Type exceptionType = typeof(RestErrorInfo).Assembly.GetType(restError.ExceptionType!) ?? typeof(UnknownException);
 
-                var args = new List<object?> { typeof(KnownException).IsAssignableFrom(exceptionType) ? new LocalizedString(restError.Key!, restError.Message!) : restError.Message! };
+                var args = new List<object?> { typeof(KnownException).IsAssignableFrom(exceptionType) ? new LocalizedString(restError.Key!, restError.Message!) : (object?)restError.Message! };
 
                 if (exceptionType == typeof(ResourceValidationException))
                 {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ThemeService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ThemeService.cs
index ae3e266f15..a299d4f798 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ThemeService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ThemeService.cs
@@ -2,7 +2,6 @@
 
 public partial class ThemeService
 {
-    [AutoInject] private Cookie cookie = default!;
     [AutoInject] private PubSubService pubSubService = default!;
     [AutoInject] private BitThemeManager bitThemeManager = default!;
     [AutoInject] private IBitDeviceCoordinator bitDeviceCoordinator = default!;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
index cf447680d7..b2ca0d9828 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
@@ -105,9 +105,6 @@ protected override async void OnStart()
     //#if (framework == 'net9.0')
     private async Task CheckForUpdates()
     {
-        if (AppPlatform.IsAndroid)
-            return; // Android has in-app update feature.
-
         await Task.Delay(TimeSpan.FromSeconds(3)); // No rush to check for updates.
 
         try
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/ClientMauiSettings.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/ClientMauiSettings.cs
index 2baad82fd2..2be490d484 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/ClientMauiSettings.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/ClientMauiSettings.cs
@@ -5,5 +5,9 @@ namespace Boilerplate.Client.Maui;
 
 public class ClientMauiSettings : ClientCoreSettings
 {
-
+    /// <summary>
+    /// When the maui app sends a request to the API server, and the API server and web app are hosted on different URLs,
+    /// the origin of the generated links (e.g., email confirmation links) will depend on `WebAppUrl` value.
+    /// </summary>
+    public Uri? WebAppUrl { get; set; }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs
index 0115021d51..8cb158ac5e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs
@@ -21,7 +21,7 @@ public partial class AboutPage
     private string processId = default!;
     private string appVersion = default!;
 
-    protected async override Task OnInitAsync()
+    protected override async Task OnInitAsync()
     {
         // You have direct access to the Android, iOS, macOS, and Windows SDK features along with the ability to
         // call third-party Java, Kotlin, Swift, and Objective-C libraries.
@@ -33,7 +33,7 @@ protected async override Task OnInitAsync()
         appVersion = telemetryContext.AppVersion!;
         processId = Environment.ProcessId.ToString();
         //#if (framework == 'net9.0')
-        appVersion += $" / {await AppStoreInfo.Current.GetLatestVersionAsync(CurrentCancellationToken)}";
+        appVersion += $" / {(AppStoreInfo.Current.CachedInformation?.LatestVersion?.ToString() ?? "?")}";
         //#endif
 
         await base.OnInitAsync();
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs
index a0b61cae98..efb7f47489 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs
@@ -20,10 +20,14 @@ public static void ConfigureServices(this MauiAppBuilder builder)
         services.AddScoped(sp =>
         {
             var handler = sp.GetRequiredService<HttpMessageHandler>();
-            HttpClient httpClient = new(handler)
+            var httpClient = new HttpClient(handler)
             {
                 BaseAddress = new Uri(configuration.GetServerAddress(), UriKind.Absolute)
             };
+            if (sp.GetRequiredService<ClientMauiSettings>().WebAppUrl is Uri origin)
+            {
+                httpClient.DefaultRequestHeaders.Add("X-Origin", origin.ToString());
+            }
             return httpClient;
         });
 
@@ -35,8 +39,15 @@ public static void ConfigureServices(this MauiAppBuilder builder)
             return settings;
         });
         services.AddSingleton(ITelemetryContext.Current!);
-        if (AppPlatform.IsWindows || AppPlatform.IsMacOS)
+        if (AppPlatform.IsWindows
+            || AppPlatform.IsMacOS
+            || AppEnvironment.IsDev())
         {
+            // About AppEnvironment.IsDev:
+            // In the development environment, universal links are not configured. Universal links are required to provide the
+            // same user experience (UX) that you can test in the production app (available on Google Play at https://play.google.com/store/apps/details?id=com.bitplatform.AdminPanel.Template).
+            // As a workaround, we will fallback to a local HTTP server. This will provide a slightly degraded UX, but it will allow you to test the app in the development environment.
+
             services.AddSingleton<ILocalHttpServer, MauiLocalHttpServer>();
         }
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainActivity.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainActivity.cs
index 7a4ec535d7..cd1cc96a6a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainActivity.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainActivity.cs
@@ -14,7 +14,7 @@ namespace Boilerplate.Client.Maui.Platforms.Android;
 
 [IntentFilter([Intent.ActionView],
                         DataSchemes = ["https", "http"],
-                        DataHosts = ["use-your-server-url-here.com"],
+                        DataHosts = ["use-your-web-app-url-here.com"],
                         // the following app links will be opened in app instead of browser if the app is installed on Android device.
                         DataPaths = [Urls.HomePage],
                         DataPathPrefixes = [
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainApplication.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainApplication.cs
index 77c9433661..c877c1a5d7 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainApplication.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainApplication.cs
@@ -24,13 +24,9 @@ namespace Boilerplate.Client.Maui.Platforms.Android;
     AllowBackup = true,
     SupportsRtl = true
 )]
-public partial class MainApplication : MauiApplication
+public partial class MainApplication(IntPtr handle, JniHandleOwnership ownership) 
+    : MauiApplication(handle, ownership)
 {
-    public MainApplication(IntPtr handle, JniHandleOwnership ownership)
-        : base(handle, ownership)
-    {
-    }
-
     protected override MauiApp CreateMauiApp() => MauiProgram
         .CreateMauiApp();
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/Services/AndroidPushNotificationService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/Services/AndroidPushNotificationService.cs
index 5eadb473b9..f97a20355a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/Services/AndroidPushNotificationService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/Services/AndroidPushNotificationService.cs
@@ -7,7 +7,7 @@ namespace Boilerplate.Client.Maui.Platforms.Android.Services;
 
 public partial class AndroidPushNotificationService : PushNotificationServiceBase
 {
-    public async override Task<bool> IsPushNotificationSupported(CancellationToken cancellationToken)
+    public override async Task<bool> IsPushNotificationSupported(CancellationToken cancellationToken)
     {
         return await MainThread.InvokeOnMainThreadAsync(async () =>
         {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/MacCatalyst/Services/MacCatalystPushNotificationService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/MacCatalyst/Services/MacCatalystPushNotificationService.cs
index 9051249542..6e53aae359 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/MacCatalyst/Services/MacCatalystPushNotificationService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/MacCatalyst/Services/MacCatalystPushNotificationService.cs
@@ -6,7 +6,7 @@ namespace Boilerplate.Client.Maui.Platforms.MacCatalyst.Services;
 
 public partial class MacCatalystPushNotificationService : PushNotificationServiceBase
 {
-    public async override Task<bool> IsPushNotificationSupported(CancellationToken cancellationToken)
+    public override async Task<bool> IsPushNotificationSupported(CancellationToken cancellationToken)
     {
         return await MainThread.InvokeOnMainThreadAsync(async () =>
         {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Entitlements.Development.plist b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Entitlements.Development.plist
index ee53d1ab52..98b2e40517 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Entitlements.Development.plist
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Entitlements.Development.plist
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-        <string>applinks:use-your-server-url-here.com</string>
+        <string>applinks:use-your-web-app-url-here.com</string>
 	</array>
     <!--#if (notification == true)-->
     <key>aps-environment</key>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Entitlements.Production.plist b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Entitlements.Production.plist
index e6eda9d2f3..230e7b179b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Entitlements.Production.plist
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Entitlements.Production.plist
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-        <string>applinks:use-your-server-url-here.com</string>
+        <string>applinks:use-your-web-app-url-here.com</string>
 	</array>
     <!--#if (notification == true)-->
     <key>aps-environment</key>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Services/iOSPushNotificationService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Services/iOSPushNotificationService.cs
index ab3aa8a942..93620f1b94 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Services/iOSPushNotificationService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/iOS/Services/iOSPushNotificationService.cs
@@ -6,7 +6,7 @@ namespace Boilerplate.Client.Maui.Platforms.iOS.Services;
 
 public partial class iOSPushNotificationService : PushNotificationServiceBase
 {
-    public async override Task<bool> IsPushNotificationSupported(CancellationToken cancellationToken)
+    public override async Task<bool> IsPushNotificationSupported(CancellationToken cancellationToken)
     {
         return await MainThread.InvokeOnMainThreadAsync(async () =>
         {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs
index 59c00117e2..2ac3f07c71 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs
@@ -31,7 +31,14 @@ public int Start(CancellationToken cancellationToken)
 
                     ctx.Redirect(url);
 
-                    await Routes.OpenUniversalLink(ctx.Request.Url.PathAndQuery, replace: true);
+                    _ = Task.Delay(1)
+                        .ContinueWith(async _ =>
+                        {
+                            await MainThread.InvokeOnMainThreadAsync(async () =>
+                            {
+                                await Routes.OpenUniversalLink(ctx.Request.Url.PathAndQuery, replace: true);
+                            });
+                        });
                 }
                 catch (Exception exp)
                 {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/appsettings.Production.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/appsettings.Production.json
index 2b7a979354..63e9267114 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/appsettings.Production.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/appsettings.Production.json
@@ -1,3 +1,3 @@
-{
+{
     "$schema": "https://json.schemastore.org/appsettings.json"
 }
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/appsettings.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/appsettings.json
index d81b30bff0..98223403a1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/appsettings.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/appsettings.json
@@ -1,3 +1,16 @@
-{
+{
+    //#if (api == "Integrated")
+    "WebAppUrl": null,
+    //#endif
+    //#if (IsInsideProjectTemplate)
+    /*
+    //#endif
+    //#if (api == "Standalone")
+    "WebAppUrl": "http://localhost:5030/",
+    //#endif
+    //#if (IsInsideProjectTemplate)
+    */
+    //#endif
+    "WebAppUrl_Comment": "When the maui app sends a request to the API server, and the API server and web app are hosted on different URLs, the origin of the generated links (e.g., email confirmation links) will depend on `WebAppUrl` value.",
     "$schema": "https://json.schemastore.org/appsettings.json"
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html
index d003f4814e..c177e1b373 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html
@@ -14,7 +14,7 @@
     <link rel="preconnect" href="https://js.monitor.azure.com" crossorigin>
     <!--#endif-->
 
-    <link rel="preconnect" href="https://use-your-server-url-here.com">
+    <link rel="preconnect" href="https://use-your-api-server-url-here.com">
 
     <link rel="preload" href="_content/Bit.BlazorUI.Icons/fonts/FabMDL2.4.66.woff2" as="font" type="font/woff2" crossorigin>
     <link rel="preload" href="_content/Bit.BlazorUI.Assets/fonts/segoe-ui-bold.woff2" as="font" type="font/woff2" crossorigin>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Program.Services.cs
index a23526a4a3..c32c8c8239 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Program.Services.cs
@@ -23,7 +23,14 @@ public static void ConfigureServices(this WebAssemblyHostBuilder builder)
             serverAddress = new Uri(new Uri(builder.HostEnvironment.BaseAddress), serverAddress);
         }
 
-        services.AddScoped(sp => new HttpClient(sp.GetRequiredService<HttpMessageHandler>()) { BaseAddress = serverAddress });
+        services.AddScoped(sp =>
+        {
+            var httpClient = new HttpClient(sp.GetRequiredService<HttpMessageHandler>()) { BaseAddress = serverAddress };
+
+            httpClient.DefaultRequestHeaders.Add("X-Origin", builder.HostEnvironment.BaseAddress);
+
+            return httpClient;
+        });
     }
 
     public static void AddClientWebProjectServices(this IServiceCollection services, IConfiguration configuration)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebPushNotificationService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebPushNotificationService.cs
index b087f66beb..ded0f0e3dd 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebPushNotificationService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebPushNotificationService.cs
@@ -9,7 +9,7 @@ public partial class WebPushNotificationService : PushNotificationServiceBase
     [AutoInject] private readonly IJSRuntime jSRuntime = default!;
     [AutoInject] private readonly ClientWebSettings clientWebSettings = default!;
 
-    public async override Task<PushNotificationSubscriptionDto> GetSubscription(CancellationToken cancellationToken)
+    public override async Task<PushNotificationSubscriptionDto> GetSubscription(CancellationToken cancellationToken)
     {
         return await jSRuntime.GetPushNotificationSubscription(clientWebSettings.AdsPushVapid!.PublicKey);
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html
index 32fcbcef0d..b967311a52 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html
@@ -22,7 +22,7 @@
     <!--#endif-->
 
 
-    <link rel="preconnect" href="https://use-your-server-url-here.com">
+    <link rel="preconnect" href="https://use-your-api-server-url-here.com">
 
     <link href="favicon.ico" rel="icon" type="image/x-icon" />
     <link href="images/icons/bit-icon-512.png" rel="apple-touch-icon" sizes="512x512" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/robots.txt b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/robots.txt
index b22132dba6..ca03c530bd 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/robots.txt
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/robots.txt
@@ -1,4 +1,4 @@
-User-agent: *
+User-agent: *
 Disallow: 
 
-Sitemap: https://use-your-server-url-here.com/sitemap.xml
\ No newline at end of file
+Sitemap: https://use-your-web-app-url-here.com/sitemap.xml
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json
index 461b027bf4..5d6ab1af3b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
     "isRoot": true,
     "tools": {
         "vpk": {
-            "version": "0.0.942",
+            "version": "0.0.1015",
             "commands": [
                 "vpk"
             ]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/ClientWindowsSettings.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/ClientWindowsSettings.cs
index 2ccd1cc977..191659fac6 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/ClientWindowsSettings.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/ClientWindowsSettings.cs
@@ -5,6 +5,12 @@ namespace Boilerplate.Client.Windows;
 
 public class ClientWindowsSettings : ClientCoreSettings
 {
+    /// <summary>
+    /// When the Windows app sends a request to the API server, and the API server and web app are hosted on different URLs,
+    /// the origin of the generated links (e.g., email confirmation links) will depend on `WebAppUrl` value.
+    /// </summary>
+    public Uri? WebAppUrl { get; set; }
+
     public WindowsUpdateOptions? WindowsUpdate { get; set; }
 
     public override IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.Services.cs
index 0132bfcbde..ba1d6e24d2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.Services.cs
@@ -1,5 +1,4 @@
 //+:cnd:noEmit
-using System.Net.Http;
 using Microsoft.Extensions.Logging;
 using Boilerplate.Client.Windows.Services;
 
@@ -17,10 +16,14 @@ public static void AddClientWindowsProjectServices(this IServiceCollection servi
         services.AddScoped(sp =>
         {
             var handler = sp.GetRequiredService<HttpMessageHandler>();
-            HttpClient httpClient = new(handler)
+            var httpClient = new HttpClient(handler)
             {
                 BaseAddress = new Uri(configuration.GetServerAddress(), UriKind.Absolute)
             };
+            if (sp.GetRequiredService<ClientWindowsSettings>().WebAppUrl is Uri origin)
+            {
+                httpClient.DefaultRequestHeaders.Add("X-Origin", origin.ToString());
+            }
             return httpClient;
         });
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs
index 2e4e7772f3..cf52aed8b4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs
@@ -32,9 +32,15 @@ public int Start(CancellationToken cancellationToken)
 
                     ctx.Redirect(url);
 
-                    await Application.OpenForms[0]!.InvokeAsync(() => Application.OpenForms[0]!.Activate(), cancellationToken);
-
-                    await Routes.OpenUniversalLink(ctx.Request.Url.PathAndQuery, replace: true);
+                    _ = Task.Delay(1)
+                        .ContinueWith(async _ =>
+                        {
+                            Application.OpenForms[0]!.Invoke(() =>
+                            {
+                                Application.OpenForms[0]!.Activate();
+                            });
+                            await Routes.OpenUniversalLink(ctx.Request.Url.PathAndQuery, replace: true);
+                        });
                 }
                 catch (Exception exp)
                 {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/appsettings.Production.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/appsettings.Production.json
index 2b7a979354..63e9267114 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/appsettings.Production.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/appsettings.Production.json
@@ -1,3 +1,3 @@
-{
+{
     "$schema": "https://json.schemastore.org/appsettings.json"
 }
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/appsettings.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/appsettings.json
index 610c1fa653..43e9a256a1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/appsettings.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/appsettings.json
@@ -1,4 +1,17 @@
-{
+{
+    //#if (api == "Integrated")
+    "WebAppUrl": null,
+    //#endif
+    //#if (IsInsideProjectTemplate)
+    /*
+    //#endif
+    //#if (api == "Standalone")
+    "WebAppUrl": "http://localhost:5030/",
+    //#endif
+    //#if (IsInsideProjectTemplate)
+    */
+    //#endif
+    "WebAppUrl_Comment": "When the Windows app sends a request to the API server, and the API server and web app are hosted on different URLs, the origin of the generated links (e.g., email confirmation links) will depend on `WebAppUrl` value.",
     "WindowsUpdate": {
         "FilesUrl": null,
         "AutoReload": true
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/ElevatedAccessTokenTemplate.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/ElevatedAccessTokenTemplate.razor
index 8b91064c42..0426a729d1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/ElevatedAccessTokenTemplate.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/ElevatedAccessTokenTemplate.razor
@@ -48,12 +48,12 @@
                style="padding:20px; text-align:center;">
             <tr>
                 <td style="padding-bottom: 10px;">
-                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetBaseUrl(), "images/icon.png"))" width="30" height="20" />
+                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetWebAppUrl(), "images/icon.png"))" width="30" height="20" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetBaseUrl()">
+                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetWebAppUrl()">
                         @EmailLocalizer[nameof(EmailStrings.AppName)]
                     </a>
                 </td>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/EmailTokenTemplate.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/EmailTokenTemplate.razor
index 738a4efd37..d521b17380 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/EmailTokenTemplate.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/EmailTokenTemplate.razor
@@ -52,12 +52,12 @@
         <table style="width:100%;text-align:center;margin-top:30px;">
             <tr>
                 <td style="padding-bottom:10px;">
-                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetBaseUrl(), "images/icon.png"))" width="30" height="20" />
+                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetWebAppUrl(), "images/icon.png"))" width="30" height="20" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a style="font-size:12px" href="@HttpContext.Request.GetBaseUrl()">
+                    <a style="font-size:12px" href="@HttpContext.Request.GetWebAppUrl()">
                         @EmailLocalizer[nameof(EmailStrings.AppName)]
                     </a>
                 </td>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/OtpTemplate.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/OtpTemplate.razor
index 1c06372f99..fd87b31b27 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/OtpTemplate.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/OtpTemplate.razor
@@ -1,4 +1,4 @@
-@using Boilerplate.Server.Api.Models.Emailing
+@using Boilerplate.Server.Api.Models.Emailing
 
 @code {
     [Parameter] public OtpTemplateModel Model { get; set; } = default!;
@@ -58,12 +58,12 @@
                style="padding:20px; text-align:center;">
             <tr>
                 <td style="padding-bottom: 10px;">
-                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetBaseUrl(), "images/icon.png"))" width="30" height="20" />
+                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetWebAppUrl(), "images/icon.png"))" width="30" height="20" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetBaseUrl()">
+                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetWebAppUrl()">
                         @EmailLocalizer[nameof(EmailStrings.AppName)]
                     </a>
                 </td>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/ResetPasswordTokenTemplate.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/ResetPasswordTokenTemplate.razor
index d070632e9b..b9949784ae 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/ResetPasswordTokenTemplate.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/ResetPasswordTokenTemplate.razor
@@ -1,4 +1,4 @@
-@using Boilerplate.Server.Api.Models.Emailing
+@using Boilerplate.Server.Api.Models.Emailing
 
 @code {
     [Parameter] public ResetPasswordTokenTemplateModel Model { get; set; } = default!;
@@ -58,12 +58,12 @@
                style="padding:20px; text-align:center;">
             <tr>
                 <td style="padding-bottom: 10px;">
-                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetBaseUrl(), "images/icon.png"))" width="30" height="20" />
+                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetWebAppUrl(), "images/icon.png"))" width="30" height="20" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetBaseUrl()">
+                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetWebAppUrl()">
                         @EmailLocalizer[nameof(EmailStrings.AppName)]
                     </a>
                 </td>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/TwoFactorTokenTemplate.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/TwoFactorTokenTemplate.razor
index 18a9afab1a..3902f9c6d4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/TwoFactorTokenTemplate.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/TwoFactorTokenTemplate.razor
@@ -1,4 +1,4 @@
-@using Boilerplate.Server.Api.Models.Emailing
+@using Boilerplate.Server.Api.Models.Emailing
 
 @code {
     [Parameter] public TwoFactorTokenTemplateModel Model { get; set; } = default!;
@@ -48,12 +48,12 @@
                style="padding:20px; text-align:center;">
             <tr>
                 <td style="padding-bottom: 10px;">
-                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetBaseUrl(), "images/icon.png"))" width="30" height="20" />
+                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetWebAppUrl(), "images/icon.png"))" width="30" height="20" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetBaseUrl()">
+                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetWebAppUrl()">
                         @EmailLocalizer[nameof(EmailStrings.AppName)]
                     </a>
                 </td>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/AttachmentController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/AttachmentController.cs
index 5e128771ce..735fb5b897 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/AttachmentController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/AttachmentController.cs
@@ -29,10 +29,7 @@ public async Task UploadProfileImage(IFormFile? file, CancellationToken cancella
 
         var userId = User.GetUserId();
 
-        var user = await userManager.FindByIdAsync(userId.ToString());
-
-        if (user is null)
-            throw new ResourceNotFoundException();
+        var user = await userManager.FindByIdAsync(userId.ToString()) ?? throw new ResourceNotFoundException();
 
         var destFileName = $"{userId}_{file.FileName}";
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.EmailConfirmation.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.EmailConfirmation.cs
index 15e8030ba9..1cb19f0140 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.EmailConfirmation.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.EmailConfirmation.cs
@@ -78,7 +78,7 @@ private async Task SendConfirmEmailToken(User user, string? returnUrl, Cancellat
 
         var email = user.Email!;
         var token = await userManager.GenerateUserTokenAsync(user, TokenOptions.DefaultPhoneProvider, FormattableString.Invariant($"VerifyEmail:{email},{user.EmailTokenRequestedOn?.ToUniversalTime()}"));
-        var link = new Uri(HttpContext.Request.GetWebClientUrl(), $"{Urls.ConfirmPage}?email={Uri.EscapeDataString(email)}&emailToken={Uri.EscapeDataString(token)}&culture={CultureInfo.CurrentUICulture.Name}&return-url={returnUrl}");
+        var link = new Uri(HttpContext.Request.GetWebAppUrl(), $"{Urls.ConfirmPage}?email={Uri.EscapeDataString(email)}&emailToken={Uri.EscapeDataString(token)}&culture={CultureInfo.CurrentUICulture.Name}&return-url={returnUrl}");
 
         await emailService.SendEmailToken(user, email, token, link, cancellationToken);
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.ResetPassword.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.ResetPassword.cs
index 5a295f4a32..0b3614af31 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.ResetPassword.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.ResetPassword.cs
@@ -36,7 +36,7 @@ public async Task SendResetPasswordToken(SendResetPasswordTokenRequestDto reques
         var isEmail = string.IsNullOrEmpty(request.Email) is false;
         var qs = $"{(isEmail ? "email" : "phoneNumber")}={Uri.EscapeDataString(isEmail ? request.Email! : request.PhoneNumber!)}";
         var url = $"{Urls.ResetPasswordPage}?token={Uri.EscapeDataString(token)}&{qs}&culture={CultureInfo.CurrentUICulture.Name}";
-        var link = new Uri(HttpContext.Request.GetWebClientUrl(), url);
+        var link = new Uri(HttpContext.Request.GetWebAppUrl(), url);
 
         List<Task> sendMessagesTasks = [];
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.SocialSignIn.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.SocialSignIn.cs
index a66fd513ae..8eed768d58 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.SocialSignIn.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.SocialSignIn.cs
@@ -11,14 +11,17 @@ public partial class IdentityController
     [HttpGet]
     public async Task<string> GetSocialSignInUri(string provider, string? returnUrl = null, int? localHttpPort = null, CancellationToken cancellationToken = default)
     {
-        var uri = Url.Action(nameof(SocialSignIn), new { provider, returnUrl, localHttpPort })!;
+        var uri = Url.Action(nameof(SocialSignIn), new { provider, returnUrl, localHttpPort, origin = Request.GetWebAppUrl() })!;
         return new Uri(Request.GetBaseUrl(), uri).ToString();
     }
 
     [HttpGet]
-    public async Task<ActionResult> SocialSignIn(string provider, string? returnUrl = null, int? localHttpPort = null)
+    public async Task<ActionResult> SocialSignIn(string provider,
+        string? returnUrl = null, /* Specifies the relative page address to navigate to after completion. */
+        int? localHttpPort = null, /* Defines the local HTTP server port awaiting the social sign-in result on Windows/macOS versions of the app. */
+        [FromQuery] string? origin = null /* Indicates the base address URL for redirection after the process completes. */ )
     {
-        var redirectUrl = Url.Action(nameof(SocialSignInCallback), "Identity", new { returnUrl, localHttpPort });
+        var redirectUrl = Url.Action(nameof(SocialSignInCallback), "Identity", new { returnUrl, localHttpPort, origin });
         var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
         return new ChallengeResult(provider, properties);
     }
@@ -95,9 +98,7 @@ public async Task<ActionResult> SocialSignInCallback(string? returnUrl = null, i
         }
 
         if (localHttpPort is not null) return Redirect(new Uri(new Uri($"http://localhost:{localHttpPort}"), url).ToString());
-        var webClientUrl = Settings.WebClientUrl;
-        if (string.IsNullOrEmpty(webClientUrl) is false) return Redirect(new Uri(new Uri(webClientUrl), url).ToString());
-        return LocalRedirect($"~{url}");
+        return Redirect(new Uri(Request.HttpContext.Request.GetWebAppUrl(), url).ToString());
     }
 
     [LoggerMessage(Level = LogLevel.Error, Message = "Failed to perform {loginProvider} social sign in for {principal}")]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.cs
index 314ce51e0c..d11bdb2eb0 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.cs
@@ -297,7 +297,7 @@ public async Task SendOtp(IdentityRequestDto request, string? returnUrl = null,
 
         var (magicLinkToken, url) = await GenerateAutomaticSignInLink(user, returnUrl, originalAuthenticationMethod: "Email");
 
-        var link = new Uri(HttpContext.Request.GetWebClientUrl(), url);
+        var link = new Uri(HttpContext.Request.GetWebAppUrl(), url);
 
         List<Task> sendMessagesTasks = [];
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/UserController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/UserController.cs
index fc6268d279..3db42bd079 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/UserController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/UserController.cs
@@ -170,7 +170,7 @@ public async Task SendChangeEmailToken(SendEmailTokenRequestDto request, Cancell
             FormattableString.Invariant($"ChangeEmail:{request.Email},{user.EmailTokenRequestedOn?.ToUniversalTime()}"));
 
         var link = new Uri(
-            HttpContext.Request.GetWebClientUrl(),
+            HttpContext.Request.GetWebAppUrl(),
             $"{Urls.SettingsPage}/{Urls.SettingsSections.Account}?email={Uri.EscapeDataString(request.Email!)}&emailToken={Uri.EscapeDataString(token)}&culture={CultureInfo.CurrentUICulture.Name}");
 
         await emailService.SendEmailToken(user, request.Email!, token, link, cancellationToken);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Products/ProductController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Products/ProductController.cs
index 6cc30e787a..0e18f16793 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Products/ProductController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Products/ProductController.cs
@@ -38,10 +38,8 @@ public async Task<PagedResult<ProductDto>> GetProducts(ODataQueryOptions<Product
     [HttpGet("{id}")]
     public async Task<ProductDto> Get(Guid id, CancellationToken cancellationToken)
     {
-        var dto = await Get().FirstOrDefaultAsync(t => t.Id == id, cancellationToken);
-
-        if (dto is null)
-            throw new ResourceNotFoundException(Localizer[nameof(AppStrings.ProductCouldNotBeFound)]);
+        var dto = await Get().FirstOrDefaultAsync(t => t.Id == id, cancellationToken)
+            ?? throw new ResourceNotFoundException(Localizer[nameof(AppStrings.ProductCouldNotBeFound)]);
 
         return dto;
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Todo/TodoItemController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Todo/TodoItemController.cs
index 83f05cd53e..975be7800f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Todo/TodoItemController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Todo/TodoItemController.cs
@@ -32,10 +32,8 @@ public async Task<PagedResult<TodoItemDto>> GetTodoItems(ODataQueryOptions<TodoI
     [HttpGet("{id}")]
     public async Task<TodoItemDto> Get(Guid id, CancellationToken cancellationToken)
     {
-        var dto = await Get().FirstOrDefaultAsync(t => t.Id == id, cancellationToken);
-
-        if (dto is null)
-            throw new ResourceNotFoundException(Localizer[nameof(AppStrings.ToDoItemCouldNotBeFound)]);
+        var dto = await Get().FirstOrDefaultAsync(t => t.Id == id, cancellationToken)
+            ?? throw new ResourceNotFoundException(Localizer[nameof(AppStrings.ToDoItemCouldNotBeFound)]);
 
         return dto;
     }
@@ -59,10 +57,8 @@ public async Task<TodoItemDto> Create(TodoItemDto dto, CancellationToken cancell
     [HttpPut]
     public async Task<TodoItemDto> Update(TodoItemDto dto, CancellationToken cancellationToken)
     {
-        var entityToUpdate = await DbContext.TodoItems.FirstOrDefaultAsync(t => t.Id == dto.Id, cancellationToken);
-
-        if (entityToUpdate is null)
-            throw new ResourceNotFoundException(Localizer[nameof(AppStrings.ToDoItemCouldNotBeFound)]);
+        var entityToUpdate = await DbContext.TodoItems.FirstOrDefaultAsync(t => t.Id == dto.Id, cancellationToken)
+            ?? throw new ResourceNotFoundException(Localizer[nameof(AppStrings.ToDoItemCouldNotBeFound)]);
 
         dto.Patch(entityToUpdate);
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Extensions/HttpRequestExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Extensions/HttpRequestExtensions.cs
index 306f709ca9..000dc7e303 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Extensions/HttpRequestExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Extensions/HttpRequestExtensions.cs
@@ -4,6 +4,23 @@ namespace Microsoft.AspNetCore.Http;
 
 public static partial class HttpRequestExtensions
 {
+    internal static Uri GetWebAppUrl(this HttpRequest req)
+    {
+        var settings = req.HttpContext.RequestServices.GetRequiredService<ServerApiSettings>();
+
+        var serverUrl = req.GetBaseUrl();
+
+        var origin = req.Query["origin"].Union(req.Headers["X-Origin"]).Select(o => new Uri(o)).SingleOrDefault();
+
+        if (origin is null)
+            return serverUrl; // Assume that web app and server are hosted in one place.
+
+        if (origin == serverUrl || settings.IsAllowedOrigin(origin))
+            return origin;
+
+        throw new BadRequestException($"Invalid origin {origin}");
+    }
+
     /// <summary>
     /// https://blog.elmah.io/how-to-get-base-url-in-asp-net-core/
     /// </summary>
@@ -17,16 +34,4 @@ internal static Uri GetBaseUrl(this HttpRequest req)
 
         return uriBuilder.Uri;
     }
-
-    internal static Uri GetWebClientUrl(this HttpRequest req)
-    {
-        var settings = req.HttpContext.RequestServices.GetRequiredService<ServerApiSettings>();
-
-        var webClientUrl = settings.WebClientUrl;
-
-        if (string.IsNullOrEmpty(webClientUrl) is false)
-            return new Uri(webClientUrl);
-
-        return req.GetBaseUrl();
-    }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
index fd91fa54cd..34a6b89d56 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
@@ -2,7 +2,6 @@
 using System.Net;
 using System.Net.Mail;
 using System.IO.Compression;
-using System.Text.RegularExpressions;
 using System.Security.Cryptography.X509Certificates;
 using Microsoft.OpenApi.Models;
 using Microsoft.AspNetCore.OData;
@@ -123,16 +122,7 @@ public static void AddServerApiProjectServices(this WebApplicationBuilder builde
                 ServerApiSettings settings = new();
                 configuration.Bind(settings);
 
-                var webClientUrl = settings.WebClientUrl;
-                var allowedOrigins = settings.Cors?.AllowedOrigins?.ToList() ?? [];
-
-                if (string.IsNullOrEmpty(webClientUrl) is false)
-                {
-                    allowedOrigins.Add(webClientUrl);
-                }
-
-                policy.SetIsOriginAllowed(origin => AllowedOriginsRegex().IsMatch(origin) 
-                                                    || allowedOrigins.Any(o => string.Equals(o, origin, StringComparison.InvariantCultureIgnoreCase)))
+                policy.SetIsOriginAllowed(origin => settings.IsAllowedOrigin(new Uri(origin)))
                       .AllowAnyHeader()
                       .AllowAnyMethod()
                       .WithExposedHeaders(HeaderNames.RequestId);
@@ -431,10 +421,4 @@ private static void AddSwaggerGen(WebApplicationBuilder builder)
             });
         });
     }
-
-    /// <summary>
-    /// For either Blazor Hybrid web view, localhost, dev tunnels etc in dev environment.
-    /// </summary>
-    [GeneratedRegex(@"^(http|https|app):\/\/(localhost|0\.0\.0\.0|0\.0\.0\.1|127\.0\.0\.1|.*?devtunnels\.ms|.*?github\.dev)(:\d+)?(\/.*)?$")]
-    private static partial Regex AllowedOriginsRegex();
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/ServerApiSettings.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/ServerApiSettings.cs
index f0f6989863..afff79dec9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/ServerApiSettings.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/ServerApiSettings.cs
@@ -2,6 +2,7 @@
 //#if (notification == true)
 using AdsPush.Abstraction.Settings;
 //#endif
+using System.Text.RegularExpressions;
 
 namespace Boilerplate.Server.Api;
 
@@ -39,7 +40,10 @@ public partial class ServerApiSettings : SharedSettings
 
     public ForwardedHeadersOptions? ForwardedHeaders { get; set; }
 
-    public CorsOptions? Cors { get; set; }
+    /// <summary>
+    /// Defines the list of origins permitted for CORS access to the API. These origins are also valid for use as return URLs after social sign-ins and for generating URLs in emails.
+    /// </summary>
+    public Uri[] AllowedOrigins { get; set; } = [];
 
     public override IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
@@ -92,6 +96,24 @@ public override IEnumerable<ValidationResult> Validate(ValidationContext validat
 
         return validationResults;
     }
+
+    internal bool IsAllowedOrigin(Uri origin)
+    {
+        return AllowedOrigins.Any(allowedOrigin => allowedOrigin == origin)
+            || AllowedOriginsRegex().IsMatch(origin.ToString());
+    }
+
+    //-:cnd:noEmit
+    /// <summary>
+    /// Blazor Hybrid's webview, localhost, devtunnels, github codespaces.
+    /// </summary>
+#if Development
+    [GeneratedRegex(@"^(http|https|app):\/\/(localhost|0\.0\.0\.0|0\.0\.0\.1|127\.0\.0\.1|.*?devtunnels\.ms|.*?github\.dev)(:\d+)?(\/.*)?$")]
+#else
+    [GeneratedRegex(@"^(http|https|app):\/\/(localhost|0\.0\.0\.0|0\.0\.0\.1|127\.0\.0\.1)(:\d+)?(\/.*)?$")]
+#endif
+    //+:cnd:noEmit
+    private partial Regex AllowedOriginsRegex();
 }
 
 public partial class AppIdentityOptions : IdentityOptions
@@ -159,8 +181,3 @@ public partial class SmsOptions
                               string.IsNullOrEmpty(TwilioAccountSid) is false &&
                               string.IsNullOrEmpty(TwilioAutoToken) is false;
 }
-
-public class CorsOptions
-{
-    public string[] AllowedOrigins { get; set; } = [];
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/EmailService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/EmailService.cs
index e510b613c4..78a4677d34 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/EmailService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/EmailService.cs
@@ -22,7 +22,7 @@ public async Task SendResetPasswordToken(User user, string token, Uri link, Canc
 
         if (hostEnvironment.IsDevelopment())
         {
-            LogSendEmail(logger, subject, user.Email!, "ResetPassword", Uri.UnescapeDataString(link.ToString()));
+            LogSendEmail(logger, subject, user.Email!, "ResetPassword", link.ToString());
         }
 
         var body = await BuildBody<ResetPasswordTokenTemplate>(new Dictionary<string, object?>()
@@ -45,7 +45,7 @@ public async Task SendOtp(User user, string token, Uri link, CancellationToken c
 
         if (hostEnvironment.IsDevelopment())
         {
-            LogSendEmail(logger, subject, user.Email!, "Otp", Uri.UnescapeDataString(link.ToString()));
+            LogSendEmail(logger, subject, user.Email!, "Otp", link.ToString());
         }
 
         var body = await BuildBody<OtpTemplate>(new Dictionary<string, object?>()
@@ -86,7 +86,7 @@ public async Task SendEmailToken(User user, string toEmailAddress, string token,
 
         if (hostEnvironment.IsDevelopment())
         {
-            LogSendEmail(logger, subject, user.Email!, "EmailToken", Uri.UnescapeDataString(link.ToString()));
+            LogSendEmail(logger, subject, user.Email!, "EmailToken", link.ToString());
         }
 
         var body = await BuildBody<EmailTokenTemplate>(new Dictionary<string, object?>()
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ODataOperationFilter.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ODataOperationFilter.cs
index cc04f6ddff..b41405db8c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ODataOperationFilter.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ODataOperationFilter.cs
@@ -11,7 +11,7 @@ public partial class ODataOperationFilter : IOperationFilter
 {
     public void Apply(OpenApiOperation operation, OperationFilterContext context)
     {
-        if (operation.Parameters is null) operation.Parameters = [];
+        operation.Parameters ??= [];
 
         if (context.ApiDescription.ActionDescriptor is not ControllerActionDescriptor descriptor)
             return;
@@ -40,7 +40,7 @@ public void Apply(OpenApiOperation operation, OperationFilterContext context)
                 {
                     Type = "string",
                 },
-                Description = "Include only the selected objects. (ex. Childrens, Locations)",
+                Description = "Include only the selected objects. (ex. Orders, Locations)",
                 Required = false
             });
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/PushNotificationService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/PushNotificationService.cs
index 211d9a102b..1b756a77eb 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/PushNotificationService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/PushNotificationService.cs
@@ -116,7 +116,7 @@ public async Task RequestPush(string? title = null, string? message = null, stri
                 }
             });
 
-            if (exceptions.Any())
+            if (exceptions.IsEmpty is false)
             {
                 logger.LogError(new AggregateException(exceptions), "Failed to send push notifications");
             }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/appsettings.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/appsettings.json
index 670cbd3930..9d790c5e2d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/appsettings.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/appsettings.json
@@ -123,6 +123,8 @@
         }
     },
     "AllowedHosts": "*",
+    "AllowedOrigins": [],
+    "AllowedOrigins_Comment": "Defines the list of origins permitted for CORS access to the API. These origins are also valid for use as return URLs after social sign-ins and for generating URLs in emails.",
     "ForwardedHeaders": {
         "ForwardedHeaders": "All",
         "ForwardedHeaders_Comment": "These values apply only if your backend is hosted behind a CDN (such as `Cloudflare`).",
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
index 715ead4ecc..176648d642 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
@@ -36,7 +36,7 @@
     <Link rel="preconnect" href="https://www.gstatic.com" crossorigin />
     @*#endif*@
 
-    <Link rel="preconnect" href="https://use-your-server-url-here.com" />@* for PWA *@
+    <Link rel="preconnect" href="@absoluteServerAddress.ToString()" />@* for PWA *@
 
     <Link rel="icon" href="favicon.ico" type="image/x-icon" />
     <HeadOutlet @rendermode=renderMode />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor.cs
index 9e5be58fdf..5d4577411d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.Rendering;
+using Boilerplate.Client.Core.Services;
 
 namespace Boilerplate.Server.Web.Components;
 
@@ -11,8 +12,9 @@ public partial class App
 
     [CascadingParameter] HttpContext HttpContext { get; set; } = default!;
 
-    [AutoInject] IStringLocalizer<AppStrings> localizer = default!;
     [AutoInject] ServerWebSettings serverWebSettings = default!;
+    [AutoInject] IStringLocalizer<AppStrings> localizer = default!;
+    [AutoInject] AbsoluteServerAddressProvider absoluteServerAddress = default!;
 
     protected override void OnInitialized()
     {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs
index 6eda668616..1ac4e6cd98 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs
@@ -118,6 +118,8 @@ private static void AddBlazor(WebApplicationBuilder builder)
                 httpClient.DefaultRequestHeaders.Add(HeaderNames.Referer, string.Join(',', headerValues.AsEnumerable()));
             }
 
+            httpClient.DefaultRequestHeaders.Add("X-Origin", currentRequest.GetBaseUrl().ToString());
+
             return httpClient;
         });
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/IConfigurationBuilderExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/IConfigurationBuilderExtensions.cs
index 4949ef4661..079361a0c5 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/IConfigurationBuilderExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/IConfigurationBuilderExtensions.cs
@@ -15,7 +15,7 @@ public static partial class IConfigurationBuilderExtensions
     /// </summary>
     public static void AddSharedConfigurations(this IConfigurationBuilder builder)
     {
-        IConfigurationBuilder configBuilder = new ConfigurationBuilder();
+        var configBuilder = new ConfigurationBuilder();
 
         var sharedAssembly = Assembly.Load("Boilerplate.Shared");
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/JsonSeralizerExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/JsonSeralizerExtensions.cs
index 386d722246..3f5745420d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/JsonSeralizerExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/JsonSeralizerExtensions.cs
@@ -1,5 +1,4 @@
-using System.Collections.Concurrent;
-using System.Text.Json.Serialization.Metadata;
+using System.Text.Json.Serialization.Metadata;
 
 namespace System.Text.Json;
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/TupleExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/TupleExtensions.cs
index e84fb45b37..7cb5d66b11 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/TupleExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/TupleExtensions.cs
@@ -16,8 +16,8 @@ namespace System.Threading.Tasks;
 ///     ProductDto[] products;
 ///     protected override async Task OnInitAsync()
 ///     {
-///         categories = await HttpClient.GetJsonAsync("api/categories"); // Tooks 150ms
-///         products = await HttpClient.GetJsonAsync("api/products"); // Tooks 150ms
+///         categories = await HttpClient.GetJsonAsync("api/categories"); // Took 150ms
+///         products = await HttpClient.GetJsonAsync("api/products"); // Took 150ms
 ///         // The total time is 300ms 😖
 ///     }
 /// }
@@ -29,7 +29,7 @@ namespace System.Threading.Tasks;
 ///     ProductDto[] products;
 ///     protected override async Task OnInitAsync()
 ///     {
-///         (categories, products) = await (HttpClient.GetJsonAsync("api/categories"), HttpClient.GetJsonAsync("api/products")); // Tooks 150ms
+///         (categories, products) = await (HttpClient.GetJsonAsync("api/categories"), HttpClient.GetJsonAsync("api/products")); // Took 150ms
 ///         // The total time is 150ms 👍
 ///     }
 /// }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs
index 14e0b9f3f2..52c189578d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs
@@ -68,5 +68,5 @@ private static CultureInfo CustomizeCultureInfoForFaCulture(CultureInfo cultureI
     }
 
     [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_calendar")]
-    extern static ref Calendar Get_CalendarField(CultureInfo cultureInfo);
+    static extern ref Calendar Get_CalendarField(CultureInfo cultureInfo);
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/SharedSettings.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/SharedSettings.cs
index 25b5597677..278996e991 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/SharedSettings.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/SharedSettings.cs
@@ -3,12 +3,6 @@ namespace Boilerplate.Shared;
 
 public partial class SharedSettings : IValidatableObject
 {
-    /// <summary>
-    /// If you are hosting the API and web client on different URLs (e.g., api.test.com and test.com), you must set `WebClientUrl` to your web client's address.
-    /// This ensures that the API server redirects to the correct URL after social sign-ins and other similar actions.
-    /// </summary>
-    public string? WebClientUrl { get; set; }
-
     //#if (appInsights == true)
     public ApplicationInsightsOptions? ApplicationInsights { get; set; }
     //#endif
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.json
index d8281cfda8..2aeda8d50e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.json
@@ -1,6 +1,4 @@
 {
-    "WebClientUrl": null,
-    "WebClientUrl_Comment": "If you are hosting the API and web client on different URLs (e.g., api.company.com and app.company.com), you must set `WebClientUrl` to your web client's address. This ensures that the API server redirects to the correct URL after social sign-ins and other similar actions.",
     //#if (appInsights == true)
     "ApplicationInsights": {
         "ConnectionString": null

From ebf09ab92df978f2407ff7238247f10cf2908a29 Mon Sep 17 00:00:00 2001
From: Mohammad Aminsafaei <m.aminsafaei@outlook.com>
Date: Sun, 29 Dec 2024 14:14:34 +0330
Subject: [PATCH 09/28] feat(blazorui): rename Toggled parameter in
 BitButtonGroup to Toggle #9555 (#9556)

---
 .../BitButtonGroup/BitButtonGroup.razor.cs    | 10 ++++-----
 .../ButtonGroup/BitButtonGroupDemo.razor.cs   |  2 +-
 .../_BitButtonGroupCustomDemo.razor           | 22 ++++++++++++-------
 .../_BitButtonGroupCustomDemo.razor.cs        |  4 ++--
 ..._BitButtonGroupCustomDemo.razor.samples.cs | 22 ++++++++++++-------
 .../ButtonGroup/_BitButtonGroupItemDemo.razor | 10 ++++-----
 .../_BitButtonGroupItemDemo.razor.cs          |  4 ++--
 .../_BitButtonGroupItemDemo.razor.samples.cs  | 10 ++++-----
 .../_BitButtonGroupOptionDemo.razor           | 22 +++++++++----------
 ..._BitButtonGroupOptionDemo.razor.samples.cs | 18 +++++++--------
 10 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs
index f51e18e0c9..9bf05e3061 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs
@@ -76,7 +76,7 @@ public partial class BitButtonGroup<TItem> : BitComponentBase where TItem : clas
     /// <summary>
     /// Display ButtonGroup with toggle mode enabled for each button.
     /// </summary>
-    [Parameter] public bool Toggled { get; set; }
+    [Parameter] public bool Toggle { get; set; }
 
     /// <summary>
     /// The visual variant of the button group.
@@ -203,7 +203,7 @@ private async Task HandleOnItemClick(TItem item)
             }
         }
 
-        if (Toggled)
+        if (Toggle)
         {
             if (_toggleItem == item)
             {
@@ -276,7 +276,7 @@ private async Task HandleOnItemClick(TItem item)
     {
         if (IconOnly) return null;
 
-        if (Toggled)
+        if (Toggle)
         {
             if (_toggleItem == item)
             {
@@ -301,7 +301,7 @@ private async Task HandleOnItemClick(TItem item)
 
     private string? GetItemTitle(TItem? item)
     {
-        if (Toggled)
+        if (Toggle)
         {
             if (_toggleItem == item)
             {
@@ -326,7 +326,7 @@ private async Task HandleOnItemClick(TItem item)
 
     private string? GetItemIconName(TItem? item)
     {
-        if (Toggled)
+        if (Toggle)
         {
             if (_toggleItem == item)
             {
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs
index 2de44d898a..cf0fc5c887 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs
@@ -76,7 +76,7 @@ public partial class BitButtonGroupDemo
         },
         new()
         {
-            Name = "Toggled",
+            Name = "Toggle",
             Type = "bool",
             DefaultValue = "false",
             Description = "Display ButtonGroup with toggle mode enabled for each button.",
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor
index 0d5e331a08..e4db2fc337 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor
@@ -140,44 +140,50 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Toggled" RazorCode="@example6RazorCode" CsharpCode="@example6CsharpCode" Id="example6">
+<ComponentExampleBox Title="Toggle" RazorCode="@example6RazorCode" CsharpCode="@example6CsharpCode" Id="example6">
     <ExamplePreview>
-        <div>The Toggled in BitButtonGroup allows you to control the active or inactive state of each button, providing clear visual feedback to users about which buttons are selected or currently in use.</div>
+        <div>The Toggle in BitButtonGroup allows you to control the active or inactive state of each button, providing clear visual feedback to users about which buttons are selected or currently in use.</div>
         <br /><br />
         <div class="example-content">
             <div>Fill (default)</div>
-            <BitButtonGroup Variant="BitVariant.Fill" Items="toggledCustoms"
+            <BitButtonGroup Toggle
+                            Items="toggledCustoms"
+                            Variant="BitVariant.Fill"
                             NameSelectors="@(new() { OnText = { Selector = i => i.OnName },
                                                      OffText = { Selector = i => i.OffName },
                                                      OnTitle = { Selector = i => i.OnTitle },
                                                      OffTitle = { Selector = i => i.OffTitle },
                                                      OnIconName = { Selector = i => i.OnIcon },
                                                      OffIconName = { Selector = i => i.OffIcon },
-                                                     ReversedIcon = { Selector = i => i.ReversedIcon } })" Toggled />
+                                                     ReversedIcon = { Selector = i => i.ReversedIcon } })" />
         </div>
         <br /><br />
         <div class="example-content">
             <div>Outline</div>
-            <BitButtonGroup Variant="BitVariant.Outline" Items="toggledCustoms"
+            <BitButtonGroup Toggle
+                            Items="toggledCustoms"
+                            Variant="BitVariant.Outline"
                             NameSelectors="@(new() { OnText = { Selector = i => i.OnName },
                                                      OffText = { Selector = i => i.OffName },
                                                      OnTitle = { Selector = i => i.OnTitle },
                                                      OffTitle = { Selector = i => i.OffTitle },
                                                      OnIconName = { Selector = i => i.OnIcon },
                                                      OffIconName = { Selector = i => i.OffIcon },
-                                                     ReversedIcon = { Selector = i => i.ReversedIcon } })" Toggled />
+                                                     ReversedIcon = { Selector = i => i.ReversedIcon } })" />
         </div>
         <br /><br />
         <div class="example-content">
             <div>Text</div>
-            <BitButtonGroup Variant="BitVariant.Text" Items="toggledCustoms"
+            <BitButtonGroup Toggle
+                            Items="toggledCustoms"
+                            Variant="BitVariant.Text"
                             NameSelectors="@(new() { OnText = { Selector = i => i.OnName },
                                                      OffText = { Selector = i => i.OffName },
                                                      OnTitle = { Selector = i => i.OnTitle },
                                                      OffTitle = { Selector = i => i.OffTitle },
                                                      OnIconName = { Selector = i => i.OnIcon },
                                                      OffIconName = { Selector = i => i.OffIcon },
-                                                     ReversedIcon = { Selector = i => i.ReversedIcon } })" Toggled />
+                                                     ReversedIcon = { Selector = i => i.ReversedIcon } })" />
         </div>
     </ExamplePreview>
 </ComponentExampleBox>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.cs
index 0369b8eb8c..b8528799dc 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.cs
@@ -40,9 +40,9 @@ public partial class _BitButtonGroupCustomDemo
 
     private List<Operation> toggledCustoms =
     [
-        new() { OnName = "Back (2X)", OffName = "Back", OnIcon = BitIconName.RewindTwoX, OffIcon = BitIconName.Rewind },
+        new() { OnName = "Back (2X)", OffName = "Back (1X)", OnIcon = BitIconName.RewindTwoX, OffIcon = BitIconName.Rewind },
         new() { OnTitle = "Resume", OffTitle = "Play", OnIcon = BitIconName.PlayResume, OffIcon = BitIconName.Play },
-        new() { OnName = "Forward (2X)", OffName = "Forward", OnIcon = BitIconName.FastForwardTwoX, OffIcon = BitIconName.FastForward, ReversedIcon = true }
+        new() { OnName = "Forward (2X)", OffName = "Forward (1X)", OnIcon = BitIconName.FastForwardTwoX, OffIcon = BitIconName.FastForward, ReversedIcon = true }
     ];
 
     private List<Operation> eventsCustoms =
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs
index f84fb7e28e..25ff2cbc36 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs
@@ -151,32 +151,38 @@ public class Operation
 ];";
 
     private readonly string example6RazorCode = @"
-<BitButtonGroup Variant=""BitVariant.Fill"" Items=""toggledCustoms""
+<BitButtonGroup Toggle
+                Items=""toggledCustoms""
+                Variant=""BitVariant.Fill"" 
                 NameSelectors=""@(new() { OnText = { Selector = i => i.OnName },
                                           OffText = { Selector = i => i.OffName },
                                           OnTitle = { Selector = i => i.OnTitle },
                                           OffTitle = { Selector = i => i.OffTitle },
                                           OnIconName = { Selector = i => i.OnIcon },
                                           OffIconName = { Selector = i => i.OffIcon },
-                                          ReversedIcon = { Selector = i => i.ReversedIcon } })"" Toggled />
+                                          ReversedIcon = { Selector = i => i.ReversedIcon } })"" />
 
-<BitButtonGroup Variant=""BitVariant.Outline"" Items=""toggledCustoms""
+<BitButtonGroup Toggle
+                Items=""toggledCustoms""
+                Variant=""BitVariant.Outline"" 
                 NameSelectors=""@(new() { OnText = { Selector = i => i.OnName },
                                           OffText = { Selector = i => i.OffName },
                                           OnTitle = { Selector = i => i.OnTitle },
                                           OffTitle = { Selector = i => i.OffTitle },
                                           OnIconName = { Selector = i => i.OnIcon },
                                           OffIconName = { Selector = i => i.OffIcon },
-                                          ReversedIcon = { Selector = i => i.ReversedIcon } })"" Toggled />
+                                          ReversedIcon = { Selector = i => i.ReversedIcon } })"" />
 
-<BitButtonGroup Variant=""BitVariant.Text"" Items=""toggledCustoms""
+<BitButtonGroup Toggle
+                Items=""toggledCustoms""
+                Variant=""BitVariant.Text"" 
                 NameSelectors=""@(new() { OnText = { Selector = i => i.OnName },
                                           OffText = { Selector = i => i.OffName },
                                           OnTitle = { Selector = i => i.OnTitle },
                                           OffTitle = { Selector = i => i.OffTitle },
                                           OnIconName = { Selector = i => i.OnIcon },
                                           OffIconName = { Selector = i => i.OffIcon },
-                                          ReversedIcon = { Selector = i => i.ReversedIcon } })"" Toggled />";
+                                          ReversedIcon = { Selector = i => i.ReversedIcon } })"" />";
     private readonly string example6CsharpCode = @"
 public class Operation
 {
@@ -191,9 +197,9 @@ public class Operation
 
 private List<Operation> toggledCustoms =
 [
-    new() { OnName = ""Back (2X)"", OffName = ""Back"", OnIcon = BitIconName.RewindTwoX, OffIcon = BitIconName.Rewind },
+    new() { OnName = ""Back (2X)"", OffName = ""Back (1X)"", OnIcon = BitIconName.RewindTwoX, OffIcon = BitIconName.Rewind },
     new() { OnTitle = ""Resume"", OffTitle = ""Play"", OnIcon = BitIconName.PlayResume, OffIcon = BitIconName.Play },
-    new() { OnName = ""Forward (2X)"", OffName = ""Forward"", OnIcon = BitIconName.FastForwardTwoX, OffIcon = BitIconName.FastForward, ReversedIcon = true }
+    new() { OnName = ""Forward (2X)"", OffName = ""Forward (1X)"", OnIcon = BitIconName.FastForwardTwoX, OffIcon = BitIconName.FastForward, ReversedIcon = true }
 ];";
 
     private readonly string example7RazorCode = @"
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor
index 1ea39f8981..b5486f1134 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor
@@ -113,23 +113,23 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Toggled" RazorCode="@example6RazorCode" CsharpCode="@example6CsharpCode" Id="example6">
+<ComponentExampleBox Title="Toggle" RazorCode="@example6RazorCode" CsharpCode="@example6CsharpCode" Id="example6">
     <ExamplePreview>
-        <div>The Toggled in BitButtonGroup allows you to control the active or inactive state of each button, providing clear visual feedback to users about which buttons are selected or currently in use.</div>
+        <div>The Toggle in BitButtonGroup allows you to control the active or inactive state of each button, providing clear visual feedback to users about which buttons are selected or currently in use.</div>
         <br /><br />
         <div class="example-content">
             <div>Fill (default)</div>
-            <BitButtonGroup Variant="BitVariant.Fill" Items="toggledItems" Toggled />
+            <BitButtonGroup Toggle Variant="BitVariant.Fill" Items="toggledItems" />
         </div>
         <br /><br />
         <div class="example-content">
             <div>Outline</div>
-            <BitButtonGroup Variant="BitVariant.Outline" Items="toggledItems" Toggled />
+            <BitButtonGroup Toggle Variant="BitVariant.Outline" Items="toggledItems" />
         </div>
         <br /><br />
         <div class="example-content">
             <div>Text</div>
-            <BitButtonGroup Variant="BitVariant.Text" Items="toggledItems" Toggled />
+            <BitButtonGroup Toggle Variant="BitVariant.Text" Items="toggledItems" />
         </div>
     </ExamplePreview>
 </ComponentExampleBox>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.cs
index 15b29a29c7..32b455a4da 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.cs
@@ -38,9 +38,9 @@ public partial class _BitButtonGroupItemDemo
 
     private List<BitButtonGroupItem> toggledItems =
     [
-        new() { OnText = "Back (2X)", OffText = "Back", OnIconName = BitIconName.RewindTwoX, OffIconName = BitIconName.Rewind },
+        new() { OnText = "Back (2X)", OffText = "Back (1X)", OnIconName = BitIconName.RewindTwoX, OffIconName = BitIconName.Rewind },
         new() { OnTitle = "Resume", OffTitle = "Play", OnIconName = BitIconName.PlayResume, OffIconName = BitIconName.Play },
-        new() { OnText = "Forward (2X)", OffText = "Forward", OnIconName = BitIconName.FastForwardTwoX, OffIconName = BitIconName.FastForward, ReversedIcon = true }
+        new() { OnText = "Forward (2X)", OffText = "Forward (1X)", OnIconName = BitIconName.FastForwardTwoX, OffIconName = BitIconName.FastForward, ReversedIcon = true }
     ];
 
     private List<BitButtonGroupItem> eventsItems =
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs
index 5431abfd76..6008d38cf6 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs
@@ -81,15 +81,15 @@ public partial class _BitButtonGroupItemDemo
 ];";
 
     private readonly string example6RazorCode = @"
-<BitButtonGroup Variant=""BitVariant.Fill"" Items=""toggledItems"" Toggled />
-<BitButtonGroup Variant=""BitVariant.Outline"" Items=""toggledItems"" Toggled />
-<BitButtonGroup Variant=""BitVariant.Text"" Items=""toggledItems"" Toggled />";
+<BitButtonGroup Toggle Variant=""BitVariant.Fill"" Items=""toggledItems"" />
+<BitButtonGroup Toggle Variant=""BitVariant.Outline"" Items=""toggledItems"" />
+<BitButtonGroup Toggle Variant=""BitVariant.Text"" Items=""toggledItems"" />";
     private readonly string example6CsharpCode = @"
 private List<BitButtonGroupItem> toggledItems =
 [
-    new() { OnText = ""Back (2X)"", OffText = ""Back"", OnIconName = BitIconName.RewindTwoX, OffIconName = BitIconName.Rewind },
+    new() { OnText = ""Back (2X)"", OffText = ""Back (1X)"", OnIconName = BitIconName.RewindTwoX, OffIconName = BitIconName.Rewind },
     new() { OnTitle = ""Resume"", OffTitle = ""Play"", OnIconName = BitIconName.PlayResume, OffIconName = BitIconName.Play },
-    new() { OnText = ""Forward (2X)"", OffText = ""Forward"", OnIconName = BitIconName.FastForwardTwoX, OffIconName = BitIconName.FastForward, ReversedIcon = true }
+    new() { OnText = ""Forward (2X)"", OffText = ""Forward (1X)"", OnIconName = BitIconName.FastForwardTwoX, OffIconName = BitIconName.FastForward, ReversedIcon = true }
 ];";
 
     private readonly string example7RazorCode = @"
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor
index f34499d397..8580fa574f 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor
@@ -183,34 +183,34 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Toggled" RazorCode="@example6RazorCode" Id="example6">
+<ComponentExampleBox Title="Toggle" RazorCode="@example6RazorCode" Id="example6">
     <ExamplePreview>
-        <div>The Toggled in BitButtonGroup allows you to control the active or inactive state of each button, providing clear visual feedback to users about which buttons are selected or currently in use.</div>
+        <div>The Toggle in BitButtonGroup allows you to control the active or inactive state of each button, providing clear visual feedback to users about which buttons are selected or currently in use.</div>
         <br /><br />
         <div class="example-content">
             <div>Fill (default)</div>
-            <BitButtonGroup Variant="BitVariant.Fill" TItem="BitButtonGroupOption" Toggled>
-                <BitButtonGroupOption OnText="Back (2X)" OffText="Back" OnIconName="@BitIconName.RewindTwoX" OffIconName="@BitIconName.Rewind" />
+            <BitButtonGroup Toggle Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption OnText="Back (2X)" OffText="Back (1X)" OnIconName="@BitIconName.RewindTwoX" OffIconName="@BitIconName.Rewind" />
                 <BitButtonGroupOption OnTitle="Resume" OffTitle="Play" OnIconName="@BitIconName.PlayResume" OffIconName="@BitIconName.Play" />
-                <BitButtonGroupOption OnText="Forward (2X)" OffText="Forward" OnIconName="@BitIconName.FastForwardTwoX" OffIconName="@BitIconName.FastForward" ReversedIcon />
+                <BitButtonGroupOption OnText="Forward (2X)" OffText="Forward (1X)" OnIconName="@BitIconName.FastForwardTwoX" OffIconName="@BitIconName.FastForward" ReversedIcon />
             </BitButtonGroup>
         </div>
         <br /><br />
         <div class="example-content">
             <div>Outline</div>
-            <BitButtonGroup Variant="BitVariant.Outline" TItem="BitButtonGroupOption" Toggled>
-                <BitButtonGroupOption OnText="Back (2X)" OffText="Back" OnIconName="@BitIconName.RewindTwoX" OffIconName="@BitIconName.Rewind" />
+            <BitButtonGroup Toggle Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption OnText="Back (2X)" OffText="Back (1X)" OnIconName="@BitIconName.RewindTwoX" OffIconName="@BitIconName.Rewind" />
                 <BitButtonGroupOption OnTitle="Resume" OffTitle="Play" OnIconName="@BitIconName.PlayResume" OffIconName="@BitIconName.Play" />
-                <BitButtonGroupOption OnText="Forward (2X)" OffText="Forward" OnIconName="@BitIconName.FastForwardTwoX" OffIconName="@BitIconName.FastForward" ReversedIcon />
+                <BitButtonGroupOption OnText="Forward (2X)" OffText="Forward (1X)" OnIconName="@BitIconName.FastForwardTwoX" OffIconName="@BitIconName.FastForward" ReversedIcon />
             </BitButtonGroup>
         </div>
         <br /><br />
         <div class="example-content">
             <div>Text</div>
-            <BitButtonGroup Variant="BitVariant.Text" TItem="BitButtonGroupOption" Toggled>
-                <BitButtonGroupOption OnText="Back (2X)" OffText="Back" OnIconName="@BitIconName.RewindTwoX" OffIconName="@BitIconName.Rewind" />
+            <BitButtonGroup Toggle Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption OnText="Back (2X)" OffText="Back (1X)" OnIconName="@BitIconName.RewindTwoX" OffIconName="@BitIconName.Rewind" />
                 <BitButtonGroupOption OnTitle="Resume" OffTitle="Play" OnIconName="@BitIconName.PlayResume" OffIconName="@BitIconName.Play" />
-                <BitButtonGroupOption OnText="Forward (2X)" OffText="Forward" OnIconName="@BitIconName.FastForwardTwoX" OffIconName="@BitIconName.FastForward" ReversedIcon />
+                <BitButtonGroupOption OnText="Forward (2X)" OffText="Forward (1X)" OnIconName="@BitIconName.FastForwardTwoX" OffIconName="@BitIconName.FastForward" ReversedIcon />
             </BitButtonGroup>
         </div>
     </ExamplePreview>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs
index 8c30e6d21c..985c5f08f4 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs
@@ -118,22 +118,22 @@ public partial class _BitButtonGroupOptionDemo
 </BitButtonGroup>";
 
     private readonly string example6RazorCode = @"
-<BitButtonGroup Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"" Toggled>
-    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
+<BitButtonGroup Toggle Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back (1X)"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
     <BitButtonGroupOption OnTitle=""Resume"" OffTitle=""Play"" OnIconName=""@BitIconName.PlayResume"" OffIconName=""@BitIconName.Play"" />
-    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
+    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward (1X)"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
 </BitButtonGroup>
 
-<BitButtonGroup Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"" Toggled>
-    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
+<BitButtonGroup Toggle Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back (1X)"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
     <BitButtonGroupOption OnTitle=""Resume"" OffTitle=""Play"" OnIconName=""@BitIconName.PlayResume"" OffIconName=""@BitIconName.Play"" />
-    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
+    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward (1X)"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
 </BitButtonGroup>
 
-<BitButtonGroup Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"" Toggled>
-    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
+<BitButtonGroup Toggle Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption OnText=""Back (2X)"" OffText=""Back (1X)"" OnIconName=""@BitIconName.RewindTwoX"" OffIconName=""@BitIconName.Rewind"" />
     <BitButtonGroupOption OnTitle=""Resume"" OffTitle=""Play"" OnIconName=""@BitIconName.PlayResume"" OffIconName=""@BitIconName.Play"" />
-    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
+    <BitButtonGroupOption OnText=""Forward (2X)"" OffText=""Forward (1X)"" OnIconName=""@BitIconName.FastForwardTwoX"" OffIconName=""@BitIconName.FastForward"" ReversedIcon />
 </BitButtonGroup>";
 
     private readonly string example7RazorCode = @"

From 0e166fbf28d6728218c8b68057108fc55466265e Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Sun, 29 Dec 2024 13:32:19 +0100
Subject: [PATCH 10/28] feat(templates): improve Boilerplate social sign-in in
 blazor hybrid #9557 (#9558)

---
 .../Services/Contracts/ILocalHttpServer.cs    |  2 +-
 .../MauiProgram.Services.cs                   | 12 +--------
 .../Services/MauiExternalNavigationService.cs |  2 +-
 .../Services/MauiLocalHttpServer.cs           | 26 ++++++++++++++-----
 .../Components/SocialSignedInPage.razor       |  3 +++
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ILocalHttpServer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ILocalHttpServer.cs
index dfcf4ba11f..ef429f3504 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ILocalHttpServer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ILocalHttpServer.cs
@@ -2,7 +2,7 @@
 
 /// <summary>
 /// Social sign-in functions seamlessly on web browsers and on Android and iOS via universal app links. 
-/// However, for Windows and macOS, a local HTTP server is needed to ensure a smooth social sign-in experience. 
+/// However, for blazor hybrid, a local HTTP server is needed to ensure a smooth social sign-in experience. 
 /// </summary>
 public interface ILocalHttpServer
 {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs
index efb7f47489..78ba7c58a2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs
@@ -39,17 +39,7 @@ public static void ConfigureServices(this MauiAppBuilder builder)
             return settings;
         });
         services.AddSingleton(ITelemetryContext.Current!);
-        if (AppPlatform.IsWindows
-            || AppPlatform.IsMacOS
-            || AppEnvironment.IsDev())
-        {
-            // About AppEnvironment.IsDev:
-            // In the development environment, universal links are not configured. Universal links are required to provide the
-            // same user experience (UX) that you can test in the production app (available on Google Play at https://play.google.com/store/apps/details?id=com.bitplatform.AdminPanel.Template).
-            // As a workaround, we will fallback to a local HTTP server. This will provide a slightly degraded UX, but it will allow you to test the app in the development environment.
-
-            services.AddSingleton<ILocalHttpServer, MauiLocalHttpServer>();
-        }
+        services.AddSingleton<ILocalHttpServer, MauiLocalHttpServer>();
 
         services.AddMauiBlazorWebView();
         services.AddBlazorWebViewDeveloperTools();
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExternalNavigationService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExternalNavigationService.cs
index 471a604039..c629f6a373 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExternalNavigationService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExternalNavigationService.cs
@@ -4,6 +4,6 @@ public partial class MauiExternalNavigationService : IExternalNavigationService
 {
     public async Task NavigateToAsync(string url)
     {
-        await Browser.OpenAsync(url, AppPlatform.IsAndroid ? BrowserLaunchMode.SystemPreferred : BrowserLaunchMode.External);
+        await Browser.OpenAsync(url, AppPlatform.IsWindows || AppPlatform.IsMacOS ? BrowserLaunchMode.External : BrowserLaunchMode.SystemPreferred /* in app browser */);
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs
index 2ac3f07c71..d4c134d38b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs
@@ -27,18 +27,32 @@ public int Start(CancellationToken cancellationToken)
             {
                 try
                 {
+                    // Redirect to SocialSignedInPage.razor that will close the browser window.
                     var url = new Uri(absoluteServerAddress, $"/api/Identity/SocialSignedIn?culture={CultureInfo.CurrentUICulture.Name}").ToString();
-
                     ctx.Redirect(url);
 
-                    _ = Task.Delay(1)
-                        .ContinueWith(async _ =>
+                    if (AppPlatform.IsIOS)
+                    {
+                        // SocialSignedInPage.razor's `window.close()` does NOT work on iOS's in app browser.
+                        await MainThread.InvokeOnMainThreadAsync(() =>
                         {
-                            await MainThread.InvokeOnMainThreadAsync(async () =>
+#if iOS
+                            if (UIKit.UIApplication.SharedApplication.KeyWindow?.RootViewController?.PresentedViewController is SafariServices.SFSafariViewController controller)
                             {
-                                await Routes.OpenUniversalLink(ctx.Request.Url.PathAndQuery, replace: true);
-                            });
+                                controller.DismissViewController(animated: true, completionHandler: null);
+                            }
+#endif
+                        });
+                    }
+
+                    _ = Task.Delay(1)
+                    .ContinueWith(async _ =>
+                    {
+                        await MainThread.InvokeOnMainThreadAsync(async () =>
+                        {
+                            await Routes.OpenUniversalLink(ctx.Request.Url.PathAndQuery, replace: true);
                         });
+                    });
                 }
                 catch (Exception exp)
                 {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/SocialSignedInPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/SocialSignedInPage.razor
index 2676399732..7d1fe4f328 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/SocialSignedInPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/SocialSignedInPage.razor
@@ -46,6 +46,9 @@
             <h3>@Localizer[nameof(AppStrings.SocialSignedInMessageBody)]</h3>
         </div>
     </main>
+    <script type="text/javascript">
+        window.close();
+    </script>
 </body>
 
 </html>
\ No newline at end of file

From 0dc9ab8a10d1db65a1c323e771bf61ba28b85511 Mon Sep 17 00:00:00 2001
From: Mohammad Aminsafaei <m.aminsafaei@outlook.com>
Date: Mon, 30 Dec 2024 17:19:05 +0330
Subject: [PATCH 11/28] feat(blazorui): add FullWidth parameter to
 BitGroupButton #9559 (#9560)

---
 .../BitButtonGroup/BitButtonGroup.razor.cs    |  8 ++++++
 .../BitButtonGroup/BitButtonGroup.scss        |  7 ++++-
 .../ButtonGroup/BitButtonGroupDemo.razor.cs   |  7 +++++
 .../_BitButtonGroupCustomDemo.razor           | 18 ++++++++++---
 ..._BitButtonGroupCustomDemo.razor.samples.cs | 27 +++++++++++++++----
 .../ButtonGroup/_BitButtonGroupItemDemo.razor | 18 ++++++++++---
 .../_BitButtonGroupItemDemo.razor.samples.cs  | 20 ++++++++++----
 .../_BitButtonGroupOptionDemo.razor           | 25 ++++++++++++++---
 ..._BitButtonGroupOptionDemo.razor.samples.cs | 15 +++++++++--
 9 files changed, 123 insertions(+), 22 deletions(-)

diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs
index 9bf05e3061..ad846198c6 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.razor.cs
@@ -32,6 +32,12 @@ public partial class BitButtonGroup<TItem> : BitComponentBase where TItem : clas
     [Parameter, ResetClassBuilder]
     public BitColor? Color { get; set; }
 
+    /// <summary>
+    /// Expand the ButtonGroup width to 100% of the available width.
+    /// </summary>
+    [Parameter, ResetClassBuilder]
+    public bool FullWidth { get; set; }
+
     /// <summary>
     /// Determines that only the icon should be rendered.
     /// </summary>
@@ -154,6 +160,8 @@ protected override void RegisterCssClasses()
         });
 
         ClassBuilder.Register(() => Vertical ? "bit-btg-vrt" : string.Empty);
+
+        ClassBuilder.Register(() => FullWidth ? "bit-btg-flw" : string.Empty);
     }
 
     protected override void RegisterCssStyles()
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.scss b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.scss
index 9a55b86981..3e6fb265db 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.scss
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitButtonGroup/BitButtonGroup.scss
@@ -2,9 +2,9 @@
 
 .bit-btg {
     overflow: hidden;
+    width: fit-content;
     flex-direction: row;
     display: inline-flex;
-    max-width: fit-content;
     border-width: $shp-border-width;
     border-style: $shp-border-style;
     border-radius: $shp-border-radius;
@@ -24,7 +24,12 @@
     }
 }
 
+.bit-btg-flw {
+    width: 100%;
+}
+
 .bit-btg-itm {
+    flex-grow: 1;
     display: flex;
     gap: spacing(1);
     cursor: pointer;
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs
index cf0fc5c887..698761d93b 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/BitButtonGroupDemo.razor.cs
@@ -37,6 +37,13 @@ public partial class BitButtonGroupDemo
             Href = "#color-enum",
         },
         new()
+        {
+            Name = "FullWidth",
+            Type = "bool",
+            DefaultValue = "false",
+            Description = "Expand the ButtonGroup width to 100% of the available width.",
+        },
+        new()
         {
             Name = "Items",
             Type = "IEnumerable<TItem>",
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor
index e4db2fc337..f382d7a534 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor
@@ -261,7 +261,19 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Color" RazorCode="@example10RazorCode" CsharpCode="@example10CsharpCode" Id="example10">
+<ComponentExampleBox Title="FullWidth" RazorCode="@example10RazorCode" CsharpCode="@example10CsharpCode" Id="example10">
+    <ExamplePreview>
+        <div>Setting the FullWidth makes the button group occupy 100% of its container's width.</div>
+        <br /><br />
+        <div class="example-content">
+            <BitButtonGroup FullWidth Variant="BitVariant.Fill" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup FullWidth Variant="BitVariant.Outline" Items="basicCustoms" NameSelectors="nameSelector" />
+            <BitButtonGroup FullWidth Variant="BitVariant.Text" Items="basicCustoms" NameSelectors="nameSelector" />
+        </div>
+    </ExamplePreview>
+</ComponentExampleBox>
+
+<ComponentExampleBox Title="Color" RazorCode="@example11RazorCode" CsharpCode="@example11CsharpCode" Id="example11">
     <ExamplePreview>
         <div>Offering a range of specialized colors, providing visual cues for specific states within your application.</div>
         <br /><br />
@@ -388,7 +400,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Style & Class" RazorCode="@example11RazorCode" CsharpCode="@example11CsharpCode" Id="example11">
+<ComponentExampleBox Title="Style & Class" RazorCode="@example12RazorCode" CsharpCode="@example12CsharpCode" Id="example12">
     <ExamplePreview>
         <div>Empower customization by overriding default styles and classes, allowing tailored design modifications to suit specific UI requirements.</div>
         <br /><br />
@@ -421,7 +433,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="RTL" RazorCode="@example12RazorCode" CsharpCode="@example12CsharpCode" Id="example12">
+<ComponentExampleBox Title="RTL" RazorCode="@example13RazorCode" CsharpCode="@example13CsharpCode" Id="example13">
     <ExamplePreview>
         <div>Use BitButtonGroup in right-to-left (RTL).</div>
         <br />
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs
index 25ff2cbc36..ef5dcaa1e1 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupCustomDemo.razor.samples.cs
@@ -287,6 +287,23 @@ public class Operation
 ];";
 
     private readonly string example10RazorCode = @"
+<BitButtonGroup FullWidth Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup FullWidth Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
+<BitButtonGroup FullWidth Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />";
+    private readonly string example10CsharpCode = @"
+private BitButtonGroupNameSelectors<Operation> nameSelector = new() { Text = { Selector = i => i.Name } };
+
+public class Operation
+{
+    public string? Name { get; set; }
+}
+
+private List<Operation> basicCustoms =
+[
+    new() { Name = ""Add"" }, new() { Name = ""Edit"" }, new() { Name = ""Delete"" }
+];";
+
+    private readonly string example11RazorCode = @"
 <BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
 <BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
 <BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
@@ -357,7 +374,7 @@ public class Operation
 <BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Fill"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
 <BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Outline"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />
 <BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Text"" Items=""basicCustoms"" NameSelectors=""nameSelector"" />";
-    private readonly string example10CsharpCode = @"
+    private readonly string example11CsharpCode = @"
 private BitButtonGroupNameSelectors<Operation> nameSelector = new() { Text = { Selector = i => i.Name } };
 
 public class Operation
@@ -370,7 +387,7 @@ public class Operation
     new() { Name = ""Add"" }, new() { Name = ""Edit"" }, new() { Name = ""Delete"" }
 ];";
 
-    private readonly string example11RazorCode = @"
+    private readonly string example12RazorCode = @"
 <style>
     .custom-class {
         margin-inline: 1rem;
@@ -419,7 +436,7 @@ public class Operation
                 Variant=""BitVariant.Text""
                 NameSelectors=""nameSelector""
                 Classes=""@(new() { Button = ""custom-btn"" })"" />";
-    private readonly string example11CsharpCode = @"
+    private readonly string example12CsharpCode = @"
 private BitButtonGroupNameSelectors<Operation> nameSelector = new() { Text = { Selector = i => i.Name } };
 
 public class Operation
@@ -451,7 +468,7 @@ public class Operation
     }
 ];";
 
-    private readonly string example12RazorCode = @"
+    private readonly string example13RazorCode = @"
 <BitButtonGroup Dir=""BitDir.Rtl""
                 Items=""rtlCustoms""
                 Variant=""BitVariant.Fill""
@@ -469,7 +486,7 @@ public class Operation
                 Variant=""BitVariant.Text""
                 NameSelectors=""@(new() { Text = { Selector = i => i.Name },
                                          IconName = { Selector = i => i.Icon } })"" />";
-    private readonly string example12CsharpCode = @"
+    private readonly string example13CsharpCode = @"
 public class Operation
 {
     public string? Name { get; set; }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor
index b5486f1134..95ebf92504 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor
@@ -202,7 +202,19 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Color" RazorCode="@example10RazorCode" CsharpCode="@example10CsharpCode" Id="example10">
+<ComponentExampleBox Title="FullWidth" RazorCode="@example10RazorCode" CsharpCode="@example10CsharpCode" Id="example10">
+    <ExamplePreview>
+        <div>Setting the FullWidth makes the button group occupy 100% of its container's width.</div>
+        <br /><br />
+        <div class="example-content">
+            <BitButtonGroup FullWidth Variant="BitVariant.Fill" Items="basicItems" />
+            <BitButtonGroup FullWidth Variant="BitVariant.Outline" Items="basicItems" />
+            <BitButtonGroup FullWidth Variant="BitVariant.Text" Items="basicItems" />
+        </div>
+    </ExamplePreview>
+</ComponentExampleBox>
+
+<ComponentExampleBox Title="Color" RazorCode="@example11RazorCode" CsharpCode="@example11CsharpCode" Id="example11">
     <ExamplePreview>
         <div>Offering a range of specialized colors, providing visual cues for specific states within your application.</div>
         <br /><br />
@@ -329,7 +341,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Style & Class" RazorCode="@example11RazorCode" CsharpCode="@example11CsharpCode" Id="example11">
+<ComponentExampleBox Title="Style & Class" RazorCode="@example12RazorCode" CsharpCode="@example12CsharpCode" Id="example12">
     <ExamplePreview>
         <div>Empower customization by overriding default styles and classes, allowing tailored design modifications to suit specific UI requirements.</div>
         <br /><br />
@@ -357,7 +369,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="RTL" RazorCode="@example12RazorCode" CsharpCode="@example12CsharpCode" Id="example12">
+<ComponentExampleBox Title="RTL" RazorCode="@example13RazorCode" CsharpCode="@example13CsharpCode" Id="example13">
     <ExamplePreview>
         <div>Use BitButtonGroup in right-to-left (RTL).</div>
         <br />
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs
index 6008d38cf6..39dbd06ce2 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupItemDemo.razor.samples.cs
@@ -145,6 +145,16 @@ protected override void OnInitialized()
 ];";
 
     private readonly string example10RazorCode = @"
+<BitButtonGroup FullWidth Variant=""BitVariant.Fill"" Items=""basicItems"" />
+<BitButtonGroup FullWidth Variant=""BitVariant.Outline"" Items=""basicItems"" />
+<BitButtonGroup FullWidth Variant=""BitVariant.Text"" Items=""basicItems"" />";
+    private readonly string example10CsharpCode = @"
+private List<BitButtonGroupItem> basicItems =
+[
+    new() { Text = ""Add"" }, new() { Text = ""Edit"" }, new() { Text = ""Delete"" }
+];";
+
+    private readonly string example11RazorCode = @"
 <BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
 <BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
 <BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Text"" Items=""basicItems"" />
@@ -215,13 +225,13 @@ protected override void OnInitialized()
 <BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Fill"" Items=""basicItems"" />
 <BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Outline"" Items=""basicItems"" />
 <BitButtonGroup Color=""BitColor.TertiaryBorder"" Variant=""BitVariant.Text"" Items=""basicItems"" />";
-    private readonly string example10CsharpCode = @"
+    private readonly string example11CsharpCode = @"
 private List<BitButtonGroupItem> basicItems = 
 [
     new() { Text = ""Add"" }, new() { Text = ""Edit"" }, new() { Text = ""Delete"" }
 ];";
 
-    private readonly string example11RazorCode = @"
+    private readonly string example12RazorCode = @"
 <style>
     .custom-class {
         margin-inline: 1rem;
@@ -265,7 +275,7 @@ protected override void OnInitialized()
 <BitButtonGroup Items=""basicItems""
                 Variant=""BitVariant.Text""
                 Classes=""@(new() { Button = ""custom-btn"" })"" />";
-    private readonly string example11CsharpCode = @"
+    private readonly string example12CsharpCode = @"
 private List<BitButtonGroupItem> basicItems =
 [
     new() { Text = ""Add"" }, new() { Text = ""Edit"" }, new() { Text = ""Delete"" }
@@ -287,11 +297,11 @@ protected override void OnInitialized()
     }
 ];";
 
-    private readonly string example12RazorCode = @"
+    private readonly string example13RazorCode = @"
 <BitButtonGroup Dir=""BitDir.Rtl"" Variant=""BitVariant.Fill"" Items=""rtlItems"" />
 <BitButtonGroup Dir=""BitDir.Rtl"" Variant=""BitVariant.Outline"" Items=""rtlItems"" />
 <BitButtonGroup Dir=""BitDir.Rtl"" Variant=""BitVariant.Text"" Items=""rtlItems"" />";
-    private readonly string example12CsharpCode = @"
+    private readonly string example13CsharpCode = @"
 private List<BitButtonGroupItem> rtlItems =
 [
     new() { Text = ""اضافه کردن"", IconName = BitIconName.Add },
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor
index 8580fa574f..df33bccf57 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor
@@ -316,7 +316,26 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Color" RazorCode="@example10RazorCode" Id="example10">
+<ComponentExampleBox Title="FullWidth" RazorCode="@example10RazorCode" Id="example10">
+    <ExamplePreview>
+        <div>Setting the FullWidth makes the button group occupy 100% of its container's width.</div>
+        <br /><br />
+        <div class="example-content">
+            <BitButtonGroup FullWidth Variant="BitVariant.Fill" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup FullWidth Variant="BitVariant.Outline" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+            <BitButtonGroup FullWidth Variant="BitVariant.Text" TItem="BitButtonGroupOption">
+                <BitButtonGroupOption Text="Add" /><BitButtonGroupOption Text="Edit" /><BitButtonGroupOption Text="Delete" />
+            </BitButtonGroup>
+        </div>
+    </ExamplePreview>
+</ComponentExampleBox>
+
+
+<ComponentExampleBox Title="Color" RazorCode="@example11RazorCode" Id="example11">
     <ExamplePreview>
         <div>Offering a range of specialized colors, providing visual cues for specific states within your application.</div>
         <br /><br />
@@ -545,7 +564,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="Style & Class" RazorCode="@example11RazorCode" Id="example11">
+<ComponentExampleBox Title="Style & Class" RazorCode="@example12RazorCode" Id="example12">
     <ExamplePreview>
         <div>Empower customization by overriding default styles and classes, allowing tailored design modifications to suit specific UI requirements.</div>
         <br /><br />
@@ -585,7 +604,7 @@
     </ExamplePreview>
 </ComponentExampleBox>
 
-<ComponentExampleBox Title="RTL" RazorCode="@example12RazorCode" Id="example12">
+<ComponentExampleBox Title="RTL" RazorCode="@example13RazorCode" Id="example13">
     <ExamplePreview>
         <div>Use BitButtonGroup in right-to-left (RTL).</div>
         <br />
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs
index 985c5f08f4..df2b7ad4b4 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/ButtonGroup/_BitButtonGroupOptionDemo.razor.samples.cs
@@ -199,6 +199,17 @@ public partial class _BitButtonGroupOptionDemo
 </BitButtonGroup>";
 
     private readonly string example10RazorCode = @"
+<BitButtonGroup FullWidth Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+<BitButtonGroup FullWidth Variant=""BitVariant.Outline"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>
+<BitButtonGroup FullWidth Variant=""BitVariant.Text"" TItem=""BitButtonGroupOption"">
+    <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
+</BitButtonGroup>";
+
+    private readonly string example11RazorCode = @"
 <BitButtonGroup Color=""BitColor.Primary"" Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
     <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
 </BitButtonGroup>
@@ -372,7 +383,7 @@ public partial class _BitButtonGroupOptionDemo
     <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
 </BitButtonGroup>";
 
-    private readonly string example11RazorCode = @"
+    private readonly string example12RazorCode = @"
 <style>
     .custom-class {
         margin-inline: 1rem;
@@ -430,7 +441,7 @@ public partial class _BitButtonGroupOptionDemo
     <BitButtonGroupOption Text=""Add"" /><BitButtonGroupOption Text=""Edit"" /><BitButtonGroupOption Text=""Delete"" />
 </BitButtonGroup>";
 
-    private readonly string example12RazorCode = @"
+    private readonly string example13RazorCode = @"
 <BitButtonGroup Dir=""BitDir.Rtl"" Variant=""BitVariant.Fill"" TItem=""BitButtonGroupOption"">
     <BitButtonGroupOption Text=""اضافه کردن"" IconName=""@BitIconName.Add"" />
     <BitButtonGroupOption Text=""ویرایش"" IconName=""@BitIconName.Edit"" />

From d665a5c9461fdf2d799edad699d3f9607a43b24b Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Mon, 30 Dec 2024 14:50:49 +0100
Subject: [PATCH 12/28] feat(infra): replace 2024 with 2025 #9561 (#9562)

---
 LICENSE                                                         | 2 +-
 src/Bit.Build.props                                             | 2 +-
 .../Client/Bit.BlazorUI.Demo.Client.Core/Shared/Footer.razor    | 2 +-
 .../BlazorEmpty/Bit.BlazorEmpty.ProjectTemplate.csproj          | 2 +-
 .../Bit.BlazorEmpty/BlazorEmpty/Components/Layout/Footer.razor  | 2 +-
 .../Boilerplate/Bit.Boilerplate.ProjectTemplate.csproj          | 2 +-
 .../src/Bit.Websites.Platform.Client/Shared/Footer.razor        | 2 +-
 .../Sales/src/Bit.Websites.Sales.Client/Shared/Footer.razor     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/LICENSE b/LICENSE
index 8ab0dda5ec..0ab084ff9e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 bit platform
+Copyright (c) 2025 bit platform
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Bit.Build.props b/src/Bit.Build.props
index 29ac825be1..5735276475 100644
--- a/src/Bit.Build.props
+++ b/src/Bit.Build.props
@@ -8,7 +8,7 @@
 		<Product>bit platform</Product>
 		<Title>$(MSBuildProjectName)</Title>
 		<Description>$(MSBuildProjectName)</Description>
-		<Copyright>Copyright © bit platform 2024</Copyright>
+		<Copyright>Copyright © bit platform 2025</Copyright>
 
 		<!-- Repo -->
 		<RepositoryUrl>https://github.com/bitfoundation/bitplatform</RepositoryUrl>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Footer.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Footer.razor
index 576a635ead..7aee1c3723 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Footer.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Footer.razor
@@ -40,7 +40,7 @@
                 <a class="social-link youtube-link" target="_blank" href="https://www.youtube.com/channel/UCtk33NQ91f3GOJG0HAdkdog"></a>
                 <a class="social-link linkedin-link" target="_blank" href="https://www.linkedin.com/company/bitplatformhq"></a>
             </div>
-            <div class="copy-right-txt">Copyright © 2024 bit platform | All Rights Reserved </div>
+            <div class="copy-right-txt">Copyright © 2025 bit platform | All Rights Reserved </div>
         </div>
     </section>
 </footer>
\ No newline at end of file
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty.ProjectTemplate.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty.ProjectTemplate.csproj
index 4866637f5e..f05af16a1b 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty.ProjectTemplate.csproj
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty.ProjectTemplate.csproj
@@ -15,7 +15,7 @@
         <Title>bit BlazorEmpty</Title>
         <PackageDescription>A template for creating an empty Blazor app using the bit platform products</PackageDescription>
         <PackageTags>Bit;c#;asp.net;core;template;web;blazor</PackageTags>
-        <PackageCopyright>Copyright © bit platform 2024</PackageCopyright>
+        <PackageCopyright>Copyright © bit platform 2025</PackageCopyright>
         <PackageIcon>bit-icon-512.png</PackageIcon>
         
     </PropertyGroup>
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Components/Layout/Footer.razor b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Components/Layout/Footer.razor
index 3ff1c52d52..50c6f90524 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Components/Layout/Footer.razor
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Components/Layout/Footer.razor
@@ -1,3 +1,3 @@
 <footer>
-    <BitLabel>Copyright © 2024 bit Blazor Empty</BitLabel>
+    <BitLabel>Copyright © 2025 bit Blazor Empty</BitLabel>
 </footer>
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate.ProjectTemplate.csproj b/src/Templates/Boilerplate/Bit.Boilerplate.ProjectTemplate.csproj
index 1a39db6a58..56ee7c01f7 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate.ProjectTemplate.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate.ProjectTemplate.csproj
@@ -15,7 +15,7 @@
         <Title>bit Boilerplate</Title>
         <PackageDescription>A template for creating a full featured app using the bit platform products</PackageDescription>
         <PackageTags>bit;c#;asp;template;web;blazor;ef;api;rest;maui;</PackageTags>
-        <PackageCopyright>Copyright © bit platform 2024</PackageCopyright>
+        <PackageCopyright>Copyright © bit platform 2025</PackageCopyright>
         <PackageIcon>bit-icon-512.png</PackageIcon>
         
     </PropertyGroup>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Footer.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Footer.razor
index 227175830b..b484dc916f 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Footer.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Footer.razor
@@ -50,7 +50,7 @@
                 <a class="social-link youtube-link" target="_blank" href="@Urls.YouTube"></a>
                 <a class="social-link linkedin-link" target="_blank" href="@Urls.Linkedin"></a>
             </div>
-            <div class="copyright-txt">Copyright © 2024 bit platform | All Rights Reserved </div>
+            <div class="copyright-txt">Copyright © 2025 bit platform | All Rights Reserved </div>
         </div>
     </section>
 </footer>
\ No newline at end of file
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/Footer.razor b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/Footer.razor
index 0f280acbbb..a088f686b7 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/Footer.razor
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/Footer.razor
@@ -25,5 +25,5 @@
             </div>
         </div>
     </div>
-    <div class="copyright">Copyright © 2001 - 2024 bit Inc. All Rights Reserved</div>
+    <div class="copyright">Copyright © 2001 - 2025 bit Inc. All Rights Reserved</div>
 </footer>
\ No newline at end of file

From 50633daa23173517684057f2decaa153a3c95b7a Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Mon, 30 Dec 2024 20:12:43 +0330
Subject: [PATCH 13/28] feat(blazorui): add BitNavPanel extra component #9163
 (#9518)

---
 .../BitAppShell.razor}                        |  12 +-
 .../BitAppShell.razor.cs}                     |  22 +-
 .../BitAppShell.scss}                         |  14 +-
 .../BitAppShellClassStyles.cs}                |  16 +-
 .../BitCascadingValue.cs                      |   0
 .../BitCascadingValueProvider.cs              |   2 +-
 .../JsInterop/BitChartJavascriptHandler.cs    |   2 +-
 .../Chart/Util/ExpandoObjectExtensions.cs     |   8 +-
 .../Components/DataGrid/BitDataGrid.scss      |   2 +-
 .../Columns/BitDataGridPropertyColumn.cs      |   2 +-
 .../Components/NavPanel/BitNavPanel.razor     | 118 ++++++
 .../Components/NavPanel/BitNavPanel.razor.cs  | 255 ++++++++++++
 .../Components/NavPanel/BitNavPanel.scss      | 115 +++++
 .../NavPanel/BitNavPanelClassStyles.cs        |  54 +++
 .../IServiceCollectionExtensions.cs           |   2 +
 .../JsInterop/BitExtrasJsRuntimeExtensions.cs |  19 +
 .../Extensions/LinqExtensions.cs              |  49 +++
 .../Bit.BlazorUI.Extras/Scripts/BitExtras.ts  |  20 +
 .../Services/BitExtraServices.cs              |  34 ++
 .../Styles/components.scss                    |   5 +-
 .../fabric.mdl2.bit.blazoui.extras.scss       |  12 +
 .../FabMDL2.4.66.bit.BlazorUI.Extras.woff2    | Bin 1696 -> 1740 bytes
 .../BitMenuButton/BitMenuButton.razor.cs      |   4 +-
 .../Inputs/Calendar/BitCalendar.razor.cs      |   4 +-
 .../Inputs/Checkbox/BitCheckbox.razor.cs      |   4 +-
 .../ChoiceGroup/BitChoiceGroup.razor.cs       |   4 +-
 .../Inputs/Dropdown/BitDropdown.razor.cs      |  10 +-
 .../NumberField/BitNumberField.razor.cs       |   4 +-
 .../Inputs/SearchBox/BitSearchBox.razor.cs    |  19 +-
 .../Inputs/Slider/BitSlider.razor.cs          |   2 +-
 .../Inputs/SpinButton/BitSpinButton.razor.cs  |   2 +-
 .../BitCircularTimePicker.razor.cs            |  10 +-
 .../ColorPicker/BitColorPicker.razor.cs       |   4 +-
 .../DatePicker/BitDatePicker.razor.cs         |  14 +-
 .../BitDateRangePicker.razor.cs               |  14 +-
 .../TimePicker/BitTimePicker.razor.cs         |  12 +-
 .../Components/Layouts/Layout/BitLayout.razor |  40 +-
 .../Layouts/Layout/BitLayout.razor.cs         |  43 +-
 .../Components/Layouts/Layout/BitLayout.scss  |  33 +-
 .../Layouts/Layout/BitLayoutClassStyles.cs    |   2 +-
 .../Lists/Carousel/BitCarousel.razor.cs       |   8 +-
 .../Lists/Swiper/BitSwiper.razor.cs           |  12 +-
 .../Navs/Breadcrumb/BitBreadcrumb.razor.cs    |   4 +-
 .../Navs/DropMenu/BitDropMenu.razor.cs        |   8 +-
 .../Components/Navs/Nav/BitNav.razor.cs       |  24 +-
 .../Surfaces/Callout/BitCallout.razor.cs      |   4 +-
 .../Surfaces/Dialog/BitDialog.razor.cs        |   4 +-
 .../Surfaces/Modal/BitModal.razor.cs          |   2 +-
 .../Surfaces/Panel/BitPanel.razor.cs          |   6 +-
 .../Utilities/Link/BitLink.razor.cs           |   2 +-
 .../Utilities/SwipeTrap/BitSwipeTrap.razor.cs |   2 +-
 .../JsInterop/CalloutsJsRuntimeExtensions.cs  |   4 +-
 .../JsInterop/SwipesJsRuntimeExtensions.cs    |   4 +-
 .../JsInterop/UtilsJsRuntimeExtensions.cs     |  16 +-
 .../Extensions/StringExtensions.cs            |   3 +-
 .../Bit.BlazorUI/Styles/media-queries.scss    |   2 +
 .../Components/App.razor                      |  11 +-
 .../Extensions/IJSRuntimeExtensions.cs        |   5 -
 .../IServiceCollectionExtensions.cs           |   1 -
 .../Buttons/BitActionButtonDemo.razor         |  25 +-
 .../Buttons/BitActionButtonDemo.razor.cs      |  23 +
 .../BitAppShellDemo.razor}                    |  17 +-
 .../BitAppShellDemo.razor.cs}                 |  24 +-
 .../BitAppShellDemo.razor.scss}               |   0
 .../Extras/NavPanel/BitNavPanelDemo.razor     |  31 ++
 .../Extras/NavPanel/BitNavPanelDemo.razor.cs  | 394 ++++++++++++++++++
 .../NavPanel/BitNavPanelDemo.razor.scss       |   0
 .../Layouts/Layout/BitLayoutDemo.razor        |  43 +-
 .../Layouts/Layout/BitLayoutDemo.razor.cs     |  96 ++---
 .../Pages/Home/ComponentsSection.razor        |   9 +-
 .../Pages/Home/HeroSection.razor.scss         |   2 -
 .../Pages/Home/HomePage.razor.scss            |   1 +
 .../Pages/Home/PopularComponents.razor.scss   |  16 +-
 .../Routes.razor                              |  32 +-
 .../Routes.razor.cs                           |  44 +-
 .../Scripts/app.ts                            |  19 -
 .../Services/NavManuService.cs                |  11 -
 .../Shared/AppErrorBoundary.razor             |  45 +-
 .../Shared/AppErrorBoundary.razor.cs          |   7 +-
 .../Shared/AppErrorBoundary.razor.scss        |  34 +-
 .../Shared/{Footer.razor => AppFooter.razor}  |   6 +-
 .../Shared/AppFooter.razor.cs                 |  14 +
 ...Footer.razor.scss => AppFooter.razor.scss} |   3 +-
 .../Shared/{Header.razor => AppHeader.razor}  |  16 +-
 .../Shared/AppHeader.razor.cs                 |  32 ++
 ...Header.razor.scss => AppHeader.razor.scss} |  34 +-
 .../Shared/Header.razor.cs                    |  57 ---
 .../Shared/MainLayout.razor                   |  44 +-
 ....razor.cs => MainLayout.razor.NavItems.cs} |  99 +----
 .../Shared/MainLayout.razor.cs                |  19 +-
 .../Shared/MainLayout.razor.scss              | 217 ++++------
 .../Shared/NavMenu.razor                      |  32 --
 .../Shared/NavMenu.razor.scss                 |  82 ----
 .../Styles/abstracts/_media-queries.scss      |   4 +-
 .../Styles/abstracts/_vars.scss               |   3 -
 .../Styles/app.scss                           |   4 -
 .../compilerconfig.json                       |  28 +-
 .../wwwroot/index.html                        |   2 +-
 98 files changed, 1702 insertions(+), 977 deletions(-)
 rename src/BlazorUI/Bit.BlazorUI.Extras/Components/{ProLayout/BitProLayout.razor => AppShell/BitAppShell.razor} (56%)
 rename src/BlazorUI/Bit.BlazorUI.Extras/Components/{ProLayout/BitProLayout.razor.cs => AppShell/BitAppShell.razor.cs} (63%)
 rename src/BlazorUI/Bit.BlazorUI.Extras/Components/{ProLayout/BitProLayout.scss => AppShell/BitAppShell.scss} (89%)
 rename src/BlazorUI/Bit.BlazorUI.Extras/Components/{ProLayout/BitProLayoutClassStyles.cs => AppShell/BitAppShellClassStyles.cs} (62%)
 rename src/BlazorUI/Bit.BlazorUI.Extras/Components/{ProLayout => AppShell}/BitCascadingValue.cs (100%)
 rename src/BlazorUI/Bit.BlazorUI.Extras/Components/{ProLayout => AppShell}/BitCascadingValueProvider.cs (97%)
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor.cs
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.scss
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanelClassStyles.cs
 rename src/BlazorUI/Bit.BlazorUI.Extras/{ => Extensions}/IServiceCollectionExtensions.cs (89%)
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Extensions/JsInterop/BitExtrasJsRuntimeExtensions.cs
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Extensions/LinqExtensions.cs
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Scripts/BitExtras.ts
 create mode 100644 src/BlazorUI/Bit.BlazorUI.Extras/Services/BitExtraServices.cs
 rename src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/{ProLayout/BitProLayoutDemo.razor => AppShell/BitAppShellDemo.razor} (60%)
 rename src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/{ProLayout/BitProLayoutDemo.razor.cs => AppShell/BitAppShellDemo.razor.cs} (89%)
 rename src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/{ProLayout/BitProLayoutDemo.razor.scss => AppShell/BitAppShellDemo.razor.scss} (100%)
 create mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor
 create mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.cs
 create mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.scss
 delete mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Services/NavManuService.cs
 rename src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/{Footer.razor => AppFooter.razor} (94%)
 create mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppFooter.razor.cs
 rename src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/{Footer.razor.scss => AppFooter.razor.scss} (98%)
 rename src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/{Header.razor => AppHeader.razor} (70%)
 create mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppHeader.razor.cs
 rename src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/{Header.razor.scss => AppHeader.razor.scss} (83%)
 delete mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Header.razor.cs
 rename src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/{NavMenu.razor.cs => MainLayout.razor.NavItems.cs} (76%)
 delete mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor
 delete mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.scss
 delete mode 100644 src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/abstracts/_vars.scss

diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor b/src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShell.razor
similarity index 56%
rename from src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor
rename to src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShell.razor
index 0b25c15ac0..9ddbeb6157 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShell.razor
@@ -7,17 +7,17 @@
      style="@StyleBuilder.Value"
      class="@ClassBuilder.Value"
      dir="@Dir?.ToString().ToLower()">
-    <div style="@Styles?.Top" class="bit-ply-top @Classes?.Top" />
+    <div style="@Styles?.Top" class="bit-ash-top @Classes?.Top" />
     <div style="@Styles?.Center"
-         class="bit-ply-center @Classes?.Center"
+         class="bit-ash-center @Classes?.Center"
          dir="@Dir?.ToString().ToLower()">
-        <div style="@Styles?.Left" class="bit-ply-left @Classes?.Left"></div>
-        <div style="@Styles?.Main" class="bit-ply-main @Classes?.Main">
+        <div style="@Styles?.Left" class="bit-ash-left @Classes?.Left"></div>
+        <div @ref="_containerRef" style="@Styles?.Main" class="bit-ash-main @Classes?.Main">
             <BitCascadingValueProvider Values="CascadingValues">
                 @ChildContent
             </BitCascadingValueProvider>
         </div>
-        <div style="@Styles?.Right" class="bit-ply-right @Classes?.Right"></div>
+        <div style="@Styles?.Right" class="bit-ash-right @Classes?.Right"></div>
     </div>
-    <div style="@Styles?.Bottom" class="bit-ply-bottom @Classes?.Bottom"></div>
+    <div style="@Styles?.Bottom" class="bit-ash-bottom @Classes?.Bottom"></div>
 </div>
\ No newline at end of file
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShell.razor.cs
similarity index 63%
rename from src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor.cs
rename to src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShell.razor.cs
index af75a24d4a..2b65b7e6cb 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShell.razor.cs
@@ -1,7 +1,14 @@
 namespace Bit.BlazorUI;
 
-public partial class BitProLayout : BitComponentBase
+public partial class BitAppShell : BitComponentBase
 {
+    private ElementReference _containerRef = default!;
+
+
+    [Inject] private IJSRuntime _js { get; set; } = default!;
+
+
+
     /// <summary>
     /// The cascading values to be provided for the children of the layout.
     /// </summary>
@@ -15,16 +22,23 @@ public partial class BitProLayout : BitComponentBase
     /// <summary>
     /// Custom CSS classes for different parts of the layout.
     /// </summary>
-    [Parameter] public BitProLayoutClassStyles? Classes { get; set; }
+    [Parameter] public BitAppShellClassStyles? Classes { get; set; }
 
     /// <summary>
     /// Custom CSS styles for different parts of the layout.
     /// </summary>
-    [Parameter] public BitProLayoutClassStyles? Styles { get; set; }
+    [Parameter] public BitAppShellClassStyles? Styles { get; set; }
+
+
+
+    public async Task GoToTop()
+    {
+        await _js.BitExtrasGoToTop(_containerRef);
+    }
 
 
 
-    protected override string RootElementClass => "bit-ply";
+    protected override string RootElementClass => "bit-ash";
 
     protected override void RegisterCssClasses()
     {
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShell.scss
similarity index 89%
rename from src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.scss
rename to src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShell.scss
index 81b2fa70d4..f9aa459c37 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayout.scss
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShell.scss
@@ -1,7 +1,7 @@
 @import '../../Styles/extra-variables.scss';
 @import '../../../Bit.BlazorUI/Styles/functions.scss';
 
-.bit-ply {
+.bit-ash {
     width: 100%;
     height: 100%;
     display: flex;
@@ -9,27 +9,27 @@
     background-color: $clr-bg-pri;
 }
 
-.bit-ply-top {
+.bit-ash-top {
     width: 100%;
     z-index: 999999;
     height: $bit-env-inset-top;
     background-color: $clr-bg-pri;
 }
 
-.bit-ply-bottom {
+.bit-ash-bottom {
     width: 100%;
     z-index: 999999;
     height: $bit-env-inset-bottom;
     background-color: $clr-bg-pri;
 }
 
-.bit-ply-center {
+.bit-ash-center {
     width: 100%;
     display: flex;
     height: calc(100% - $bit-env-inset-top - $bit-env-inset-bottom);
 }
 
-.bit-ply-main {
+.bit-ash-main {
     height: 100%;
     display: flex;
     overflow: auto;
@@ -39,14 +39,14 @@
     width: calc(100% - $bit-env-inset-left - $bit-env-inset-right);
 }
 
-.bit-ply-left {
+.bit-ash-left {
     height: 100%;
     z-index: 999999;
     width: $bit-env-inset-left;
     background-color: $clr-bg-pri;
 }
 
-.bit-ply-right {
+.bit-ash-right {
     height: 100%;
     z-index: 999999;
     width: $bit-env-inset-right;
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayoutClassStyles.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShellClassStyles.cs
similarity index 62%
rename from src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayoutClassStyles.cs
rename to src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShellClassStyles.cs
index 6793afc5ca..703b86ce31 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitProLayoutClassStyles.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitAppShellClassStyles.cs
@@ -1,39 +1,39 @@
 namespace Bit.BlazorUI;
 
-public class BitProLayoutClassStyles
+public class BitAppShellClassStyles
 {
     /// <summary>
-    /// Custom CSS classes/styles for the root of the BitProLayout.
+    /// Custom CSS classes/styles for the root of the BitAppShell.
     /// </summary>
     public string? Root { get; set; }
 
     /// <summary>
-    /// Custom CSS classes/styles for the top area of the BitProLayout.
+    /// Custom CSS classes/styles for the top area of the BitAppShell.
     /// </summary>
     public string? Top { get; set; }
 
     /// <summary>
-    /// Custom CSS classes/styles for the center area of the BitProLayout.
+    /// Custom CSS classes/styles for the center area of the BitAppShell.
     /// </summary>
     public string? Center { get; set; }
 
     /// <summary>
-    /// Custom CSS classes/styles for the left area of the BitProLayout.
+    /// Custom CSS classes/styles for the left area of the BitAppShell.
     /// </summary>
     public string? Left { get; set; }
 
     /// <summary>
-    /// Custom CSS classes/styles for the main area of the BitProLayout.
+    /// Custom CSS classes/styles for the main area of the BitAppShell.
     /// </summary>
     public string? Main { get; set; }
 
     /// <summary>
-    /// Custom CSS classes/styles for the right area of the BitProLayout.
+    /// Custom CSS classes/styles for the right area of the BitAppShell.
     /// </summary>
     public string? Right { get; set; }
 
     /// <summary>
-    /// Custom CSS classes/styles for the bottom area of the BitProLayout.
+    /// Custom CSS classes/styles for the bottom area of the BitAppShell.
     /// </summary>
     public string? Bottom { get; set; }
 }
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValue.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitCascadingValue.cs
similarity index 100%
rename from src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValue.cs
rename to src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitCascadingValue.cs
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValueProvider.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitCascadingValueProvider.cs
similarity index 97%
rename from src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValueProvider.cs
rename to src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitCascadingValueProvider.cs
index 4dc929cf99..dde4e2a9b8 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/ProLayout/BitCascadingValueProvider.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/AppShell/BitCascadingValueProvider.cs
@@ -57,7 +57,7 @@ private void CreateCascadingValue(RenderTreeBuilder builder,
 #pragma warning disable IL2055 // Either the type on which the MakeGenericType is called can't be statically determined, or the type parameters to be used for generic arguments can't be statically determined.
         builder.OpenComponent(seq, _cascadingValueType.MakeGenericType(value.GetType()));
 #pragma warning restore IL2055 // Either the type on which the MakeGenericType is called can't be statically determined, or the type parameters to be used for generic arguments can't be statically determined.
-        if (string.IsNullOrEmpty(name) is false)
+        if (name.HasValue())
         {
             builder.AddComponentParameter(++seq, "Name", name);
         }
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/JsInterop/BitChartJavascriptHandler.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/JsInterop/BitChartJavascriptHandler.cs
index 7436279d0c..9a9dcdd886 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/JsInterop/BitChartJavascriptHandler.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/JsInterop/BitChartJavascriptHandler.cs
@@ -25,7 +25,7 @@ public class BitChartJavascriptHandler<T> : IBitChartMethodHandler<T>
     /// <param name="methodName">The namespace and name of a JavaScript function (see <see cref="MethodName"/> for details).</param>
     public BitChartJavascriptHandler(string methodName)
     {
-        if (string.IsNullOrWhiteSpace(methodName))
+        if (methodName.HasNoValue())
             throw new ArgumentException("The method name cannot be null or whitespace. It has to include the namespace and name of the js-function.");
 
         if (methodName.Length < 3 || methodName.Count(c => c == '.') > 1)
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Util/ExpandoObjectExtensions.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Util/ExpandoObjectExtensions.cs
index 4dff5d151b..e10abf7b69 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Util/ExpandoObjectExtensions.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Util/ExpandoObjectExtensions.cs
@@ -21,7 +21,7 @@ public static ExpandoObject EnsurePathExists(this ExpandoObject value, string pa
     {
         value ??= new ExpandoObject();
 
-        if (string.IsNullOrWhiteSpace(path)) return value;
+        if (path.HasNoValue()) return value;
 
         string[] segments = path.Split('.');
         IDictionary<string, object> source = value;
@@ -80,10 +80,10 @@ public static bool PathExists(this ExpandoObject value, string path, out object[
     /// <returns></returns>
     public static IEnumerable<object> EnumeratePath(this ExpandoObject value, string path)
     {
-        if (value == null)
+        if (value is null)
             throw new ArgumentNullException(nameof(value));
 
-        if (string.IsNullOrWhiteSpace(path))
+        if (path.HasNoValue())
             throw new ArgumentException("The path cannot be null or whitespace.");
 
         string[] segments = path.Split('.');
@@ -131,7 +131,7 @@ public static object GetValue(this ExpandoObject value, string path)
     /// <returns></returns>
     public static ExpandoObject SetValue(this ExpandoObject expando, string path, object value)
     {
-        if (string.IsNullOrWhiteSpace(path))
+        if (path.HasNoValue())
             throw new ArgumentException("The path cannot be null or whitespace.");
 
         string[] segments = path.Split('.');
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/BitDataGrid.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/BitDataGrid.scss
index e3cf74ab70..e2551fddd2 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/BitDataGrid.scss
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/BitDataGrid.scss
@@ -41,7 +41,7 @@
     }
 
     .col-sort-desc .sort-indicator {
-        transform: scaleY(-1) translateY(2px);
+        transform: scaleY(-1) translateY(-2px);
     }
     /* Deep to make it easy for people adding a col-options-button element in a custom HeaderTemplate */
     th .col-options-button {
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/Columns/BitDataGridPropertyColumn.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/Columns/BitDataGridPropertyColumn.cs
index 1a2886e7f4..3fe85ed0bc 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/Columns/BitDataGridPropertyColumn.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/Columns/BitDataGridPropertyColumn.cs
@@ -37,7 +37,7 @@ protected override void OnParametersSet()
             _lastAssignedProperty = Property;
             var compiledPropertyExpression = Property.Compile();
 
-            if (!string.IsNullOrEmpty(Format))
+            if (Format.HasValue())
             {
                 if (typeof(IFormattable).IsAssignableFrom(typeof(TProp)))
                 {
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor
new file mode 100644
index 0000000000..669093d062
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor
@@ -0,0 +1,118 @@
+@namespace Bit.BlazorUI
+@inherits BitComponentBase
+@typeparam TItem
+
+@if (IsOpen)
+{
+    <div style="@Styles?.Overlay" class="bit-npn-ovl @Classes?.Overlay" @onclick="ClosePanel"></div>
+}
+
+@{
+    var isToggled = Togglable && IsToggled;
+}
+
+<div @ref="RootElement" @attributes="HtmlAttributes"
+     id="@_Id"
+     style="@GetPanelStyle()"
+     class="@ClassBuilder.Value @($"{(isToggled ? "bit-npn-tgl" : "")}")"
+     dir="@Dir?.ToString().ToLower()">
+    <BitSwipeTrap Style="width:100%; height:100%"
+                  Threshold="5"
+                  Throttle="10"
+                  OnMove="HandleOnSwipeMove"
+                  OnEnd="HandleOnSwipeEnd"
+                  OnTrigger="HandleOnSwipeTrigger">
+        <div style="@Styles?.Container" class="bit-npn-cnt @Classes?.Container">
+            @if (Header is not null)
+            {
+                @Header
+            }
+            else
+            {
+                <div style="@Styles?.Header" class="bit-npn-hdr @Classes?.Header">
+                    @if (IconUrl.HasValue())
+                    {
+                        <img src="@IconUrl"
+                             class="bit-npn-img @Classes?.HeaderIcon"
+                             style="@(isToggled ? "display:none;" : "") @Styles?.HeaderIcon" />
+                    }
+
+                    <div class="bit-npn-spc" style="@(isToggled ? "display:none;" : "")" />
+
+                    @if (Togglable)
+                    {
+                        <BitButton IconOnly FixedColor
+                                   Size="BitSize.Large"
+                                   OnClick="ToggleNavPanel"
+                                   Variant="BitVariant.Text"
+                                   Style="@Styles?.ToggleButton"
+                                   Class="@Classes?.ToggleButton"
+                                   IconName="ColumnRightTwoThirds"
+                                   Color="BitColor.TertiaryBackground"
+                                   Classes="@(new() { Icon = "bit-icon-ex bit-icon-ex--ColumnRightTwoThirds" })" />
+                    }
+                </div>
+            }
+
+            <BitSearchBox @ref="_searchBoxRef"
+                          Underlined
+                          OnChange="SearchNavItems"
+                          Immediate DebounceTime="500"
+                          Placeholder="@SearchBoxPlaceholder"
+                          Styles="SearchBoxStyles"
+                          Classes="SearchBoxClasses"
+                          Class="@Classes?.SearchBox"
+                          Style="@($"{(isToggled ? "display:none;" : "")}{Styles?.SearchBox}".Trim())" />
+
+            @if (isToggled)
+            {
+                <BitButton IconOnly FixedColor
+                           IconName="Search"
+                           Size="BitSize.Large"
+                           OnClick="ToggleForSearch"
+                           Variant="BitVariant.Text"
+                           Style="@Styles?.ToggleSearchButton"
+                           Class="@Classes?.ToggleSearchButton"
+                           Color="BitColor.TertiaryBackground" />
+            }
+
+            @if (_filteredNavItems.Any() is false)
+            {
+                if (isToggled is false)
+                {
+                    if (EmptyListTemplate is not null)
+                    {
+                        @EmptyListTemplate
+                    }
+                    else
+                    {
+                        <BitText Style="@Styles?.EmptyListMessage" Class="@Classes?.EmptyListMessage">
+                            @(EmptyListMessage ?? "Nothing found!")
+                        </BitText>
+                    }
+                }
+            }
+            else
+            {
+                <BitNav @ref=_bitNavRef
+                        FullWidth
+                        Styles="NavStyles"
+                        Classes="NavClasses"
+                        IconOnly="isToggled"
+                        Style="@Styles?.Nav"
+                        Class="@Classes?.Nav"
+                        Items="_filteredNavItems"
+                        DefaultSelectedItem="_filteredNavItems[0]"
+                        Accent="Padded ? BitColor.SecondaryBackground : null"
+                        OnItemClick="(TItem item) => HandleNavItemClick(item)" />
+            }
+
+            <BitSpacer />
+
+            @if (Footer is not null)
+            {
+                @Footer
+            }
+        </div>
+    </BitSwipeTrap>
+</div>
\ No newline at end of file
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor.cs
new file mode 100644
index 0000000000..9b3fb46972
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor.cs
@@ -0,0 +1,255 @@
+namespace Bit.BlazorUI;
+
+public partial class BitNavPanel<TItem> : BitComponentBase, IDisposable where TItem : class
+{
+    private bool _disposed;
+    private decimal diffXPanel;
+    private BitNav<TItem> _bitNavRef = default!;
+    private IList<TItem> _filteredNavItems = [];
+    private BitSearchBox _searchBoxRef = default!;
+    private IEnumerable<TItem> _flatNavItemList = [];
+
+
+    [Inject] private IJSRuntime _js { get; set; } = default!;
+
+
+
+    /// <summary>
+    /// Custom CSS classes for different parts of the nav panel.
+    /// </summary>
+    [Parameter] public BitNavPanelClassStyles? Classes { get; set; }
+
+    /// <summary>
+    /// The custom template for when the search result is empty.
+    /// </summary>
+    [Parameter] public RenderFragment? EmptyListTemplate { get; set; }
+
+    /// <summary>
+    /// The custom message for when the search result is empty.
+    /// </summary>
+    [Parameter] public string? EmptyListMessage { get; set; }
+
+    /// <summary>
+    /// The custom template to render as the footer of the nav panel.
+    /// </summary>
+    [Parameter] public RenderFragment? Footer { get; set; }
+
+    /// <summary>
+    /// The custom template to render as the header of the nav panel.
+    /// </summary>
+    [Parameter] public RenderFragment? Header { get; set; }
+
+    /// <summary>
+    /// The icon url to show in the header of the nav panel.
+    /// </summary>
+    [Parameter] public string? IconUrl { get; set; }
+
+    /// <summary>
+    /// Determines if the nav panel is open in small screens.
+    /// </summary>
+    [Parameter, TwoWayBound, ResetClassBuilder]
+    public bool IsOpen { get; set; }
+
+    /// <summary>
+    /// Determines if the nav panel is in the toggled state.
+    /// </summary>
+    [Parameter, TwoWayBound]
+    public bool IsToggled { get; set; }
+
+    /// <summary>
+    /// A collection of items to display in the nav panel.
+    /// </summary>
+    [Parameter] public IList<TItem> Items { get; set; } = [];
+
+    /// <summary>
+    /// Custom CSS classes for different parts of the nav component of the nav panel.
+    /// </summary>
+    [Parameter] public BitNavClassStyles? NavClasses { get; set; }
+
+    /// <summary>
+    /// Custom CSS styles for different parts of the nav component of the nav panel.
+    /// </summary>
+    [Parameter] public BitNavClassStyles? NavStyles { get; set; }
+
+    /// <summary>
+    /// Event fired up when an item is clicked.
+    /// </summary>
+    [Parameter] public EventCallback<TItem> OnItemClick { get; set; }
+
+    /// <summary>
+    /// Enables the padded mode of the nav panel.
+    /// </summary>
+    [Parameter, ResetClassBuilder]
+    public bool Padded { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes for different parts of the search box of the nav panel.
+    /// </summary>
+    [Parameter] public BitSearchBoxClassStyles? SearchBoxClasses { get; set; }
+
+    /// <summary>
+    /// The placeholder of the input element of the search box of the nav panel.
+    /// </summary>
+    [Parameter] public string? SearchBoxPlaceholder { get; set; }
+
+    /// <summary>
+    /// Custom CSS styles for different parts of the search box of the nav panel.
+    /// </summary>
+    [Parameter] public BitSearchBoxClassStyles? SearchBoxStyles { get; set; }
+
+    /// <summary>
+    /// Custom CSS styles for different parts of the nav panel.
+    /// </summary>
+    [Parameter] public BitNavPanelClassStyles? Styles { get; set; }
+
+    /// <summary>
+    /// Enables the toggle feature of the nav panel.
+    /// </summary>
+    [Parameter] public bool Togglable { get; set; }
+
+    /// <summary>
+    /// The top CSS property value of the root element of the nav panel in px.
+    /// </summary>
+    [Parameter, ResetStyleBuilder]
+    public int Top { get; set; }
+
+
+
+    protected override string RootElementClass => "bit-npn";
+
+    protected override void RegisterCssClasses()
+    {
+        ClassBuilder.Register(() => Classes?.Root);
+        ClassBuilder.Register(() => IsOpen ? string.Empty : "bit-npn-cls");
+        ClassBuilder.Register(() => Padded ? "bit-npn-pad" : string.Empty);
+    }
+
+    protected override void RegisterCssStyles()
+    {
+        StyleBuilder.Register(() => Styles?.Root);
+        StyleBuilder.Register(() => Top > 0 ? $"top:{Top}px;height:calc(var(--bit-env-height-avl) - {Top}px)" : string.Empty);
+    }
+
+    protected override async Task OnInitializedAsync()
+    {
+        SearchNavItems(null);
+    }
+
+    private async Task HandleNavItemClick(TItem item)
+    {
+        if (_bitNavRef.GetUrl(item).HasNoValue()) return;
+
+        await OnItemClick.InvokeAsync(item);
+
+        await _searchBoxRef.Clear();
+
+        _filteredNavItems = Items;
+
+        await ClosePanel();
+    }
+
+    private async Task ClosePanel()
+    {
+        if (await AssignIsOpen(false)) return;
+    }
+
+    private async Task ToggleNavPanel()
+    {
+        if (await AssignIsToggled(!IsToggled)) return;
+
+        if (IsToggled)
+        {
+            SearchNavItems(null);
+        }
+    }
+
+    private async Task ToggleForSearch()
+    {
+        if (await AssignIsToggled(false)) return;
+
+        await Task.Delay(1);
+        await _searchBoxRef.FocusAsync();
+    }
+
+    private void SearchNavItems(string? searchText)
+    {
+        _filteredNavItems = Items;
+        if (searchText.HasNoValue()) return;
+
+        _flatNavItemList = Items.Flatten(_bitNavRef.GetChildItems).Where(item => _bitNavRef.GetUrl(item).HasValue());
+
+        var mainItems = _flatNavItemList.Where(item => searchText!.Split(' ')
+                                                                  .Where(t => t.HasValue())
+                                                                  .Any(t => $"{_bitNavRef.GetText(item)} {_bitNavRef.GetDescription(item)}"
+                                                                             .Contains(t, StringComparison.InvariantCultureIgnoreCase)));
+
+        var subItems = _flatNavItemList.Where(item => searchText!.Split(' ')
+                                                                 .Where(t => t.HasValue())
+                                                                 .Any(t => _bitNavRef.GetData(item)?.ToString()?
+                                                                                     .Contains(t, StringComparison.InvariantCultureIgnoreCase) ?? false));
+
+        _filteredNavItems = [.. mainItems, .. subItems];
+    }
+
+    private decimal _oldDiffY = 0;
+    private void HandleOnSwipeMove(BitSwipeTrapEventArgs args)
+    {
+        if (IsOpen is false) return;
+
+        if (Math.Abs(args.DiffX) > Math.Abs(args.DiffY))
+        {
+            diffXPanel = args.DiffX;
+            StateHasChanged();
+        }
+        else
+        {
+            var diff = args.DiffY - _oldDiffY;
+            _js.BitExtrasScrollBy(RootElement, 0, diff > 0 ? -10 : 10);
+            _oldDiffY = args.DiffY;
+        }
+
+    }
+    private void HandleOnSwipeEnd(BitSwipeTrapEventArgs args)
+    {
+        if (IsOpen is false) return;
+
+        diffXPanel = 0;
+        StateHasChanged();
+    }
+    private async Task HandleOnSwipeTrigger(BitSwipeTrapTriggerArgs args)
+    {
+        if (IsOpen is false) return;
+
+        if ((Dir != BitDir.Rtl && args.Direction == BitSwipeDirection.Left) ||
+            (Dir == BitDir.Rtl && args.Direction == BitSwipeDirection.Right))
+        {
+            diffXPanel = 0;
+            await ClosePanel();
+            StateHasChanged();
+        }
+    }
+
+    private string? GetPanelStyle()
+    {
+        if (IsOpen is false) return StyleBuilder.Value;
+
+        var translate = ((Dir != BitDir.Rtl && diffXPanel < 0) || (Dir == BitDir.Rtl && diffXPanel > 0))
+                            ? $"transform: translateX({diffXPanel}px)"
+                            : string.Empty;
+        return $"{translate};{StyleBuilder.Value}".Trim(';');
+    }
+
+
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (disposing is false || _disposed) return;
+
+        _disposed = true;
+    }
+}
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.scss
new file mode 100644
index 0000000000..b726fef594
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.scss
@@ -0,0 +1,115 @@
+@import "../../../Bit.BlazorUI/Styles/functions.scss";
+@import "../../../Bit.BlazorUI/Styles/media-queries.scss";
+
+.bit-npn {
+    top: 0;
+    position: sticky;
+    min-width: 14rem;
+    max-width: 14rem;
+    overflow: hidden auto;
+    background-color: $clr-bg-pri;
+    height: var(--bit-env-height-avl);
+
+    @include lt-md {
+        left: 0;
+        padding: 0;
+        opacity: 1;
+        position: fixed;
+        height: unset !important;
+        z-index: $zindex-callout;
+        bottom: var(--bit-env-inset-bottom);
+        top: var(--bit-env-inset-top) !important;
+        transition: transform 150ms ease-out, opacity 100ms ease-in;
+
+        &.bit-rtl {
+            right: 0;
+            left: unset;
+        }
+
+        &.bit-npn-cls {
+            opacity: 0;
+            transform: translateX(-100%);
+
+            &.bit-rtl {
+                transform: translateX(100%);
+            }
+        }
+    }
+
+    &.bit-npn-tgl {
+        min-width: 3rem;
+        max-width: 3rem;
+
+        .bit-npn-cnt {
+            align-items: center;
+        }
+
+        &.bit-npn-pad {
+            min-width: 6rem;
+            max-width: 6rem;
+        }
+    }
+
+    &.bit-npn-pad {
+        padding: 1rem;
+
+        .bit-npn-cnt {
+            padding: 0.5rem;
+            background-color: $clr-bg-sec;
+        }
+    }
+
+    &::-webkit-scrollbar {
+        width: 0;
+    }
+
+    .bit-srb, .bit-srb-cnt {
+        width: 100%;
+    }
+}
+
+.bit-macos .bit-npn {
+    height: -webkit-fill-available;
+
+    .bit-npn-cnt {
+        height: -webkit-fill-available;
+    }
+}
+
+.bit-npn-ovl {
+    inset: 0;
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    min-height: 100vh;
+    z-index: $zindex-overlay;
+    background-color: $clr-bg-overlay;
+
+    @include gt-sm {
+        display: none;
+    }
+}
+
+.bit-npn-cnt {
+    gap: 1rem;
+    width: auto;
+    display: flex;
+    min-height: 100%;
+    height: fit-content;
+    flex-direction: column;
+}
+
+.bit-npn-hdr {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.bit-npn-img {
+    max-width: 38px;
+    max-height: 38px;
+}
+
+.bit-npn-spc {
+    flex-grow: 1;
+}
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanelClassStyles.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanelClassStyles.cs
new file mode 100644
index 0000000000..581bb5d194
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanelClassStyles.cs
@@ -0,0 +1,54 @@
+namespace Bit.BlazorUI;
+
+public class BitNavPanelClassStyles
+{
+    /// <summary>
+    /// Custom CSS classes/styles for the overlay of the BitNavPanel.
+    /// </summary>
+    public string? Overlay { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the root element of the BitNavPanel.
+    /// </summary>
+    public string? Root { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the container of the BitNavPanel.
+    /// </summary>
+    public string? Container { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the header container of the BitNavPanel.
+    /// </summary>
+    public string? Header { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the header icon of the BitNavPanel.
+    /// </summary>
+    public string? HeaderIcon { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the toggle button of the BitNavPanel.
+    /// </summary>
+    public string? ToggleButton { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the search box of the BitNavPanel.
+    /// </summary>
+    public string? SearchBox { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the toggle search button of the BitNavPanel.
+    /// </summary>
+    public string? ToggleSearchButton { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the text element of the empty list message of the BitNavPanel.
+    /// </summary>
+    public string? EmptyListMessage { get; set; }
+
+    /// <summary>
+    /// Custom CSS classes/styles for the nav component of the BitNavPanel.
+    /// </summary>
+    public string? Nav { get; set; }
+}
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/IServiceCollectionExtensions.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/IServiceCollectionExtensions.cs
similarity index 89%
rename from src/BlazorUI/Bit.BlazorUI.Extras/IServiceCollectionExtensions.cs
rename to src/BlazorUI/Bit.BlazorUI.Extras/Extensions/IServiceCollectionExtensions.cs
index 0ae549d8eb..ffc6573935 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/IServiceCollectionExtensions.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/IServiceCollectionExtensions.cs
@@ -16,10 +16,12 @@ public static IServiceCollection AddBitBlazorUIExtrasServices(this IServiceColle
         if (trySingleton)
         {
             services.TryAddSingleton<BitModalService>();
+            services.TryAddSingleton<BitExtraServices>();
         }
         else
         {
             services.TryAddScoped<BitModalService>();
+            services.TryAddScoped<BitExtraServices>();
         }
 
         return services;
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/JsInterop/BitExtrasJsRuntimeExtensions.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/JsInterop/BitExtrasJsRuntimeExtensions.cs
new file mode 100644
index 0000000000..7a55e2fc1a
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/JsInterop/BitExtrasJsRuntimeExtensions.cs
@@ -0,0 +1,19 @@
+namespace Bit.BlazorUI;
+
+internal static class BitExtrasJsRuntimeExtensions
+{
+    internal static ValueTask BitExtrasApplyRootClasses(this IJSRuntime jsRuntime, List<string> cssClasses, Dictionary<string, string> cssVariables)
+    {
+        return jsRuntime.InvokeVoid("BitBlazorUI.BitExtras.applyRootClasses", cssClasses, cssVariables);
+    }
+
+    internal static ValueTask BitExtrasGoToTop(this IJSRuntime jsRuntime, ElementReference element)
+    {
+        return jsRuntime.InvokeVoid("BitBlazorUI.BitExtras.goToTop", element);
+    }
+
+    internal static ValueTask BitExtrasScrollBy(this IJSRuntime jsRuntime, ElementReference element, decimal x, decimal y)
+    {
+        return jsRuntime.InvokeVoid("BitBlazorUI.BitExtras.scrollBy", element, x, y);
+    }
+}
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/LinqExtensions.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/LinqExtensions.cs
new file mode 100644
index 0000000000..4c953a5a96
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/LinqExtensions.cs
@@ -0,0 +1,49 @@
+namespace Bit.BlazorUI;
+
+/// <summary>
+/// https://www.codeproject.com/tips/375967/flatten-a-hierarchical-collection-of-objects-with
+/// </summary>
+public static class LinqExtensions
+{
+    /// <summary>
+    ///   This method extends the LINQ methods to flatten a collection of 
+    ///   items that have a property of children of the same type.
+    /// </summary>
+    /// <typeparam name = "T">Item type.</typeparam>
+    /// <param name = "source">Source collection.</param>
+    /// <param name = "childPropertySelector">
+    ///   Child property selector delegate of each item. 
+    ///   IEnumerable'T' childPropertySelector(T itemBeingFlattened)
+    /// </param>
+    /// <returns>Returns a one level list of elements of type T.</returns>
+    public static IEnumerable<T> Flatten<T>(this IEnumerable<T> source,
+                                                 Func<T, IEnumerable<T>> childPropertySelector)
+    {
+        return source
+            .Flatten((itemBeingFlattened, objectsBeingFlattened) =>
+                     childPropertySelector(itemBeingFlattened));
+    }
+
+    /// <summary>
+    ///   This method extends the LINQ methods to flatten a collection of 
+    ///   items that have a property of children of the same type.
+    /// </summary>
+    /// <typeparam name = "T">Item type.</typeparam>
+    /// <param name = "source">Source collection.</param>
+    /// <param name = "childPropertySelector">
+    ///   Child property selector delegate of each item. 
+    ///   IEnumerable'T' childPropertySelector
+    ///   (T itemBeingFlattened, IEnumerable'T' objectsBeingFlattened)
+    /// </param>
+    /// <returns>Returns a one level list of elements of type T.</returns>
+    public static IEnumerable<T> Flatten<T>(this IEnumerable<T> source,
+                                                 Func<T, IEnumerable<T>, IEnumerable<T>> childPropertySelector)
+    {
+        return source
+            .Concat(source
+                        .Where(item => childPropertySelector(item, source) != null)
+                        .SelectMany(itemBeingFlattened =>
+                                    childPropertySelector(itemBeingFlattened, source)
+                                        .Flatten(childPropertySelector)));
+    }
+}
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Scripts/BitExtras.ts b/src/BlazorUI/Bit.BlazorUI.Extras/Scripts/BitExtras.ts
new file mode 100644
index 0000000000..b2463e681f
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Scripts/BitExtras.ts
@@ -0,0 +1,20 @@
+namespace BitBlazorUI {
+    export class BitExtras {
+        public static applyRootClasses(cssClasses: string[], cssVariables: any) {
+            cssClasses?.forEach(c => document.documentElement.classList.add(c));
+            Object.keys(cssVariables).forEach(key => document.documentElement.style.setProperty(key, cssVariables[key]));
+        }
+
+        public static goToTop(element: HTMLElement) {
+            if (!element) return;
+
+            element.scrollTo({ top: 0 });
+        }
+
+        public static scrollBy(element: HTMLElement, x: number, y: number) {
+            if (!element) return;
+
+            element.scrollBy(x, y);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Services/BitExtraServices.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Services/BitExtraServices.cs
new file mode 100644
index 0000000000..e0faef2997
--- /dev/null
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Services/BitExtraServices.cs
@@ -0,0 +1,34 @@
+namespace Bit.BlazorUI;
+
+public class BitExtraServices(IJSRuntime js)
+{
+    public async Task AddRootCssClasses()
+    {
+        var cssClasses = new List<string>();
+
+        if (OperatingSystem.IsBrowser())
+        {
+            cssClasses.Add("bit-browser");
+        }
+        else if (OperatingSystem.IsWindows())
+        {
+            cssClasses.Add("bit-windows");
+        }
+        else if (OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst())
+        {
+            cssClasses.Add("bit-macos");
+        }
+        else if (OperatingSystem.IsIOS() && OperatingSystem.IsMacCatalyst() is false)
+        {
+            cssClasses.Add("bit-ios");
+        }
+        else if (OperatingSystem.IsAndroid())
+        {
+            cssClasses.Add("bit-android");
+        }
+
+        var cssVariables = new Dictionary<string, string>();
+
+        await js.BitExtrasApplyRootClasses(cssClasses, cssVariables);
+    }
+}
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Styles/components.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/components.scss
index 7dcba98b06..026cf642cb 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Styles/components.scss
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/components.scss
@@ -1,5 +1,6 @@
-@import "../Components/DataGrid/BitDataGrid.scss";
+@import "../Components/AppShell/BitAppShell.scss";
+@import "../Components/DataGrid/BitDataGrid.scss";
 @import "../Components/DataGrid/Pagination/BitDataGridPaginator.scss";
+@import "../Components/NavPanel/BitNavPanel.scss";
 @import "../Components/PdfReader/BitPdfReader.scss";
 @import "../Components/ProPanel/BitProPanel.scss";
-@import "../Components/ProLayout/BitProLayout.scss";
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Styles/fabric.mdl2.bit.blazoui.extras.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/fabric.mdl2.bit.blazoui.extras.scss
index e372997a9a..736da0b952 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Styles/fabric.mdl2.bit.blazoui.extras.scss
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Styles/fabric.mdl2.bit.blazoui.extras.scss
@@ -5,3 +5,15 @@
     font-family: 'Fabric MDL2 bit BlazorUI Extras';
     src: url('../fonts/FabMDL2.4.66.bit.BlazorUI.Extras.woff2') format("woff2");
 }
+
+.bit-icon-ex {
+    font-style: normal;
+    font-weight: normal;
+    display: inline-block;
+    font-family: 'Fabric MDL2 bit BlazorUI Extras' !important;
+}
+
+.bit-icon-ex--ChevronLeftEnd6:before { content: "\F371"; }
+.bit-icon-ex--ChevronLeftSmall:before { content: "\E96F"; }
+.bit-icon-ex--More:before { content: "\E712"; }
+.bit-icon-ex--ColumnRightTwoThirds:before { content: "\F1D7"; }
\ No newline at end of file
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/wwwroot/fonts/FabMDL2.4.66.bit.BlazorUI.Extras.woff2 b/src/BlazorUI/Bit.BlazorUI.Extras/wwwroot/fonts/FabMDL2.4.66.bit.BlazorUI.Extras.woff2
index ff7084633725716df6f84de435e5092b75a83e44..d8cd1d72afcc5aceb577726ae97bb167dca8bc7a 100644
GIT binary patch
delta 1726
zcmV;v20{6t4a^M~cTYw#00961000Ke01yBG000sA000JXkr*U@S_mo$f>{v^3WETG
zO$!hJ0X7080~Q1z1(Y2JPz-@n8<`Lz5q5%d3I*_23AO>#Zs?yv(L`eDBowp2o=px0
z7T6+Rm~Q&L&|-K;@I2}LckX18%m<af#;aD=R~BGJRz$fj$%=SaYrBS672BJynyKy^
z5szfkYiS=3)mkNglJVD>y&=*wZBzHJ$InnuiJUS|<*lO<D~Uq#S;~WTYdHbJ%KmSS
zRoxTGKC%sa9cr4L;qNSbR6Uu8N+SA+TG9|L6qR(TT*&trTQ_P)f!qBP1_a<irH=rY
z|6TO~p6Knq2oMfL0}9aXr!>eqY_NCObs3W8?Qh*<l!`Tf+jgiZsTl&%0H^HO9e@Si
z#(tS<0AP&~01YwDj<Oh~`;O3qBz<?9MnEVAg?bzNezLzz4F-X|YO=)5ku~g_5o$T&
z0NjcwK;i%A2;Rr!(UU3o92Ug40&;}_v^fw64Kd$??V8(DNS8i_$eO-S2`;8+zzDGh
z4^m`+*eFVWGNdby#N+JZ<75@Y%S{PEWQ(?4ksXI&t4q3osXec%C;DnYbni0)qDLQ2
z0rXV`J;X2}W6cIvNtlj}$7*!UfAwk^Agi$0EH%lG`YJsd*Ww&vbOp?sj4j}Zs#Dvu
zW+S&clN=9UuOxaPDx~j<6_8wslb@9ML>}@`t}OX~6ygv8))HF~;|YG3zPcYo_<)SF
zG!}i0R#8RHRGP6UXYos*FhOAm4F-t<zy%-@2nR+2`vCwAfC9im&?v3rYnCScr{U<>
zu(FuB^P)l`%T}JfcntsOg)^bz+@<5PI&t}Y419;OIdgl=E9+TSHn*)-S?t_7Wl?$T
z+=x_v^l3XUVs7|;>{(BmU$pghZaUTJ6w%sG+aRZ_9y7)@G}W3G?jN<>_=~aj)N<(p
zI7!_$_}GwmHp0hIWZOPAt>_%jYAtj>;TtSu1#AEDtJeMMiJ>O|2%rysUpINx80>2H
zGhv3QS_8mf3gPzz0Rt2RObhN_+aB8wpbmq70bkAnAb?9VG$ac`o5tiMOCiOqI*jTD
zA(qRaaCre1u@Y^lP1}M^xXc2FXxRrYjg<$61ho#r@YG+3kQ<J1`ba!;6ARHHzzFa_
z$Y(n!BDoJ1`Ft?Ywvq=n$ua;OvSlH-Op{Y!@YDzhqlelL5!N!R=wV0F!_49k+0>zb
z7PWc12f#<HkO(D82D~AX*mm>CFfs7JE1eGbhE-}t`2`R~k_i%c?$CxHxf#Frb1~o&
zW_E4*cO0IAbFH9U!V2J{w?4QHyrL8_%C#y_T)@Y-A8x;ZI5{;ORvC3r;;sfbGDJrT
znR=N-l$zRM;4bgJ``lKD&3FC%`*O&CWT1pcT4dP$@24UNU<x2$5)_agN?JgafT@uk
zQw7TzMU3#mH|*aT8Ze?f*ZoQeSOMWoQ#_-(m*t8h9p$x;r^~sliJdbc=f3tc(PNp+
zw7#_0(~k1$ugI9W3{<6;7uDu6B{486<JN@vg0Eb_6bqBZHji>An)rFP_&NiB&9vdJ
zMzLpykpPPQJn)?ufpr9*10zKXm|_Tch5$MI6J*GB&wyzLnzO^vAOKOq_)!I=D1s5v
zr|A3)`z&KBT$r0X2jh-oqS_FP^QA?C#+3S)`gNye9GPD+Di|J482Ip#(nLuYj%>)7
zs)wFTZEjIh-Exfjh0Z9j0nJ~3;8EAL|7Gk7KzcdOKr$fZkul%i0R?Iq6|i4J72~>e
z^aJSvp#!Qd=7~EHy1|qz)kY_Sg!-)r#8meS1hRqM-&k~6IV9N-38n_E7@62cpklO9
zNsAA?;!bp@IQv*?FqZ+x5}`_TLqg4zo3^mu-V+IJ^Eki6Jb!MDzRzcWgEt0DVC^NJ
zK?-lko`FNymW$tEUv5vstpm79DYoP$OX`RyWtrgm)DQ3fjyHBskyP|KrCd{8_7wH#
zHK_x>ZFu|3d<Ce_DWJ@p2NesSugdq?#@*lkE2KwHOkv|?<}3Row2fJPO)v@%LK@(b
zd0{KxVLQ!ncV%Bwjqw+MV&j&gCcUoQ|F2Ke->L$DU}vUk7wZCo5+#;svE7-I_}znB
zx7(c_-GA@){?^+E`kkJ8{-D$^v8Ylxhq4ntLU$8;KD*!+N>7LNy1(=%x)kBfHV-c!
zDk35cubtjjM9TRmc2*Qo!Q|~Vvm!du9^z_>sd3*=?8$Xgy4=hi;lGeKSLT+vHn&}!
UV2ZhGZp=d(|B4e+=}Fex0PFuRasU7T

delta 1681
zcmV;C25$Mx4WJDecTYw#00961000J{01yBG000q~000I;kr*U@QV1#uf>{v^3W79(
z3=0kb0X7080~7=x1(Y2JMht;d8$=Kz5yHj+K#A7^{4;?k6PowIfSV|c_K9E*;T+RB
z5**@};CagXuXC#^NqsWEyYm|22aq&0kTL*QRJF03@s3<k2$TDA2&63!atMTauk*_^
zGX5H`m8p%_w;R!apkgBr$S+m+|9@+&x{GZ>>~;HC)7PP<*;)S1!l3HOJX8`{L_!g3
zgh(hRC+S|lP%q?rjIA4ONpQQrU_b!gA9(Z!fJ6TtNdX_vZhsvCa)ClX0jAp0BKP2d
z_n0>iB=i>7?{Kmzww{+QN*W?i2=LeH8i*olzbXFtJPUw-1pomsSbzutG@yYR1b|L7
z0@Prb4OlD+zA66hoS)AtHg8z@WBG%*4<PvY;)C!xC_v%==Ln6LG?gLFCFMmyQe7*D
z)k4bywb@zrJFuO(!)5ixTSV?kcFX@<<ESlJdc*n|)1#>Av_>Zz`;weY&9K8aJ3XPf
zKOUDvw?(&qwVild)Eu3<=|pEHFnQpqPP#3b6*&gt(;~-UoN={DSf`wnBufeD8X{aK
zp?|vW>2jp~D@yBNpQI=D#(l9%8$(yyn1q>3)Z`BL#_n)qm`M`V$=z{RomQ#NFn?;O
z4J2A^luB~jZIHxq8J8v*;cep*?#baXcMGwHTGA1JIH8G$q`gD6H1G+5gp)Kd30svK
zXH4%Hh?^QYiLZPHg2Iyhe={fmzy}}~u)q*-1pr_GPylEIWlU+~w<GXP&J{(MU0#rt
zf5q*44!lD8^8Ve~x9vUns$Bcpp?yX08dqF;+2G|@3|-Mx_42&Sa-YS!_~YbVJOA+q
zc6RT7q|l_{dt+CG;fk^Eg?+_1eNiy`g2L*DA6MP~Ct;Q7DP{Kc!H+=UdJ>S}`(Ja<
zpF>!N06+lq{BQSswSIF$!SY{ij%8vb;41jj0@%7BU;!qJ7z3ekp2nNXvjFNvu#n0g
zKmecRXaEF&>|B?GN|{J6ZZ0SHgHX&NPy~E`4w_;q6pelxc;w2(;8Q5iK)@0;6)a`y
z9>`&;`UmplxW8rle5Tsh(TK?cP6Q8x@jMEOeBK4kc)k~mp^O8MN?8j&kz5Y}=gUs8
zOjRdB4uk4h$kVszN%u3KL3=ST5HXk8%wf?F06wvX5=OKfcq3FM6mm=~BJg4|0e@J3
zr{^p^05L=zkR%GX^@eSGZ~QO|xL6q9yZzFJI|w16nqm#`>D`Ab;Ds^7nUGT}H}LuX
zarM^VJg8y0PBB3$T*9woh;|e*Z<FvdQ(F$)i0<48n+|5*#Jf8=Skh8LBQ+B1&!-~@
zU<M%I6iUbpsSyw@;Cf`oyn`ha8N<7O@x}Sk(1H;Yh1yOC*Z|@5P&^H~k>x6fC$b9`
z_g8RPJqKsPgZo;{Wlt)VV{`0irtKHipHp#X8F-f-FYBFET4Lc$C9J;ErB$|6s4M}d
z`#H<)V}j4sGUouS(uS2Oa>EHD2^5P(;GZbKI^3Uu!q5n27z#W_fE>;Va%5+JlQ5%H
zD0F$WNI<3-->;$MM=*}`d3Ju{9OqnxBWq{ppgU1aR2yPZKDJP3K&y|w@0^xyCVo!Q
za6FtaQ1OgXPpS)3w!|FuqI=Vuo8M8l6r*@!QY6-*`73yQ>RWt;tpPHtaaxiADR+$d
zHV$~A7SjRy6%5C9bo4Fi0--H`sx9Ez9VoiNlzXa<PJ*I-a}sgX{Rn}qW%t(=T~-27
z8{&egLURh2yEv#AZIscXq9;7b?i6PqV=T@xu(2e8nH!>N=Cx@n_S<+Op>ETr*M+AK
zo6+>4YVdA;A#8)#gG1q6)MIc-8({I{>9dVsxJr-ffy(CBaM2#0R+b)rc2hsRX*=GH
zJwmi-avr#<y7(j7A!kenbc62vD_#T5H6@gR^P*zKr|aKMHcU6S(+TPEXH%HDVqWh^
zP`5xeH9<c-a;Syt+<C1rd+q7QeT+>_H6UI+jarJFG`igWzdlWW&;TBz$0all=L3Qg
zC0a~y(b=apEt)g8+ib~j!sfu{dB6o7)7UCmYMN}#W*hIyzVWP~6%(-2cIBKjP&>1x
z&q;3Fx_EMxle~sS)5erI$)7&HrZm?{!RX48eCwnzKQ}8dyr@BaN5$@*b9-keuuI5G
bO45>%JWGFcl@v%;$|}9JM1pCKRV@GjV9XsL

diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitMenuButton/BitMenuButton.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitMenuButton/BitMenuButton.razor.cs
index cc40b5d490..fafd8262f2 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitMenuButton/BitMenuButton.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitMenuButton/BitMenuButton.razor.cs
@@ -568,7 +568,7 @@ private async Task ToggleCallout()
     {
         if (IsEnabled is false) return;
 
-        await _js.ToggleCallout(_dotnetObj,
+        await _js.BitCalloutToggleCallout(_dotnetObj,
                                 _Id,
                                 null,
                                 _calloutId,
@@ -607,7 +607,7 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
             try
             {
-                await _js.ClearCallout(_calloutId);
+                await _js.BitCalloutClearCallout(_calloutId);
             }
             catch (JSDisconnectedException) { } // we can ignore this exception here
         }
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Calendar/BitCalendar.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Calendar/BitCalendar.razor.cs
index 651bbad092..5246874192 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Calendar/BitCalendar.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Calendar/BitCalendar.razor.cs
@@ -944,14 +944,14 @@ private async Task HandleOnTimeHourFocus()
     {
         if (IsEnabled is false || ShowTimePicker is false) return;
 
-        await _js.SelectText(_inputTimeHourRef);
+        await _js.BitUtilsSelectText(_inputTimeHourRef);
     }
 
     private async Task HandleOnTimeMinuteFocus()
     {
         if (IsEnabled is false || ShowTimePicker is false) return;
 
-        await _js.SelectText(_inputTimeMinuteRef);
+        await _js.BitUtilsSelectText(_inputTimeMinuteRef);
     }
 
     private void ToggleAmPmTime()
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Checkbox/BitCheckbox.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Checkbox/BitCheckbox.razor.cs
index ffd4a57f37..e9e5e00612 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Checkbox/BitCheckbox.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Checkbox/BitCheckbox.razor.cs
@@ -170,7 +170,7 @@ protected override void Dispose(bool disposing)
 
     private async Task SetIndeterminate()
     {
-        await _js.SetProperty(InputElement, "indeterminate", Indeterminate);
+        await _js.BitUtilsSetProperty(InputElement, "indeterminate", Indeterminate);
     }
 
     private async Task HandleOnCheckboxClick(MouseEventArgs args)
@@ -199,6 +199,6 @@ private async Task SetIndeterminate(bool value)
     {
         if (await AssignIndeterminate(value) is false) return;
 
-        await _js.SetProperty(InputElement, "indeterminate", value);
+        await _js.BitUtilsSetProperty(InputElement, "indeterminate", value);
     }
 }
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/ChoiceGroup/BitChoiceGroup.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/ChoiceGroup/BitChoiceGroup.razor.cs
index f44e53b922..44691b0e09 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/ChoiceGroup/BitChoiceGroup.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/ChoiceGroup/BitChoiceGroup.razor.cs
@@ -215,7 +215,7 @@ private string GetItemContainerCssStyles(TItem item)
     {
         StringBuilder cssStyle = new();
 
-        if (string.IsNullOrEmpty(GetStyle(item)) is false)
+        if (GetStyle(item).HasValue())
         {
             cssStyle.Append(GetStyle(item));
         }
@@ -237,7 +237,7 @@ private string GetItemContainerCssClasses(TItem item)
     {
         StringBuilder cssClass = new("bit-chg-icn");
 
-        if (string.IsNullOrEmpty(GetClass(item)) is false)
+        if (GetClass(item).HasValue())
         {
             cssClass.Append(' ').Append(GetClass(item));
         }
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Dropdown/BitDropdown.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Dropdown/BitDropdown.razor.cs
index addc3d92be..e18a8ad2b3 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Dropdown/BitDropdown.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Dropdown/BitDropdown.razor.cs
@@ -852,7 +852,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         if (firstRender is false) return;
         if (Responsive is false) return;
 
-        await _js.SwipesSetup(_calloutId, 0.25m, BitPanelPosition.End, Dir is BitDir.Rtl, _dotnetObj);
+        await _js.BitSwipesSetup(_calloutId, 0.25m, BitPanelPosition.End, Dir is BitDir.Rtl, _dotnetObj);
     }
 
     protected override bool TryParseValueFromString(string? value, [MaybeNullWhen(false)] out TValue result, [NotNullWhen(false)] out string? parsingErrorMessage)
@@ -1162,7 +1162,7 @@ private async Task ToggleCallout()
     {
         if (IsEnabled is false) return;
 
-        _isResponsiveMode = await _js.ToggleCallout(_dotnetObj,
+        _isResponsiveMode = await _js.BitCalloutToggleCallout(_dotnetObj,
                                                     _dropdownId,
                                                     null,
                                                     _calloutId,
@@ -1252,7 +1252,7 @@ private async Task HandleOnKeyDown(KeyboardEventArgs eventArgs)
         }
         else if (eventArgs.Key == "Enter")
         {
-            _searchText = await _js.GetProperty(_isResponsiveMode ? _comboBoxInputResponsiveRef : _comboBoxInputRef, "value");
+            _searchText = await _js.BitUtilsGetProperty(_isResponsiveMode ? _comboBoxInputResponsiveRef : _comboBoxInputRef, "value");
 
             await AddDynamicItem();
 
@@ -1473,8 +1473,8 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
         try
         {
-            await _js.ClearCallout(_calloutId);
-            await _js.SwipesDispose(_calloutId);
+            await _js.BitCalloutClearCallout(_calloutId);
+            await _js.BitSwipesDispose(_calloutId);
         }
         catch (JSDisconnectedException) { } // we can ignore this exception here
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/NumberField/BitNumberField.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/NumberField/BitNumberField.razor.cs
index f5c0574521..7eaaa3ed12 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/NumberField/BitNumberField.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/NumberField/BitNumberField.razor.cs
@@ -353,7 +353,7 @@ private async Task HandleOnFocusIn(FocusEventArgs e)
         _hasFocus = true;
         ClassBuilder.Reset();
         StyleBuilder.Reset();
-        await _js.SelectText(InputElement);
+        await _js.BitUtilsSelectText(InputElement);
         await OnFocusIn.InvokeAsync(e);
     }
 
@@ -374,7 +374,7 @@ private async Task HandleOnFocus(FocusEventArgs e)
         _hasFocus = true;
         ClassBuilder.Reset();
         StyleBuilder.Reset();
-        await _js.SelectText(InputElement);
+        await _js.BitUtilsSelectText(InputElement);
         await OnFocus.InvokeAsync(e);
     }
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/SearchBox/BitSearchBox.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/SearchBox/BitSearchBox.razor.cs
index 0e4079ff72..55adccf395 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/SearchBox/BitSearchBox.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/SearchBox/BitSearchBox.razor.cs
@@ -141,8 +141,19 @@ public partial class BitSearchBox : BitTextInputBase<string?>, IAsyncDisposable
 
 
 
+    /// <summary>
+    /// Clears the input element. 
+    /// </summary>
+    public async Task Clear()
+    {
+        await SetCurrentValueAsync(null);
+        await _js.BitUtilsSetProperty(InputElement, "value", null);
+    }
+
+
+
     [JSInvokable("CloseCallout")]
-    public void CloseCalloutBeforeAnotherCalloutIsOpened()
+    public void _CloseCalloutBeforeAnotherCalloutIsOpened()
     {
         if (IsEnabled is false) return;
 
@@ -264,7 +275,7 @@ private async Task HandleOnKeyDown(KeyboardEventArgs eventArgs)
         }
         else if (eventArgs.Key == "Enter")
         {
-            CurrentValue = await _js.GetProperty(InputElement, "value");
+            CurrentValue = await _js.BitUtilsGetProperty(InputElement, "value");
             await CloseCallout();
             await OnSearch.InvokeAsync(CurrentValue);
         }
@@ -282,7 +293,7 @@ private async Task ToggleCallout()
     {
         if (IsEnabled is false) return;
 
-        await _js.ToggleCallout(_dotnetObj,
+        await _js.BitCalloutToggleCallout(_dotnetObj,
                                 _Id,
                                 null,
                                 _calloutId,
@@ -435,7 +446,7 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
             try
             {
-                await _js.ClearCallout(_calloutId);
+                await _js.BitCalloutClearCallout(_calloutId);
             }
             catch (JSDisconnectedException) { } // we can ignore this exception here
         }
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Slider/BitSlider.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Slider/BitSlider.razor.cs
index 5a82e5b15e..05e80f4ff0 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Slider/BitSlider.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Slider/BitSlider.razor.cs
@@ -343,7 +343,7 @@ private void OnSetValues()
 
     private async ValueTask<int> GetClientHeight(ElementReference element)
     {
-        var height = await _js.GetProperty(element, "clientHeight");
+        var height = await _js.BitUtilsGetProperty(element, "clientHeight");
         return height.HasNoValue()
             ? 0
             : int.Parse(height);
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/SpinButton/BitSpinButton.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/SpinButton/BitSpinButton.razor.cs
index 3835a3b806..8483f7a7b0 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/SpinButton/BitSpinButton.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/SpinButton/BitSpinButton.razor.cs
@@ -440,7 +440,7 @@ private async Task HandleOnFocus(FocusEventArgs e)
 
         await OnFocus.InvokeAsync(e);
 
-        await _js.SelectText(InputElement);
+        await _js.BitUtilsSelectText(InputElement);
     }
 
     private void SetValue(double value)
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/CircularTimePicker/BitCircularTimePicker.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/CircularTimePicker/BitCircularTimePicker.razor.cs
index 31936c2e66..dbe2bb9769 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/CircularTimePicker/BitCircularTimePicker.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/CircularTimePicker/BitCircularTimePicker.razor.cs
@@ -307,7 +307,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
         if (firstRender is false) return;
 
-        await _js.SwipesSetup(_calloutId, 0.25m, BitPanelPosition.Top, Dir is BitDir.Rtl, _dotnetObj);
+        await _js.BitSwipesSetup(_calloutId, 0.25m, BitPanelPosition.Top, Dir is BitDir.Rtl, _dotnetObj);
         _pointerUpAbortControllerId = await _js.BitCircularTimePickerRegisterPointerUp(_dotnetObj, nameof(_HandlePointerUp));
         _pointerMoveAbortControllerId = await _js.BitCircularTimePickerRegisterPointerMove(_dotnetObj, nameof(_HandlePointerMove));
     }
@@ -523,7 +523,7 @@ private async Task ToggleCallout()
         if (Standalone) return;
         if (IsEnabled is false) return;
 
-        await _js.ToggleCallout(_dotnetObj,
+        await _js.BitCalloutToggleCallout(_dotnetObj,
                                 _circularTimePickerId,
                                 null,
                                 _calloutId,
@@ -543,7 +543,7 @@ private async Task UpdateTime(MouseEventArgs e)
     {
         if (IsEnabled is false || InvalidValueBinding()) return;
 
-        var rect = await _js.GetBoundingClientRect(_clockRef);
+        var rect = await _js.BitUtilsGetBoundingClientRect(_clockRef);
         var radius = rect.Width / 2;
         var centerX = radius;
         var centerY = radius;
@@ -707,8 +707,8 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
         try
         {
-            await _js.ClearCallout(_calloutId);
-            await _js.SwipesDispose(_calloutId);
+            await _js.BitCalloutClearCallout(_calloutId);
+            await _js.BitSwipesDispose(_calloutId);
             await _js.BitCircularTimePickerAbort(_pointerUpAbortControllerId);
             await _js.BitCircularTimePickerAbort(_pointerMoveAbortControllerId);
         }
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/ColorPicker/BitColorPicker.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/ColorPicker/BitColorPicker.razor.cs
index 593b27ce34..5ff76edc51 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/ColorPicker/BitColorPicker.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/ColorPicker/BitColorPicker.razor.cs
@@ -132,7 +132,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
     private async Task SetSaturationPickerThumbPositionAsync()
     {
         var (_, saturation, value) = _color.Hsv;
-        var saturationPickerRect = await _js.GetBoundingClientRect(_saturationPickerRef);
+        var saturationPickerRect = await _js.BitUtilsGetBoundingClientRect(_saturationPickerRef);
 
         var width = saturationPickerRect?.Width ?? 0;
         var height = saturationPickerRect?.Height ?? 0;
@@ -152,7 +152,7 @@ private async Task UpdateColor(MouseEventArgs e)
     {
         if (ColorHasBeenSet && ColorChanged.HasDelegate is false) return;
 
-        var pickerRect = await _js.GetBoundingClientRect(_saturationPickerRef);
+        var pickerRect = await _js.BitUtilsGetBoundingClientRect(_saturationPickerRef);
         var left = e.ClientX < pickerRect.Left ? 0
                     : e.ClientX > pickerRect.Left + pickerRect.Width
                     ? pickerRect.Width
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/DatePicker/BitDatePicker.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/DatePicker/BitDatePicker.razor.cs
index 35b8b01462..1a1fc3bb62 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/DatePicker/BitDatePicker.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/DatePicker/BitDatePicker.razor.cs
@@ -530,7 +530,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         if (firstRender is false) return;
         if (Responsive is false) return;
 
-        await _js.SwipesSetup(_calloutId, 0.25m, BitPanelPosition.Top, Dir is BitDir.Rtl, _dotnetObj);
+        await _js.BitSwipesSetup(_calloutId, 0.25m, BitPanelPosition.Top, Dir is BitDir.Rtl, _dotnetObj);
     }
 
     protected override bool TryParseValueFromString(string? value, [MaybeNullWhen(false)] out DateTimeOffset? result, [NotNullWhen(false)] out string? validationErrorMessage)
@@ -572,7 +572,7 @@ private async Task HandleOnClick()
 
         ResetPickersState();
 
-        var bodyWidth = await _js.GetBodyWidth();
+        var bodyWidth = await _js.BitUtilsGetBodyWidth();
         var notEnoughWidthAvailable = bodyWidth < MAX_WIDTH;
 
         if (_showMonthPickerAsOverlayInternal is false)
@@ -1279,14 +1279,14 @@ private async Task HandleOnTimeHourFocus()
     {
         if (IsEnabled is false || ShowTimePicker is false) return;
 
-        await _js.SelectText(_inputTimeHourRef);
+        await _js.BitUtilsSelectText(_inputTimeHourRef);
     }
 
     private async Task HandleOnTimeMinuteFocus()
     {
         if (IsEnabled is false || ShowTimePicker is false) return;
 
-        await _js.SelectText(_inputTimeMinuteRef);
+        await _js.BitUtilsSelectText(_inputTimeMinuteRef);
     }
 
     private void ToggleAmPmTime()
@@ -1483,7 +1483,7 @@ private async Task<bool> ToggleCallout()
         if (Standalone) return false;
         if (IsEnabled is false) return false;
 
-        return await _js.ToggleCallout(_dotnetObj,
+        return await _js.BitCalloutToggleCallout(_dotnetObj,
                                        _datePickerId,
                                        null,
                                        _calloutId,
@@ -1534,8 +1534,8 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
         try
         {
-            await _js.ClearCallout(_calloutId);
-            await _js.SwipesDispose(_calloutId);
+            await _js.BitCalloutClearCallout(_calloutId);
+            await _js.BitSwipesDispose(_calloutId);
         }
         catch (JSDisconnectedException) { } // we can ignore this exception here
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/DateRangePicker/BitDateRangePicker.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/DateRangePicker/BitDateRangePicker.razor.cs
index a64044a39c..09b6d848bc 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/DateRangePicker/BitDateRangePicker.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/DateRangePicker/BitDateRangePicker.razor.cs
@@ -593,7 +593,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         if (firstRender is false) return;
         if (Responsive is false) return;
 
-        await _js.SwipesSetup(_calloutId, 0.25m, BitPanelPosition.Top, Dir is BitDir.Rtl, _dotnetObj);
+        await _js.BitSwipesSetup(_calloutId, 0.25m, BitPanelPosition.Top, Dir is BitDir.Rtl, _dotnetObj);
     }
 
     protected override bool TryParseValueFromString(string? value, [MaybeNullWhen(false)] out BitDateRangePickerValue? result, [NotNullWhen(false)] out string? validationErrorMessage)
@@ -642,7 +642,7 @@ private async Task HandleOnClick()
 
         ResetPickersState();
 
-        var bodyWidth = await _js.GetBodyWidth();
+        var bodyWidth = await _js.BitUtilsGetBodyWidth();
         var notEnoughWidthAvailable = bodyWidth < MAX_WIDTH;
 
         if (_showMonthPickerAsOverlayInternal is false)
@@ -1629,14 +1629,14 @@ private async Task HandleOnHourInputFocus(bool isStartTime)
     {
         if (IsEnabled is false || ShowTimePicker is false) return;
 
-        await _js.SelectText(isStartTime ? _startTimeHourInputRef : _endTimeHourInputRef);
+        await _js.BitUtilsSelectText(isStartTime ? _startTimeHourInputRef : _endTimeHourInputRef);
     }
 
     private async Task HandleOnMinuteInputFocus(bool isStartTime)
     {
         if (IsEnabled is false || ShowTimePicker is false) return;
 
-        await _js.SelectText(isStartTime ? _startTimeMinuteInputRef : _endTimeMinuteInputRef);
+        await _js.BitUtilsSelectText(isStartTime ? _startTimeMinuteInputRef : _endTimeMinuteInputRef);
     }
 
     private void HandleOnAmClick(bool isStartTime)
@@ -2025,7 +2025,7 @@ private async Task<bool> ToggleCallout()
         if (Standalone) return false;
         if (IsEnabled is false) return false;
 
-        return await _js.ToggleCallout(_dotnetObj,
+        return await _js.BitCalloutToggleCallout(_dotnetObj,
                                        _dateRangePickerId,
                                        null,
                                        _calloutId,
@@ -2076,8 +2076,8 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
         try
         {
-            await _js.ClearCallout(_calloutId);
-            await _js.SwipesDispose(_calloutId);
+            await _js.BitCalloutClearCallout(_calloutId);
+            await _js.BitSwipesDispose(_calloutId);
         }
         catch (JSDisconnectedException) { } // we can ignore this exception here
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/TimePicker/BitTimePicker.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/TimePicker/BitTimePicker.razor.cs
index d554b0d9ee..bea8abb564 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/TimePicker/BitTimePicker.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/_Pickers/TimePicker/BitTimePicker.razor.cs
@@ -345,7 +345,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         if (firstRender is false) return;
         if (Responsive is false) return;
 
-        await _js.SwipesSetup(_calloutId, 0.25m, BitPanelPosition.Top, Dir is BitDir.Rtl, _dotnetObj);
+        await _js.BitSwipesSetup(_calloutId, 0.25m, BitPanelPosition.Top, Dir is BitDir.Rtl, _dotnetObj);
     }
 
     protected override bool TryParseValueFromString(string? value, [MaybeNullWhen(false)] out TimeSpan? result, [NotNullWhen(false)] out string? validationErrorMessage)
@@ -425,7 +425,7 @@ private async Task ToggleCallout()
         if (Standalone) return;
         if (IsEnabled is false) return;
 
-        await _js.ToggleCallout(_dotnetObj,
+        await _js.BitCalloutToggleCallout(_dotnetObj,
                                 _timePickerId,
                                 null,
                                 _calloutId,
@@ -512,14 +512,14 @@ private async Task HandleOnHourFocus()
     {
         if (IsEnabled is false) return;
 
-        await _js.SelectText(_inputHourRef);
+        await _js.BitUtilsSelectText(_inputHourRef);
     }
 
     private async Task HandleOnMinuteFocus()
     {
         if (IsEnabled is false) return;
 
-        await _js.SelectText(_inputMinuteRef);
+        await _js.BitUtilsSelectText(_inputMinuteRef);
     }
 
     private async Task ChangeHour(bool isNext)
@@ -673,8 +673,8 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
         try
         {
-            await _js.ClearCallout(_calloutId);
-            await _js.SwipesDispose(_calloutId);
+            await _js.BitCalloutClearCallout(_calloutId);
+            await _js.BitSwipesDispose(_calloutId);
         }
         catch (JSDisconnectedException) { } // we can ignore this exception here
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.razor b/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.razor
index 508c8bccab..de2e15056e 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.razor
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.razor
@@ -1,55 +1,41 @@
 @namespace Bit.BlazorUI
 @inherits BitComponentBase
 
-<div @ref="RootElement"
-     @attributes="HtmlAttributes"
+@{
+    var showNavPanel = NavPanel is not null && HideNavPanel is false;
+}
+
+<div @ref="RootElement" @attributes="HtmlAttributes"
      id="@_Id"
      style="@StyleBuilder.Value"
      class="@ClassBuilder.Value"
      dir="@Dir?.ToString().ToLower()">
-
-    @{
-        var headerHeight = HeaderHeight + StatusBarHeight;
-        var headerHeightStyle = $"{(headerHeight > 0 ? $"height:{headerHeight}px;" : "")}";
-        var headerPaddingStyle = $"{(StatusBarHeight > 0 ? $"padding-top:{StatusBarHeight}px;" : "")}";
-        var headerStyles = $"{headerHeightStyle}{headerPaddingStyle}{Styles?.Header}";
-        var headerClasses = $"bit-lyt-hdr{(FixedHeader ? " bit-lyt-fhd" : "")} {Classes?.Header}";
-
-        var mainPaddingTopStyle = $"{(FixedHeader && headerHeight > 0 ? $"padding-top:{headerHeight}px;" : "")}";
-        var mainPaddingBottomStyle = $"{(FixedFooter && FooterHeight > 0 ? $"padding-bottom:{FooterHeight}px;" : "")}";
-        var mainStyles = $"{mainPaddingTopStyle}{mainPaddingBottomStyle}{Styles?.Main}";
-        var mainClasses = $"bit-lyt-man {Classes?.Main}";
-
-        var footerHeightStyle = $"{(FooterHeight > 0 ? $"height:{FooterHeight}px;" : "")}";
-        var footerStyles = $"{footerHeightStyle}{Styles?.Footer}";
-        var footerClasses = $"bit-lyt-ftr{(FixedFooter ? " bit-lyt-fft" : "")} {Classes?.Footer}";
-    }
     <CascadingValue Value="Dir">
         @if (Header is not null)
         {
-            <header class="@headerClasses" style="@headerStyles">
+            <header style="@Styles?.Header" class="bit-lyt-hdr @Classes?.Header">
                 @Header
             </header>
         }
 
-        <main class="@mainClasses" style="@mainStyles">
-            @if (NavMenu is not null && HideNavMenu is false)
+        <main style="@Styles?.Main" class="bit-lyt-man @Classes?.Main">
+            @if (showNavPanel)
             {
-                <div style="@Styles?.NavMenu" class="bit-lyt-nmn @Classes?.NavMenu">
-                    @NavMenu
+                <div style="@Styles?.NavPanel" class="bit-lyt-nmn @Classes?.NavPanel">
+                    @NavPanel
                 </div>
             }
 
-            <div style="@Styles?.MainContent" class="bit-lyt-mcn @Classes?.MainContent">
+            <div style="@($"{(showNavPanel ? $"width:calc(100% - {NavPanelWidth}px);" : "")};{Styles?.MainContent}".Trim(';'))" class="bit-lyt-mcn @Classes?.MainContent">
                 @Main
             </div>
         </main>
 
         @if (Footer is not null)
         {
-            <footer class="@footerClasses" style="@footerStyles">
+                <footer style="@Styles?.Footer" class="bit-lyt-ftr @Classes?.Footer">
                 @Footer
-            </footer>
+                </footer>
         }
     </CascadingValue>
 </div>
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.razor.cs
index e04cf8405a..d732083604 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.razor.cs
@@ -7,55 +7,47 @@ public partial class BitLayout : BitComponentBase
     /// </summary>
     [Parameter] public BitLayoutClassStyles? Classes { get; set; }
 
-    /// <summary>
-    /// Enables fixed positioning of the header at the top of the viewport.
-    /// </summary>
-    [Parameter] public bool FixedHeader { get; set; }
-
-    /// <summary>
-    /// Enables fixed positioning of the footer at the bottom of the viewport.
-    /// </summary>
-    [Parameter] public bool FixedFooter { get; set; }
-
     /// <summary>
     /// The content of the footer section.
     /// </summary>
     [Parameter] public RenderFragment? Footer { get; set; }
 
     /// <summary>
-    /// The height of the footer in px to calculate heights and paddings.
+    /// The content of the header section.
     /// </summary>
-    [Parameter] public int FooterHeight { get; set; }
+    [Parameter] public RenderFragment? Header { get; set; }
 
     /// <summary>
-    /// The content of the header section.
+    /// Hides NavPanel content.
     /// </summary>
-    [Parameter] public RenderFragment? Header { get; set; }
+    [Parameter] public bool HideNavPanel { get; set; }
 
     /// <summary>
-    /// The height of the header in px to calculate heights and paddings.
+    /// The content of the main section.
     /// </summary>
-    [Parameter] public int HeaderHeight { get; set; }
+    [Parameter] public RenderFragment? Main { get; set; }
 
     /// <summary>
-    /// Hides NavMenu content when true.
+    /// The content of the nav panel section.
     /// </summary>
-    [Parameter] public bool HideNavMenu { get; set; }
+    [Parameter] public RenderFragment? NavPanel { get; set; }
 
     /// <summary>
-    /// The content of the main section.
+    /// The width of the nav panel section in px.
     /// </summary>
-    [Parameter] public RenderFragment? Main { get; set; }
+    [Parameter] public int NavPanelWidth { get; set; }
 
     /// <summary>
-    /// The content of the nav-menu section.
+    /// Enables sticky positioning of the footer at the bottom of the viewport.
     /// </summary>
-    [Parameter] public RenderFragment? NavMenu { get; set; }
+    [Parameter, ResetClassBuilder]
+    public bool StickyFooter { get; set; }
 
     /// <summary>
-    /// The height of the status bar on mobile devices to calculate heights and paddings.
+    /// Enables sticky positioning of the header at the top of the viewport.
     /// </summary>
-    [Parameter] public int StatusBarHeight { get; set; }
+    [Parameter, ResetClassBuilder]
+    public bool StickyHeader { get; set; }
 
     /// <summary>
     /// Custom CSS styles for different parts of the BitLayout.
@@ -69,6 +61,9 @@ public partial class BitLayout : BitComponentBase
     protected override void RegisterCssClasses()
     {
         ClassBuilder.Register(() => Classes?.Root);
+
+        ClassBuilder.Register(() => StickyHeader ? "bit-lyt-shd" : string.Empty);
+        ClassBuilder.Register(() => StickyFooter ? "bit-lyt-sft" : string.Empty);
     }
 
     protected override void RegisterCssStyles()
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.scss b/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.scss
index fba6a3e5e0..e9df24de51 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.scss
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayout.scss
@@ -15,20 +15,35 @@
     }
 }
 
+.bit-lyt-shd {
+    height: fit-content;
+
+    > .bit-lyt-hdr {
+        top: 0;
+        position: sticky;
+        z-index: $zindex-base;
+    }
+}
+
+.bit-lyt-sft {
+    height: fit-content;
+
+    > .bit-lyt-ftr {
+        bottom: 0;
+        position: sticky;
+        z-index: $zindex-base;
+    }
+}
+
 .bit-lyt-hdr {
     width: 100%;
     box-sizing: border-box;
 }
 
-.bit-lyt-fhd {
-    top: 0;
-    position: fixed;
-    z-index: $zindex-base;
-}
-
 .bit-lyt-man {
     flex-grow: 1;
     display: flex;
+    min-height: 100vh;
     box-sizing: border-box;
 }
 
@@ -45,9 +60,3 @@
     width: 100%;
     box-sizing: border-box;
 }
-
-.bit-lyt-fft {
-    bottom: 0;
-    position: fixed;
-    z-index: $zindex-base;
-}
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayoutClassStyles.cs b/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayoutClassStyles.cs
index c484c6bbf0..56b62f46f0 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayoutClassStyles.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Layouts/Layout/BitLayoutClassStyles.cs
@@ -20,7 +20,7 @@ public class BitLayoutClassStyles
     /// <summary>
     /// Custom CSS classes/styles for the nav-menu section of the BitLayout.
     /// </summary>
-    public string? NavMenu { get; set; }
+    public string? NavPanel { get; set; }
 
     /// <summary>
     /// Custom CSS classes/styles for the main-content section of the BitLayout.
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Lists/Carousel/BitCarousel.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Lists/Carousel/BitCarousel.razor.cs
index 58f76434b6..cb08373268 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Lists/Carousel/BitCarousel.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Lists/Carousel/BitCarousel.razor.cs
@@ -176,7 +176,7 @@ private async Task ResetDimensionsAsync()
         _othersIndices = Enumerable.Range(0, _internalScrollItemsCount).ToArray();
 
         var itemsCount = _allItems.Count;
-        var rect = await _js.GetBoundingClientRect(_carousel);
+        var rect = await _js.BitUtilsGetBoundingClientRect(_carousel);
         if (rect is null) return;
         var sign = Dir == BitDir.Rtl ? -1 : 1;
         for (int i = 0; i < itemsCount; i++)
@@ -332,7 +332,7 @@ private async Task HandlePointerMove(MouseEventArgs e)
         if (Math.Abs(delta) <= 20) return;
 
         _isPointerDown = false;
-        await _js.SetStyle(_carousel, "cursor", "");
+        await _js.BitUtilsSetStyle(_carousel, "cursor", "");
 
         if (delta < 0)
         {
@@ -348,14 +348,14 @@ private async Task HandlePointerDown(MouseEventArgs e)
     {
         _isPointerDown = true;
         _pointerX = e.ClientX;
-        await _js.SetStyle(_carousel, "cursor", "grabbing");
+        await _js.BitUtilsSetStyle(_carousel, "cursor", "grabbing");
         StateHasChanged();
     }
 
     private async Task HandlePointerUp(MouseEventArgs e)
     {
         _isPointerDown = false;
-        await _js.SetStyle(_carousel, "cursor", "");
+        await _js.BitUtilsSetStyle(_carousel, "cursor", "");
         StateHasChanged();
     }
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Lists/Swiper/BitSwiper.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Lists/Swiper/BitSwiper.razor.cs
index 45fbf37d51..4afd8825bc 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Lists/Swiper/BitSwiper.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Lists/Swiper/BitSwiper.razor.cs
@@ -104,7 +104,7 @@ public async Task HandlePointerLeave(double clientX)
         if (_isPointerDown is false) return;
 
         _isPointerDown = false;
-        await _js.SetStyle(_swiper, "cursor", "");
+        await _js.BitUtilsSetStyle(_swiper, "cursor", "");
 
         var time = (DateTime.Now.Ticks - _pointerDownTime) / 10_000;
         var distance = Math.Abs(clientX - _pointerDownX);
@@ -114,7 +114,7 @@ public async Task HandlePointerLeave(double clientX)
         var swipeSpeed = distance / time;
 
         var transitionTime = swipeSpeed > 2 ? 300 : swipeSpeed > 1 ? 600 : 1000;
-        await _js.SetStyle(_swiper, "transitionDuration", FormattableString.Invariant($"{transitionTime}ms"));
+        await _js.BitUtilsSetStyle(_swiper, "transitionDuration", FormattableString.Invariant($"{transitionTime}ms"));
 
         var x = -(_lastDiffX / Math.Abs(_lastDiffX)) * (_swiperEffectiveWidth * swipeSpeed / 10) + _translateX;
         await Swipe(x);
@@ -192,7 +192,7 @@ private void SetNavigationButtonsVisibility(double translateX)
     private async Task Go(bool isNext)
     {
         await GetDimensions();
-        await _js.SetStyle(_swiper, "transitionDuration", "");
+        await _js.BitUtilsSetStyle(_swiper, "transitionDuration", "");
 
         var sign = isNext ? -1 : 1;
         var scrollX = _swiperWidth / _allItems.Count * _internalScrollItemsCount;
@@ -235,8 +235,8 @@ private async Task HandlePointerDown(MouseEventArgs e)
 
         await GetDimensions();
 
-        await _js.SetStyle(_swiper, "cursor", "grabbing");
-        await _js.SetStyle(_swiper, "transitionDuration", "");
+        await _js.BitUtilsSetStyle(_swiper, "cursor", "grabbing");
+        await _js.BitUtilsSetStyle(_swiper, "transitionDuration", "");
     }
 
     private async Task HandlePointerUp(MouseEventArgs e) => await HandlePointerLeave(e.ClientX);
@@ -256,7 +256,7 @@ private async Task Swipe(double x)
             if (x < -_swiperEffectiveWidth) x = -_swiperEffectiveWidth;
         }
 
-        await _js.SetStyle(_swiper, "transform", FormattableString.Invariant($"translateX({x}px)"));
+        await _js.BitUtilsSetStyle(_swiper, "transform", FormattableString.Invariant($"translateX({x}px)"));
 
         SetNavigationButtonsVisibility(x);
     }
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Breadcrumb/BitBreadcrumb.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Breadcrumb/BitBreadcrumb.razor.cs
index 21f874b915..d5011048b5 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Breadcrumb/BitBreadcrumb.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Breadcrumb/BitBreadcrumb.razor.cs
@@ -597,7 +597,7 @@ private async Task ToggleCallout()
     {
         if (IsEnabled is false) return;
 
-        await _js.ToggleCallout(_dotnetObj,
+        await _js.BitCalloutToggleCallout(_dotnetObj,
                                 _overflowAnchorId,
                                 null,
                                 _calloutId,
@@ -636,7 +636,7 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
             try
             {
-                await _js.ClearCallout(_calloutId);
+                await _js.BitCalloutClearCallout(_calloutId);
             }
             catch (JSDisconnectedException) { } // we can ignore this exception here
         }
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Navs/DropMenu/BitDropMenu.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Navs/DropMenu/BitDropMenu.razor.cs
index 48f83584e7..b998c9359d 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Navs/DropMenu/BitDropMenu.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Navs/DropMenu/BitDropMenu.razor.cs
@@ -150,7 +150,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         if (firstRender is false) return;
         if (Responsive is false) return;
 
-        await _js.SwipesSetup(_calloutId, 0.25m, BitPanelPosition.End, Dir is BitDir.Rtl, _dotnetObj);
+        await _js.BitSwipesSetup(_calloutId, 0.25m, BitPanelPosition.End, Dir is BitDir.Rtl, _dotnetObj);
     }
 
 
@@ -182,7 +182,7 @@ private async Task ToggleCallout()
     {
         if (IsEnabled is false) return;
 
-        await _js.ToggleCallout(_dotnetObj,
+        await _js.BitCalloutToggleCallout(_dotnetObj,
                                 _Id,
                                 null,
                                 _calloutId,
@@ -236,8 +236,8 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
         try
         {
-            await _js.ClearCallout(_calloutId);
-            await _js.SwipesDispose(_calloutId);
+            await _js.BitCalloutClearCallout(_calloutId);
+            await _js.BitSwipesDispose(_calloutId);
         }
         catch (JSDisconnectedException) { } // we can ignore this exception here
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Nav/BitNav.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Nav/BitNav.razor.cs
index 70ca783961..7cc1a9bfa6 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Nav/BitNav.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Nav/BitNav.razor.cs
@@ -94,7 +94,7 @@ public partial class BitNav<TItem> : BitComponentBase, IDisposable where TItem :
     [Parameter] public int IndentReversedPadding { get; set; } = 4;
 
     /// <summary>
-    /// A collection of item to display in the navigation bar.
+    /// A collection of items to display in the BitNav component.
     /// </summary>
     [Parameter]
     [CallOnSet(nameof(OnSetParameters))]
@@ -336,6 +336,28 @@ internal List<TItem> GetChildItems(TItem item)
         return item.GetValueFromProperty<string?>(NameSelectors.CollapseAriaLabel.Name);
     }
 
+    internal object? GetData(TItem item)
+    {
+        if (item is BitNavItem navItem)
+        {
+            return navItem.Data;
+        }
+
+        if (item is BitNavOption navOption)
+        {
+            return navOption.Data;
+        }
+
+        if (NameSelectors is null) return null;
+
+        if (NameSelectors.Data.Selector is not null)
+        {
+            return NameSelectors.Data.Selector!(item);
+        }
+
+        return item.GetValueFromProperty<string?>(NameSelectors.Data.Name);
+    }
+
     internal string? GetDescription(TItem item)
     {
         if (item is BitNavItem navItem)
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Callout/BitCallout.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Callout/BitCallout.razor.cs
index 3322053a1d..5ebd497af5 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Callout/BitCallout.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Callout/BitCallout.razor.cs
@@ -145,7 +145,7 @@ private async Task ToggleCallout()
 
         var id = Anchor is not null ? _anchorId : AnchorId ?? _Id;
 
-        await _js.ToggleCallout(_dotnetObj,
+        await _js.BitCalloutToggleCallout(_dotnetObj,
                                 id,
                                 AnchorEl is null ? null : AnchorEl(),
                                 _contentId,
@@ -181,7 +181,7 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
             try
             {
-                await _js.ClearCallout(_contentId);
+                await _js.BitCalloutClearCallout(_contentId);
             }
             catch (JSDisconnectedException) { } // we can ignore this exception here
         }
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Dialog/BitDialog.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Dialog/BitDialog.razor.cs
index 5ae699aba7..0db768becd 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Dialog/BitDialog.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Dialog/BitDialog.razor.cs
@@ -164,7 +164,7 @@ public partial class BitDialog : BitComponentBase, IAsyncDisposable
     {
         await InvokeAsync(async () =>
         {
-            _ = _js.ToggleOverflow(ScrollerSelector, true);
+            _ = _js.BitUtilsToggleOverflow(ScrollerSelector, true);
 
             Result = null;
 
@@ -233,7 +233,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
         if (AutoToggleScroll is false) return;
 
-        _offsetTop = await _js.ToggleOverflow(ScrollerSelector, IsOpen);
+        _offsetTop = await _js.BitUtilsToggleOverflow(ScrollerSelector, IsOpen);
 
         if (AbsolutePosition is false) return;
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Modal/BitModal.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Modal/BitModal.razor.cs
index c19d8f49bb..5726c19c14 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Modal/BitModal.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Modal/BitModal.razor.cs
@@ -232,7 +232,7 @@ private async Task ToggleScroll(bool isOpen)
     {
         if (ModalParameters.AutoToggleScroll is false) return;
 
-        _offsetTop = await _js.ToggleOverflow(ModalParameters.ScrollerSelector ?? "body", isOpen);
+        _offsetTop = await _js.BitUtilsToggleOverflow(ModalParameters.ScrollerSelector ?? "body", isOpen);
     }
 
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Panel/BitPanel.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Panel/BitPanel.razor.cs
index 6f6863e164..20607a18ae 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Panel/BitPanel.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Surfaces/Panel/BitPanel.razor.cs
@@ -165,7 +165,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         if (firstRender)
         {
             var dotnetObj = DotNetObjectReference.Create(this);
-            await _js.SwipesSetup(_containerId, SwipeTrigger ?? 0.25m, Position ?? BitPanelPosition.End, Dir == BitDir.Rtl, dotnetObj, false);
+            await _js.BitSwipesSetup(_containerId, SwipeTrigger ?? 0.25m, Position ?? BitPanelPosition.End, Dir == BitDir.Rtl, dotnetObj, false);
         }
 
         if (_internalIsOpen == IsOpen) return;
@@ -176,7 +176,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
         if (AutoToggleScroll is false) return;
 
-        _offsetTop = await _js.ToggleOverflow(ScrollerSelector ?? "body", IsOpen);
+        _offsetTop = await _js.BitUtilsToggleOverflow(ScrollerSelector ?? "body", IsOpen);
 
         StyleBuilder.Reset();
         StateHasChanged();
@@ -258,7 +258,7 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
         try
         {
-            await _js.SwipesDispose(_containerId);
+            await _js.BitSwipesDispose(_containerId);
         }
         catch (JSDisconnectedException) { } // we can ignore this exception here
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Utilities/Link/BitLink.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Utilities/Link/BitLink.razor.cs
index 3ffb63375f..4c5c02d762 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Utilities/Link/BitLink.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Utilities/Link/BitLink.razor.cs
@@ -73,7 +73,7 @@ private async Task ScrollIntoView()
     {
         if (IsEnabled is false) return;
 
-        await _js.ScrollElementIntoView(Href![1..]);
+        await _js.BitUtilsScrollElementIntoView(Href![1..]);
     }
 
     private void OnSetHrefAndRel()
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Utilities/SwipeTrap/BitSwipeTrap.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Utilities/SwipeTrap/BitSwipeTrap.razor.cs
index 4e9212f319..0d5ab57b97 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Utilities/SwipeTrap/BitSwipeTrap.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Utilities/SwipeTrap/BitSwipeTrap.razor.cs
@@ -93,7 +93,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         if (firstRender)
         {
             var dotnetObj = DotNetObjectReference.Create(this);
-            await _js.BitSwipeTrapSetup(UniqueId, RootElement, Trigger ?? 0.25m, Threshold ?? 0, Throttle ?? 10, dotnetObj);
+            await _js.BitSwipeTrapSetup(UniqueId, RootElement, Trigger ?? 0.25m, Threshold ?? 0, Throttle ?? 0, dotnetObj);
         }
 
         await base.OnAfterRenderAsync(firstRender);
diff --git a/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/CalloutsJsRuntimeExtensions.cs b/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/CalloutsJsRuntimeExtensions.cs
index 3ed0cf856a..3960864f3f 100644
--- a/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/CalloutsJsRuntimeExtensions.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/CalloutsJsRuntimeExtensions.cs
@@ -4,7 +4,7 @@ namespace Bit.BlazorUI;
 
 internal static class CalloutsJsRuntimeExtensions
 {
-    internal static ValueTask<bool> ToggleCallout<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(
+    internal static ValueTask<bool> BitCalloutToggleCallout<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(
         this IJSRuntime jsRuntime,
         DotNetObjectReference<T> dotnetObj,
         string componentId,
@@ -40,7 +40,7 @@ internal static class CalloutsJsRuntimeExtensions
                                       maxWidth);
     }
 
-    internal static ValueTask ClearCallout(this IJSRuntime jsRuntime, string calloutId)
+    internal static ValueTask BitCalloutClearCallout(this IJSRuntime jsRuntime, string calloutId)
     {
         return jsRuntime.InvokeVoid("BitBlazorUI.Callouts.clear", calloutId);
     }
diff --git a/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/SwipesJsRuntimeExtensions.cs b/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/SwipesJsRuntimeExtensions.cs
index d0dce6f787..9f5e1ec16d 100644
--- a/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/SwipesJsRuntimeExtensions.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/SwipesJsRuntimeExtensions.cs
@@ -4,7 +4,7 @@ namespace Bit.BlazorUI;
 
 internal static class SwipesJsRuntimeExtensions
 {
-    internal static ValueTask SwipesSetup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this IJSRuntime js,
+    internal static ValueTask BitSwipesSetup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this IJSRuntime js,
         string id,
         decimal trigger,
         BitPanelPosition position,
@@ -15,7 +15,7 @@ internal static class SwipesJsRuntimeExtensions
         return js.InvokeVoid("BitBlazorUI.Swipes.setup", id, trigger, position, isRtl, dotnetObj, isResponsive);
     }
 
-    internal static ValueTask SwipesDispose(this IJSRuntime jsRuntime, string id)
+    internal static ValueTask BitSwipesDispose(this IJSRuntime jsRuntime, string id)
     {
         return jsRuntime.InvokeVoid("BitBlazorUI.Swipes.dispose", id);
     }
diff --git a/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/UtilsJsRuntimeExtensions.cs b/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/UtilsJsRuntimeExtensions.cs
index 8a430ff51d..30479a1428 100644
--- a/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/UtilsJsRuntimeExtensions.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Extensions/JsInterop/UtilsJsRuntimeExtensions.cs
@@ -2,49 +2,49 @@
 
 internal static class UtilsJsRuntimeExtensions
 {
-    internal static ValueTask<decimal> GetBodyWidth(this IJSRuntime jsRuntime)
+    internal static ValueTask<decimal> BitUtilsGetBodyWidth(this IJSRuntime jsRuntime)
     {
         return jsRuntime.Invoke<decimal>("BitBlazorUI.Utils.getBodyWidth");
     }
 
 
-    internal static ValueTask SetProperty(this IJSRuntime jsRuntime, ElementReference element, string property, object value)
+    internal static ValueTask BitUtilsSetProperty(this IJSRuntime jsRuntime, ElementReference element, string property, object? value)
     {
         return jsRuntime.InvokeVoid("BitBlazorUI.Utils.setProperty", element, property, value);
     }
 
 
-    internal static ValueTask<string> GetProperty(this IJSRuntime jsRuntime, ElementReference element, string property)
+    internal static ValueTask<string> BitUtilsGetProperty(this IJSRuntime jsRuntime, ElementReference element, string property)
     {
         return jsRuntime.Invoke<string>("BitBlazorUI.Utils.getProperty", element, property);
     }
 
 
-    internal static ValueTask<BoundingClientRect> GetBoundingClientRect(this IJSRuntime jsRuntime, ElementReference element)
+    internal static ValueTask<BoundingClientRect> BitUtilsGetBoundingClientRect(this IJSRuntime jsRuntime, ElementReference element)
     {
         return jsRuntime.Invoke<BoundingClientRect>("BitBlazorUI.Utils.getBoundingClientRect", element);
     }
 
 
-    internal static ValueTask ScrollElementIntoView(this IJSRuntime jsRuntime, string targetElementId)
+    internal static ValueTask BitUtilsScrollElementIntoView(this IJSRuntime jsRuntime, string targetElementId)
     {
         return jsRuntime.InvokeVoid("BitBlazorUI.Utils.scrollElementIntoView", targetElementId);
     }
 
 
-    internal static ValueTask SelectText(this IJSRuntime jsRuntime, ElementReference element)
+    internal static ValueTask BitUtilsSelectText(this IJSRuntime jsRuntime, ElementReference element)
     {
         return jsRuntime.InvokeVoid("BitBlazorUI.Utils.selectText", element);
     }
 
 
-    internal static ValueTask SetStyle(this IJSRuntime jsRuntime, ElementReference element, string key, string value)
+    internal static ValueTask BitUtilsSetStyle(this IJSRuntime jsRuntime, ElementReference element, string key, string value)
     {
         return jsRuntime.InvokeVoid("BitBlazorUI.Utils.setStyle", element, key, value);
     }
 
 
-    internal static ValueTask<int> ToggleOverflow(this IJSRuntime jsRuntime, string scrollerSelector, bool isHidden)
+    internal static ValueTask<int> BitUtilsToggleOverflow(this IJSRuntime jsRuntime, string scrollerSelector, bool isHidden)
     {
         return jsRuntime.Invoke<int>("BitBlazorUI.Utils.toggleOverflow", scrollerSelector, isHidden);
     }
diff --git a/src/BlazorUI/Bit.BlazorUI/Extensions/StringExtensions.cs b/src/BlazorUI/Bit.BlazorUI/Extensions/StringExtensions.cs
index 4fb33a2584..8dcc5ff61c 100644
--- a/src/BlazorUI/Bit.BlazorUI/Extensions/StringExtensions.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Extensions/StringExtensions.cs
@@ -1,4 +1,5 @@
-namespace Bit.BlazorUI;
+#nullable enable
+namespace Bit.BlazorUI;
 
 internal static class StringExtensions
 {
diff --git a/src/BlazorUI/Bit.BlazorUI/Styles/media-queries.scss b/src/BlazorUI/Bit.BlazorUI/Styles/media-queries.scss
index b6f178a6c5..c1628fe3f8 100644
--- a/src/BlazorUI/Bit.BlazorUI/Styles/media-queries.scss
+++ b/src/BlazorUI/Bit.BlazorUI/Styles/media-queries.scss
@@ -1,3 +1,5 @@
+// https://github.com/Necromancerx/media-queries-scss-mixins
+
 $brk-xs-max: 600px;
 $brk-sm-min: 601px;
 $brk-sm-max: 960px;
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor
index 97d974449b..a67e1c5f7b 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor
@@ -13,8 +13,15 @@
     <base href="/" />
     <meta charset="utf-8" />
     <meta name="theme-color">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
     <meta name="description" content="bit BlazorUI components are native, easy-to-customize, and work seamlessly in all Blazor modes (WASM, Server, Hybrid, pre-rendering), saving you time and making development enjoyable." />
+
+    <script>
+        // disable auto-zoom of iOS Safari when focusing an input
+        (/iPad|iPhone|iPod/.test(navigator.userAgent)) &&
+            (document.querySelector('meta[name="viewport"]').content = 'width=device-width, initial-scale=1.0, viewport-fit=cover, maximum-scale=1.0')
+    </script>
+
     <Link rel="icon" href="favicon.ico" type="image/x-icon" />
     <HeadOutlet @rendermode=renderMode />
     <Link rel="apple-touch-icon" sizes="512x512" href="images/icons/bit-icon-512.png" />
@@ -47,9 +54,9 @@
     Microsoft Clarity -->
 
     <Link rel="stylesheet" href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
+    <Link rel="stylesheet" href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" />
     <Link rel="stylesheet" href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
     <Link rel="stylesheet" href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
-    <Link rel="stylesheet" href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" />
     <Link rel="stylesheet" href="_content/Bit.BlazorUI.Demo.Client.Core/styles/app.css" />
     <Link rel="stylesheet" href="Bit.BlazorUI.Demo.Server.styles.css" />
     <Link rel="stylesheet" href="_content/Bit.BlazorUI.Demo.Client.Core/prism-1.28.0/prism-okaidia-bit.css" />
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Extensions/IJSRuntimeExtensions.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Extensions/IJSRuntimeExtensions.cs
index 5037428723..288c56a267 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Extensions/IJSRuntimeExtensions.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Extensions/IJSRuntimeExtensions.cs
@@ -2,11 +2,6 @@
 
 public static class IJSRuntimeExtensions
 {
-    public static async Task ToggleBodyOverflow(this IJSRuntime jsRuntime, bool isNavOpen)
-    {
-        await jsRuntime.InvokeVoidAsync("toggleBodyOverflow", isNavOpen);
-    }
-
     public static async Task ScrollToElement(this IJSRuntime jsRuntime, string targetElementId)
     {
         await jsRuntime.InvokeVoidAsync("scrollToElement", targetElementId);
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Extensions/IServiceCollectionExtensions.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Extensions/IServiceCollectionExtensions.cs
index e0e28c4ada..f10c87d4b4 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Extensions/IServiceCollectionExtensions.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Extensions/IServiceCollectionExtensions.cs
@@ -21,7 +21,6 @@ public static IServiceCollection AddClientSharedServices(this IServiceCollection
 
         services.TryAddTransient<MessageBoxService>();
         services.TryAddTransient<LazyAssemblyLoader>();
-        services.TryAddScoped<NavManuService>();
 
         services.AddBitBlazorUIServices();
         services.AddBitBlazorUIExtrasServices(trySingleton: AppRenderMode.IsBlazorHybrid);
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/BitActionButtonDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/BitActionButtonDemo.razor
index 8f134e5109..f7fbfdf567 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/BitActionButtonDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/BitActionButtonDemo.razor
@@ -239,27 +239,4 @@
             </div>
         </ExamplePreview>
     </ComponentExampleBox>
-</ComponentDemo>
-
-@code {
-    private bool formIsValidSubmit;
-    private ButtonValidationModel buttonValidationModel = new();
-
-    private async Task HandleValidSubmit()
-    {
-        formIsValidSubmit = true;
-
-        await Task.Delay(2000);
-
-        buttonValidationModel = new();
-
-        formIsValidSubmit = false;
-
-        StateHasChanged();
-    }
-
-    private void HandleInvalidSubmit()
-    {
-        formIsValidSubmit = false;
-    }
-}
\ No newline at end of file
+</ComponentDemo>
\ No newline at end of file
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/BitActionButtonDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/BitActionButtonDemo.razor.cs
index 9c4b43558f..302cb210aa 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/BitActionButtonDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Buttons/BitActionButtonDemo.razor.cs
@@ -431,4 +431,27 @@ public partial class BitActionButtonDemo
             ]
         },
     ];
+
+
+
+    private bool formIsValidSubmit;
+    private ButtonValidationModel buttonValidationModel = new();
+
+    private async Task HandleValidSubmit()
+    {
+        formIsValidSubmit = true;
+
+        await Task.Delay(2000);
+
+        buttonValidationModel = new();
+
+        formIsValidSubmit = false;
+
+        StateHasChanged();
+    }
+
+    private void HandleInvalidSubmit()
+    {
+        formIsValidSubmit = false;
+    }
 }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/AppShell/BitAppShellDemo.razor
similarity index 60%
rename from src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor
rename to src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/AppShell/BitAppShellDemo.razor
index c8f12f1d69..13f7921925 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/AppShell/BitAppShellDemo.razor
@@ -1,13 +1,13 @@
-@page "/components/prolayout"
+@page "/components/appshell"
 
 @inherits AppComponentBase
 
-<PageOutlet Url="components/prolayout"
-            Title="ProLayout"
-            Description="prolayout component of the bit BlazorUI components" />
+<PageOutlet Url="components/appshell"
+            Title="AppShell"
+            Description="appshell component of the bit BlazorUI components" />
 
-<ComponentDemo ComponentName="ProLayout"
-               ComponentDescription="BitProLayout is an advanced container to handle the nuances of a cross-platform layout."
+<ComponentDemo ComponentName="AppShell"
+               ComponentDescription="BitAppShell is an advanced container to handle the nuances of a cross-platform layout."
                Notes="To use this component, you need to install the `Bit.BlazorUI.Extras` nuget package, as described in the Optional steps of the Getting started page."
                ComponentParameters="componentParameters"
                ComponentSubClasses="componentSubClasses">
@@ -16,8 +16,9 @@
             <div>Since this component is a base layout container, it is not possible to show its capabilities in a demo sample here.</div>
             <div>
                 You can always check our Boilerplate project template samples
-                (<a href="https://adminpanel.bitplatform.dev" target="_blank">AdminPanel</a> & <a href="https://todo.bitplatform.dev" target="_blank">Todo</a>)
-                to see the BitProLayout in action.
+                (<a href="https://adminpanel.bitplatform.dev" target="_blank">AdminPanel</a> &
+                <a href="https://todo.bitplatform.dev" target="_blank">Todo</a>)
+                to see the BitAppShell in action.
             </div>
         </ExamplePreview>
     </ComponentExampleBox>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/AppShell/BitAppShellDemo.razor.cs
similarity index 89%
rename from src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.cs
rename to src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/AppShell/BitAppShellDemo.razor.cs
index 714dbf8819..570afca29a 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/AppShell/BitAppShellDemo.razor.cs
@@ -1,6 +1,6 @@
-namespace Bit.BlazorUI.Demo.Client.Core.Pages.Components.Extras.ProLayout;
+namespace Bit.BlazorUI.Demo.Client.Core.Pages.Components.Extras.AppShell;
 
-public partial class BitProLayoutDemo
+public partial class BitAppShellDemo
 {
     private readonly List<ComponentParameter> componentParameters =
     [
@@ -23,7 +23,7 @@ public partial class BitProLayoutDemo
          new()
          {
             Name = "Classes",
-            Type = "BitProLayoutClassStyles?",
+            Type = "BitAppShellClassStyles?",
             DefaultValue = "null",
             Description = "Custom CSS classes for different parts of the layout.",
             LinkType = LinkType.Link,
@@ -32,7 +32,7 @@ public partial class BitProLayoutDemo
          new()
          {
             Name = "Styles",
-            Type = "BitProLayoutClassStyles?",
+            Type = "BitAppShellClassStyles?",
             DefaultValue = "null",
             Description = "Custom CSS styles for different parts of the layout.",
             LinkType = LinkType.Link,
@@ -74,7 +74,7 @@ public partial class BitProLayoutDemo
         new()
         {
             Id = "class-styles",
-            Title = "BitProLayoutClassStyles",
+            Title = "BitAppShellClassStyles",
             Parameters =
             [
                 new()
@@ -82,49 +82,49 @@ public partial class BitProLayoutDemo
                     Name = "Root",
                     Type = "string?",
                     DefaultValue = "null",
-                    Description = "Custom CSS classes/styles for the root of the BitProLayout.",
+                    Description = "Custom CSS classes/styles for the root of the BitAppShell.",
                 },
                 new()
                 {
                     Name = "Top",
                     Type = "string?",
                     DefaultValue = "null",
-                    Description = "Custom CSS classes/styles for the top area of the BitProLayout.",
+                    Description = "Custom CSS classes/styles for the top area of the BitAppShell.",
                 },
                 new()
                 {
                     Name = "Center",
                     Type = "string?",
                     DefaultValue = "null",
-                    Description = "Custom CSS classes/styles for the top center of the BitProLayout.",
+                    Description = "Custom CSS classes/styles for the top center of the BitAppShell.",
                 },
                 new()
                 {
                     Name = "Left",
                     Type = "string?",
                     DefaultValue = "null",
-                    Description = "Custom CSS classes/styles for the top left of the BitProLayout.",
+                    Description = "Custom CSS classes/styles for the top left of the BitAppShell.",
                 },
                 new()
                 {
                     Name = "Main",
                     Type = "string?",
                     DefaultValue = "null",
-                    Description = "Custom CSS classes/styles for the main area of the BitProLayout.",
+                    Description = "Custom CSS classes/styles for the main area of the BitAppShell.",
                 },
                 new()
                 {
                     Name = "Right",
                     Type = "string?",
                     DefaultValue = "null",
-                    Description = "Custom CSS classes/styles for the right area of the BitProLayout.",
+                    Description = "Custom CSS classes/styles for the right area of the BitAppShell.",
                 },
                 new()
                 {
                     Name = "Bottom",
                     Type = "string?",
                     DefaultValue = "null",
-                    Description = "Custom CSS classes/styles for the bottom area of the BitProLayout.",
+                    Description = "Custom CSS classes/styles for the bottom area of the BitAppShell.",
                 },
             ]
         }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/AppShell/BitAppShellDemo.razor.scss
similarity index 100%
rename from src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/ProLayout/BitProLayoutDemo.razor.scss
rename to src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/AppShell/BitAppShellDemo.razor.scss
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor
new file mode 100644
index 0000000000..5c683b628e
--- /dev/null
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor
@@ -0,0 +1,31 @@
+@page "/components/navpanel"
+
+@inherits AppComponentBase
+
+<PageOutlet Url="components/navpanel"
+            Title="NavPanel"
+            Description="navpanel component of the bit BlazorUI components" />
+
+<ComponentDemo ComponentName="NavPanel"
+               ComponentDescription="BitNavPanel is a navigation component specialized to be rendered in a vertical panel."
+               Notes="To use this component, you need to install the `Bit.BlazorUI.Extras` nuget package, as described in the Optional steps of the Getting started page."
+               ComponentParameters="componentParameters"
+               ComponentSubClasses="componentSubClasses">
+    <ComponentExampleBox Title="Basic" RazorCode="@example1RazorCode" CsharpCode="@example1CsharpCode" Id="example1">
+        <ExamplePreview>
+            <div style="display:flex; justify-content:center">
+                <BitToggleButton @bind-IsChecked="basicIsOpen" OnText="Close" OffText="Open" />
+            </div>
+            <BitNavPanel @bind-IsOpen="basicIsOpen" Items="basicNavItems" Togglable />
+        </ExamplePreview>
+    </ComponentExampleBox>
+
+    <ComponentExampleBox Title="RTL" RazorCode="@example2RazorCode" CsharpCode="@example2CsharpCode" Id="example2">
+        <ExamplePreview>
+            <div style="display:flex; justify-content:center">
+                <BitToggleButton @bind-IsChecked="rtlIsOpen" OnText="Close" OffText="Open" />
+            </div>
+            <BitNavPanel @bind-IsOpen="rtlIsOpen" Items="basicNavItems" Dir="BitDir.Rtl" Togglable Padded />
+        </ExamplePreview>
+    </ComponentExampleBox>
+</ComponentDemo>
\ No newline at end of file
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.cs
new file mode 100644
index 0000000000..3497c9812a
--- /dev/null
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.cs
@@ -0,0 +1,394 @@
+
+namespace Bit.BlazorUI.Demo.Client.Core.Pages.Components.Extras.NavPanel;
+
+public partial class BitNavPanelDemo
+{
+    private readonly List<ComponentParameter> componentParameters =
+    [
+         new()
+         {
+            Name = "Classes",
+            Type = "BitNavPanelClassStyles?",
+            DefaultValue = "null",
+            Description = "Custom CSS classes for different parts of the nav panel.",
+            Href = "#class-styles",
+            LinkType = LinkType.Link,
+         },
+         new()
+         {
+            Name = "EmptyListTemplate",
+            Type = "RenderFragment?",
+            DefaultValue = "null",
+            Description = "The custom template for when the search result is empty.",
+         },
+         new()
+         {
+            Name = "EmptyListMessage",
+            Type = "string?",
+            DefaultValue = "null",
+            Description = "The custom message for when the search result is empty.",
+         },
+         new()
+         {
+            Name = "Footer",
+            Type = "RenderFragment?",
+            DefaultValue = "null",
+            Description = "The custom template to render as the footer of the nav panel.",
+         },
+         new()
+         {
+            Name = "Header",
+            Type = "RenderFragment?",
+            DefaultValue = "null",
+            Description = "The custom template to render as the header of the nav panel.",
+         },
+         new()
+         {
+            Name = "IconUrl",
+            Type = "string?",
+            DefaultValue = "null",
+            Description = "The icon url to show in the header of the nav panel.",
+         },
+         new()
+         {
+            Name = "IsOpen",
+            Type = "bool",
+            DefaultValue = "false",
+            Description = "Determines if the nav panel is open in small screens.",
+         },
+         new()
+         {
+            Name = "IsToggled",
+            Type = "bool",
+            DefaultValue = "false",
+            Description = "Determines if the nav panel is in the toggled state.",
+         },
+         new()
+         {
+            Name = "Items",
+            Type = "IList<TItem>",
+            DefaultValue = "[]",
+            Description = "A collection of items to display in the nav panel.",
+         },
+         new()
+         {
+            Name = "NavClasses",
+            Type = "BitNavClassStyles?",
+            DefaultValue = "null",
+            Description = "Custom CSS classes for different parts of the nav component of the nav panel.",
+         },
+         new()
+         {
+            Name = "NavStyles",
+            Type = "BitNavClassStyles?",
+            DefaultValue = "null",
+            Description = "Custom CSS styles for different parts of the nav component of the nav panel.",
+         },
+         new()
+         {
+            Name = "OnItemClick",
+            Type = "EventCallback<TItem>",
+            DefaultValue = "",
+            Description = "Event fired up when an item is clicked.",
+         },
+         new()
+         {
+            Name = "SearchBoxClasses",
+            Type = "BitSearchBoxClassStyles?",
+            DefaultValue = "null",
+            Description = "Custom CSS classes for different parts of the search box of the nav panel.",
+         },
+         new()
+         {
+            Name = "SearchBoxPlaceholder",
+            Type = "string?",
+            DefaultValue = "null",
+            Description = "The placeholder of the input element of the search box of the nav panel.",
+         },
+         new()
+         {
+            Name = "SearchBoxStyles",
+            Type = "BitSearchBoxClassStyles?",
+            DefaultValue = "null",
+            Description = "Custom CSS styles for different parts of the search box of the nav panel.",
+         },
+         new()
+         {
+            Name = "Styles",
+            Type = "BitNavPanelClassStyles?",
+            DefaultValue = "null",
+            Description = "Custom CSS styles for different parts of the nav panel.",
+            Href = "#class-styles",
+            LinkType = LinkType.Link,
+         },
+         new()
+         {
+            Name = "Togglable",
+            Type = "bool",
+            DefaultValue = "false",
+            Description = "Enables the toggle feature of the nav panel.",
+         },
+         new()
+         {
+            Name = "Top",
+            Type = "int",
+            DefaultValue = "0",
+            Description = "The top CSS property value of the root element of the nav panel in px.",
+         },
+    ];
+
+    private readonly List<ComponentSubClass> componentSubClasses =
+    [
+        new()
+         {
+            Id = "class-styles",
+            Title = "BitNavPanelClassStyles",
+            Parameters=
+            [
+                new()
+                {
+                    Name = "Overlay",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the overlay of the BitNavPanel.",
+                },
+                new()
+                {
+                    Name = "Root",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the root element of the BitNavPanel.",
+                },
+                new()
+                {
+                    Name = "Container",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the container of the BitNavPanel.",
+                },
+                new()
+                {
+                    Name = "Header",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the header container of the BitNavPanel.",
+                },
+                new()
+                {
+                    Name = "HeaderIcon",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the header icon of the BitNavPanel.",
+                },
+                new()
+                {
+                    Name = "ToggleButton",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the toggle button of the BitNavPanel.",
+                },
+                new()
+                {
+                    Name = "SearchBox",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the search box of the BitNavPanel.",
+                },
+                new()
+                {
+                    Name = "ToggleSearchButton",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the toggle search button of the BitNavPanel.",
+                },
+                new()
+                {
+                    Name = "EmptyListMessage",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the empty list message of the BitNavPanel.",
+                },
+                new()
+                {
+                    Name = "Nav",
+                    Type = "string?",
+                    DefaultValue = "null",
+                    Description = "Custom CSS classes/styles for the nav component of the BitNavPanel.",
+                },
+            ]
+        }
+    ];
+
+
+
+    private bool basicIsOpen;
+    private bool rtlIsOpen;
+    private List<BitNavItem> basicNavItems =
+    [
+        new()
+        {
+            Text = "Home",
+            IconName = BitIconName.Home,
+            Url = "HomePage",
+        },
+        new()
+        {
+            Text = "AdminPanel",
+            IconName = BitIconName.Admin,
+            ChildItems =
+            [
+                new() {
+                    Text = "Dashboard",
+                    IconName = BitIconName.BarChartVerticalFill,
+                    Url = "DashboardPage",
+                },
+                new() {
+                    Text = "Categories",
+                    IconName = BitIconName.BuildQueue,
+                    Url = "CategoriesPage",
+                },
+                new() {
+                    Text = "Products",
+                    IconName = BitIconName.Product,
+                    Url = "ProductsPage",
+                }
+            ]
+        },
+        new()
+        {
+            Text = "Todo",
+            IconName = BitIconName.ToDoLogoOutline,
+            Url = "TodoPage",
+        },
+        new()
+        {
+            Text = "Settings",
+            IconName = BitIconName.Equalizer,
+            Url = "SettingsPage"
+        },
+        new()
+        {
+            Text = "Terms",
+            IconName = BitIconName.EntityExtraction,
+            Url = "TermsPage",
+        }
+    ];
+
+
+
+    private readonly string example1RazorCode = @"
+<BitToggleButton @bind-IsChecked=""basicIsOpen"" OnText=""Close"" OffText=""Open"" />
+
+<BitNavPanel @bind-IsOpen=""basicIsOpen"" Items=""basicNavItems"" Togglable />";
+    private readonly string example1CsharpCode = @"
+private bool basicIsOpen;
+
+private List<BitNavItem> basicNavItems =
+[
+    new()
+    {
+        Text = ""Home"",
+        IconName = BitIconName.Home,
+        Url = ""HomePage"",
+    },
+    new()
+    {
+        Text = ""AdminPanel"",
+        IconName = BitIconName.Admin,
+        ChildItems =
+        [
+            new() {
+                Text = ""Dashboard"",
+                IconName = BitIconName.BarChartVerticalFill,
+                Url = ""DashboardPage"",
+            },
+            new() {
+                Text = ""Categories"",
+                IconName = BitIconName.BuildQueue,
+                Url = ""CategoriesPage"",
+            },
+            new() {
+                Text = ""Products"",
+                IconName = BitIconName.Product,
+                Url = ""ProductsPage"",
+            }
+        ]
+    },
+    new()
+    {
+        Text = ""Todo"",
+        IconName = BitIconName.ToDoLogoOutline,
+        Url = ""TodoPage"",
+    },
+    new()
+    {
+        Text = ""Settings"",
+        IconName = BitIconName.Equalizer,
+        Url = ""SettingsPage""
+    },
+    new()
+    {
+        Text = ""Terms"",
+        IconName = BitIconName.EntityExtraction,
+        Url = ""TermsPage"",
+    }
+];";
+
+    private readonly string example2RazorCode = @"
+<BitToggleButton @bind-IsChecked=""rtlIsOpen"" OnText=""Close"" OffText=""Open"" />
+
+<BitNavPanel @bind-IsOpen=""rtlIsOpen"" Items=""basicNavItems"" Dir=""BitDir.Rtl"" Togglable Padded />";
+    private readonly string example2CsharpCode = @"
+private bool rtlIsOpen;
+
+private List<BitNavItem> basicNavItems =
+[
+    new()
+    {
+        Text = ""Home"",
+        IconName = BitIconName.Home,
+        Url = ""HomePage"",
+    },
+    new()
+    {
+        Text = ""AdminPanel"",
+        IconName = BitIconName.Admin,
+        ChildItems =
+        [
+            new() {
+                Text = ""Dashboard"",
+                IconName = BitIconName.BarChartVerticalFill,
+                Url = ""DashboardPage"",
+            },
+            new() {
+                Text = ""Categories"",
+                IconName = BitIconName.BuildQueue,
+                Url = ""CategoriesPage"",
+            },
+            new() {
+                Text = ""Products"",
+                IconName = BitIconName.Product,
+                Url = ""ProductsPage"",
+            }
+        ]
+    },
+    new()
+    {
+        Text = ""Todo"",
+        IconName = BitIconName.ToDoLogoOutline,
+        Url = ""TodoPage"",
+    },
+    new()
+    {
+        Text = ""Settings"",
+        IconName = BitIconName.Equalizer,
+        Url = ""SettingsPage""
+    },
+    new()
+    {
+        Text = ""Terms"",
+        IconName = BitIconName.EntityExtraction,
+        Url = ""TermsPage"",
+    }
+];";
+}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Layouts/Layout/BitLayoutDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Layouts/Layout/BitLayoutDemo.razor
index 87c7bec1ef..5c6946ff4a 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Layouts/Layout/BitLayoutDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Layouts/Layout/BitLayoutDemo.razor
@@ -1,7 +1,7 @@
 @page "/components/layout"
 
 <PageOutlet Url="components/layout"
-            Title="layout"
+            Title="Layout"
             Description="layout component of the bit BlazorUI components" />
 
 <ComponentDemo ComponentName="Layout"
@@ -26,18 +26,18 @@
         </ExamplePreview>
     </ComponentExampleBox>
 
-    <ComponentExampleBox Title="NavMenu" RazorCode="@example2RazorCode" CsharpCode="@example2CsharpCode" Id="example2">
+    <ComponentExampleBox Title="NavPanel" RazorCode="@example2RazorCode" CsharpCode="@example2CsharpCode" Id="example2">
         <ExamplePreview>
-            <BitToggle Label="Hide NavMenu" @bind-Value="hideNavMenu" />
+            <BitToggle Label="Hide NavPanel" @bind-Value="HideNavPanel" />
             <br />
             <div class="container">
-                <BitLayout HideNavMenu="hideNavMenu">
+                <BitLayout HideNavPanel="HideNavPanel">
                     <Header>
                         <div class="header">Header</div>
                     </Header>
-                    <NavMenu>
-                        <div class="nav-menu">NavMenu</div>
-                    </NavMenu>
+                    <NavPanel>
+                        <div class="nav-menu">NavPanel</div>
+                    </NavPanel>
                     <Main>
                         <div class="main">Main</div>
                     </Main>
@@ -55,36 +55,11 @@
                 <BitLayout Styles="@(new() { Main = "height: 19rem;" })" 
                            Classes="@(new() { Header = "header2",
                                               Main = "main2",
-                                              NavMenu = "nav-menu2",
+                                              NavPanel = "nav-menu2",
                                               MainContent = "main-content2",
                                               Footer = "footer2" })">
                     <Header>Header</Header>
-                    <NavMenu>NavMenu</NavMenu>
-                    <Main>Main</Main>
-                    <Footer>Footer</Footer>
-                </BitLayout>
-            </div>
-        </ExamplePreview>
-    </ComponentExampleBox>
-
-    <ComponentExampleBox Title="Customization" RazorCode="@example4RazorCode" Id="example4">
-        <ExamplePreview>
-            <div class="text-container">
-                <BitNumberField Label="Header height" @bind-Value="headerHeight" />
-                <BitNumberField Label="Footer height" @bind-Value="footerHeight" />
-            </div>
-            <br />
-            <div class="container">
-                <BitLayout HeaderHeight="headerHeight" 
-                           FooterHeight="footerHeight"
-                           Styles="@(new() { Root = "color: black;",
-                                             Header = "background: lightcoral;",
-                                             Main = "background: lightgreen;",
-                                             NavMenu = "padding: 1rem;",
-                                             MainContent = "padding: 1rem;",
-                                             Footer = "background: lightblue;" })">
-                    <Header>Header</Header>
-                    <NavMenu>NavMenu</NavMenu>
+                    <NavPanel>NavPanel</NavPanel>
                     <Main>Main</Main>
                     <Footer>Footer</Footer>
                 </BitLayout>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Layouts/Layout/BitLayoutDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Layouts/Layout/BitLayoutDemo.razor.cs
index 9762cf4716..1758c31bc0 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Layouts/Layout/BitLayoutDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Layouts/Layout/BitLayoutDemo.razor.cs
@@ -14,20 +14,6 @@ public partial class BitLayoutDemo
             Href = "#class-styles"
         },
         new()
-        {
-            Name = "FixedHeader",
-            Type = "bool",
-            DefaultValue = "false",
-            Description = "Enables fixed positioning of the header at the top of the viewport.",
-        },
-        new()
-        {
-            Name = "FixedFooter",
-            Type = "bool",
-            DefaultValue = "false",
-            Description = "Enables fixed positioning of the footer at the bottom of the viewport.",
-        },
-        new()
         {
             Name = "Footer",
             Type = "RenderFragment?",
@@ -35,13 +21,6 @@ public partial class BitLayoutDemo
             Description = "The content of the footer section.",
         },
         new()
-        {
-            Name = "FooterHeight",
-            Type = "int",
-            DefaultValue = "0",
-            Description = "The height of the footer to calculate heights and paddings.",
-        },
-        new()
         {
             Name = "Header",
             Type = "RenderFragment?",
@@ -50,17 +29,10 @@ public partial class BitLayoutDemo
         },
         new()
         {
-            Name = "HeaderHeight",
-            Type = "int",
-            DefaultValue = "0",
-            Description = "The height of the header to calculate heights and paddings.",
-        },
-        new()
-        {
-            Name = "HideNavMenu",
+            Name = "HideNavPanel",
             Type = "bool",
             DefaultValue = "false",
-            Description = "Hides NavMenu content when true.",
+            Description = "Hides NavPanel content when true.",
         },
         new()
         {
@@ -71,17 +43,17 @@ public partial class BitLayoutDemo
         },
         new()
         {
-            Name = "NavMenu",
+            Name = "NavPanel",
             Type = "RenderFragment?",
             DefaultValue = "null",
-            Description = "The content of the nav-menu section.",
+            Description = "The content of the nav panel section.",
         },
         new()
         {
-            Name = "StatusBarHeight",
+            Name = "NavPanelWidth",
             Type = "int",
             DefaultValue = "0",
-            Description = "The height of the status bar on mobile devices to calculate heights and paddings.",
+            Description = "The width of the nav panel section in px.",
         },
         new()
         {
@@ -91,7 +63,21 @@ public partial class BitLayoutDemo
             Description = "Custom CSS styles for different parts of the BitLayout.",
             LinkType = LinkType.Link,
             Href = "#class-styles"
-        }
+        },
+        new()
+        {
+            Name = "StickyFooter",
+            Type = "bool",
+            DefaultValue = "false",
+            Description = "Enables sticky positioning of the footer at the bottom of the viewport.",
+        },
+        new()
+        {
+            Name = "StickyHeader",
+            Type = "bool",
+            DefaultValue = "false",
+            Description = "Enables sticky positioning of the header at the top of the viewport.",
+        },
     ];
 
     private readonly List<ComponentSubClass> componentSubClasses =
@@ -125,7 +111,7 @@ public partial class BitLayoutDemo
                 },
                 new()
                 {
-                    Name = "NavMenu",
+                    Name = "NavPanel",
                     Type = "string?",
                     DefaultValue = "null",
                     Description = "Custom CSS classes/styles for the nav-menu section of the BitLayout."
@@ -150,10 +136,8 @@ public partial class BitLayoutDemo
 
 
 
-    private bool hideNavMenu;
+    private bool HideNavPanel;
 
-    private int headerHeight = 60;
-    private int footerHeight = 60;
 
 
     private readonly string example1RazorCode = @"
@@ -217,15 +201,15 @@ public partial class BitLayoutDemo
 </style>
 
 
-<BitToggle Label=""Hide NavMenu"" @bind-Value=""hideNavMenu"" />
+<BitToggle Label=""Hide NavPanel"" @bind-Value=""HideNavPanel"" />
 
-<BitLayout HideNavMenu=""hideNavMenu"">
+<BitLayout HideNavPanel=""HideNavPanel"">
     <Header>
         <div class=""header"">Header</div>
     </Header>
-    <NavMenu>
-        <div class=""nav-menu"">NavMenu</div>
-    </NavMenu>
+    <NavPanel>
+        <div class=""nav-menu"">NavPanel</div>
+    </NavPanel>
     <Main>
         <div class=""main"">Main</div>
     </Main>
@@ -234,7 +218,7 @@ public partial class BitLayoutDemo
     </Footer>
 </BitLayout>";
     private readonly string example2CsharpCode = @"
-private bool hideNavMenu;";
+private bool HideNavPanel;";
 
     private readonly string example3RazorCode = @"
 <style>
@@ -285,29 +269,11 @@ public partial class BitLayoutDemo
 <BitLayout Styles=""@(new() { Main = ""height: 19rem;"" })"" 
            Classes=""@(new() { Header = ""header2"",
                               Main = ""main2"",
-                              NavMenu = ""nav-menu2"",
+                              NavPanel = ""nav-menu2"",
                               MainContent = ""main-content2"",
                               Footer = ""footer2"" })"">
     <Header>Header</Header>
-    <NavMenu>NavMenu</NavMenu>
-    <Main>Main</Main>
-    <Footer>Footer</Footer>
-</BitLayout>";
-
-    private readonly string example4RazorCode = @"
-<BitNumberField Label=""Header height"" @bind-Value=""headerHeight"" />
-<BitNumberField Label=""Footer height"" @bind-Value=""footerHeight"" />
-
-<BitLayout HeaderHeight=""headerHeight"" 
-           FooterHeight=""footerHeight""
-           Styles=""@(new() { Root = ""color: black;"",
-                             Header = ""background: lightcoral;"",
-                             Main = ""background: lightgreen;"",
-                             NavMenu = ""padding: 1rem;"",
-                             MainContent = ""padding: 1rem;"",
-                             Footer = ""background: lightblue;"" })"">
-    <Header>Header</Header>
-    <NavMenu>NavMenu</NavMenu>
+    <NavPanel>NavPanel</NavPanel>
     <Main>Main</Main>
     <Footer>Footer</Footer>
 </BitLayout>";
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/ComponentsSection.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/ComponentsSection.razor
index 79f9ec0e34..17b3fc992a 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/ComponentsSection.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/ComponentsSection.razor
@@ -244,18 +244,21 @@
         </div>
         <div class="list">
             <BitText Typography="BitTypography.H6">Extras</BitText>
+            <BitLink Href="/components/appshell" title="AppShell" Style="display: flex">
+                <BitText Typography="BitTypography.Subtitle1">AppShell</BitText>
+            </BitLink>
             <BitLink Href="/components/datagrid" title="DataGrid" Style="display: flex">
                 <BitText Typography="BitTypography.Subtitle1">DataGrid</BitText>
             </BitLink>
             <BitLink Href="/components/chart" title="Chart" Style="display: flex">
                 <BitText Typography="BitTypography.Subtitle1">Chart</BitText>
             </BitLink>
+            <BitLink Href="/components/navpanel" title="NavPanel" Style="display: flex">
+                <BitText Typography="BitTypography.Subtitle1">NavPanel</BitText>
+            </BitLink>
             <BitLink Href="/components/pdfreader" title="PdfReader" Style="display: flex">
                 <BitText Typography="BitTypography.Subtitle1">PdfReader</BitText>
             </BitLink>
-            <BitLink Href="/components/prolayout" title="ProLayout" Style="display: flex">
-                <BitText Typography="BitTypography.Subtitle1">ProLayout</BitText>
-            </BitLink>
             <BitLink Href="/components/propanel" title="ProPanel" Style="display: flex">
                 <BitText Typography="BitTypography.Subtitle1">ProPanel</BitText>
             </BitLink>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/HeroSection.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/HeroSection.razor.scss
index ee05e66c7f..257e67e352 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/HeroSection.razor.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/HeroSection.razor.scss
@@ -1,4 +1,3 @@
-@import '../../Styles/abstracts/_vars.scss';
 @import '../../Styles/abstracts/_functions.scss';
 @import '../../Styles/abstracts/_media-queries.scss';
 @import '../../Styles/abstracts/_bit-css-variables.scss';
@@ -34,7 +33,6 @@
         margin-left: rem2(20px);
         transition: max-height 0.3s;
         border-bottom-left-radius: rem2(2px);
-        height: calc(100vh - #{$HeaderHeight});
 
         @include gt-md {
             max-height: rem2(700px);
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/HomePage.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/HomePage.razor.scss
index c34e42d3aa..f3e8d42fd5 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/HomePage.razor.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/HomePage.razor.scss
@@ -10,6 +10,7 @@
     box-sizing: border-box;
     flex-flow: column nowrap;
     justify-content: flex-start;
+    background-color: $bit-color-background-primary;
 }
 
 .homepage-section {
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/PopularComponents.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/PopularComponents.razor.scss
index 7af6958059..62f36f20a3 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/PopularComponents.razor.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Home/PopularComponents.razor.scss
@@ -1,5 +1,4 @@
-@import '../../Styles/abstracts/_vars.scss';
-@import '../../Styles/abstracts/_colors.scss';
+@import '../../Styles/abstracts/_colors.scss';
 @import '../../Styles/abstracts/_functions.scss';
 @import '../../Styles/abstracts/_media-queries.scss';
 @import '../../Styles/abstracts/_bit-css-variables.scss';
@@ -32,7 +31,7 @@
     }
 
     &.sample-side {
-        top: calc(rem2($HeaderHeight) + var(--bit-status-bar-height) + 5px);
+        top: rem2(70px);
         position: sticky;
     }
 }
@@ -58,15 +57,12 @@
     position: relative;
     display: inline-flex;
     flex-flow: row nowrap;
-    margin-top: rem2(10px);
-    -ms-user-select: none;
     text-decoration: none;
+    margin-top: rem2(10px);
     box-sizing: border-box;
-    -moz-user-select: none;
     align-items: flex-start;
     border-radius: rem2(2px);
     transition-property: all;
-    -webkit-user-select: none;
     transition-duration: 150ms;
     justify-content: flex-start;
     background-color: transparent;
@@ -82,8 +78,8 @@
         border-radius: 50%;
         align-items: center;
         min-width: rem2(36px);
-        margin-right: rem2(20px);
         justify-content: center;
+        margin-right: rem2(20px);
 
         @include lt-lg {
             margin-bottom: rem2(10px);
@@ -113,8 +109,8 @@
         text-align: left;
         font-weight: 400;
         letter-spacing: 0;
-        margin-top: rem2(5px);
         font-size: rem2(14px);
+        margin-top: rem2(5px);
         margin-bottom: rem2(5px);
         color: $bit-color-foreground-secondary;
     }
@@ -158,8 +154,8 @@
         min-height: rem2(200px);
 
         &::-webkit-scrollbar-thumb:hover {
-            background-color: #c8c6c4 !important;
             border-radius: rem2(8px);
+            background-color: #c8c6c4 !important;
             border: rem2(4px) solid #c8c6c4 !important;
         }
     }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Routes.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Routes.razor
index 573a0c452c..b8f9acca0e 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Routes.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Routes.razor
@@ -1,15 +1,17 @@
-<PageTitle>bit BlazorUI</PageTitle>
-<LayoutView Layout="@typeof(MainLayout)">
-    <Router AppAssembly="@GetType().Assembly"
-            AdditionalAssemblies="@(AssemblyLoadContext.Default.Assemblies.Where(asm => asm.GetName().Name?.Contains("Bit.BlazorUI.Demo") is true))">
-        <Found Context="routeData">
-            <RouteView RouteData="@routeData" />
-        </Found>
-        <NotFound>
-            <NotFoundComponent />
-        </NotFound>
-        <Navigating>
-            <LoadingComponent />
-        </Navigating>
-    </Router>
-</LayoutView>
\ No newline at end of file
+<AppErrorBoundary>
+    <PageTitle>bit BlazorUI</PageTitle>
+    <LayoutView Layout="@typeof(MainLayout)">
+        <Router AppAssembly="@GetType().Assembly"
+                AdditionalAssemblies="@(AssemblyLoadContext.Default.Assemblies.Where(asm => asm.GetName().Name?.Contains("Bit.BlazorUI.Demo") is true))">
+            <Found Context="routeData">
+                <RouteView RouteData="@routeData" />
+            </Found>
+            <NotFound>
+                <NotFoundComponent />
+            </NotFound>
+            <Navigating>
+                <LoadingComponent />
+            </Navigating>
+        </Router>
+    </LayoutView>
+</AppErrorBoundary>
\ No newline at end of file
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Routes.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Routes.razor.cs
index 5c64a2c14f..7b756f8d10 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Routes.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Routes.razor.cs
@@ -2,52 +2,12 @@
 
 public partial class Routes
 {
-    [AutoInject] IJSRuntime jsRuntime = default!;
-    [AutoInject] IBitDeviceCoordinator bitDeviceCoordinator = default!;
+    [AutoInject] BitExtraServices bitExtraServices = default!;
 
     protected override async Task OnInitializedAsync()
     {
-        if (AppRenderMode.IsBlazorHybrid)
-        {
-            await SetupBodyClasses();
-        }
+        await bitExtraServices.AddRootCssClasses();
 
         await base.OnInitializedAsync();
     }
-
-    private async Task SetupBodyClasses()
-    {
-        var cssClasses = new List<string> { };
-
-        if (OperatingSystem.IsWindows())
-        {
-            cssClasses.Add("bit-windows");
-        }
-        else if (OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst())
-        {
-            cssClasses.Add("bit-macos");
-        }
-        else if (OperatingSystem.IsIOS() && OperatingSystem.IsMacCatalyst() is false)
-        {
-            cssClasses.Add("bit-ios");
-        }
-        else if (OperatingSystem.IsAndroid())
-        {
-            cssClasses.Add("bit-android");
-        }
-
-        var cssVariables = new Dictionary<string, string>();
-        var statusBarHeight = bitDeviceCoordinator.GetStatusBarHeight();
-
-        if (OperatingSystem.IsMacCatalyst() is false)
-        {
-            //For iOS this is handled in css using safe-area env() variables
-            //For Android there's an issue with keyboard in fullscreen mode. more info: https://github.com/bitfoundation/bitplatform/issues/5626
-            //For Windows there's an issue with TitleBar. more info: https://github.com/bitfoundation/bitplatform/issues/5695
-            statusBarHeight = 0;
-        }
-
-        cssVariables.Add("--bit-status-bar-height", $"{statusBarHeight.ToString("F3", CultureInfo.InvariantCulture)}px");
-        await jsRuntime.ApplyBodyElementClasses(cssClasses, cssVariables);
-    }
 }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Scripts/app.ts b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Scripts/app.ts
index 7531b119c6..2c5319fc49 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Scripts/app.ts
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Scripts/app.ts
@@ -1,15 +1,5 @@
 declare var Prism: any;
 
-function toggleBodyOverflow(isMenuOpen: boolean) {
-    if (window.innerWidth < 901) {
-        if (isMenuOpen) {
-            document.body.style.overflow = "hidden";
-        } else {
-            document.body.style.overflow = "auto";
-        }
-    }
-}
-
 function scrollToElement(targetElementId: string) {
     const element = document.getElementById(targetElementId);
 
@@ -39,15 +29,6 @@ function highlightSnippet() {
     });
 }
 
-function goToTop() {
-    window.scrollTo({ top: 0 });
-}
-
-function applyBodyElementClasses(cssClasses: string[], cssVariables: any) {
-    cssClasses?.forEach(c => document.body.classList.add(c));
-    Object.keys(cssVariables).forEach(key => document.body.style.setProperty(key, cssVariables[key]));
-}
-
 declare class BitTheme { static init(options: any): void; };
 
 BitTheme.init({
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Services/NavManuService.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Services/NavManuService.cs
deleted file mode 100644
index a34bb93cae..0000000000
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Services/NavManuService.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Bit.BlazorUI.Demo.Client.Core.Services;
-
-public class NavManuService
-{
-    public event Func<Task> OnToggleMenu = default!;
-
-    public async Task ToggleMenu()
-    {
-        await OnToggleMenu.Invoke();
-    }
-}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor
index 3808234aaa..24f36c3620 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor
@@ -4,29 +4,32 @@
 {
     @ChildContent
 }
-else if (ErrorContent is null)
+else if (ErrorContent is not null)
 {
-    <div class="main">
-        <div class="header">
-            <BitButton IconName="@BitIconName.ChromeClose"
-                       Variant="BitVariant.Text"
-                       OnClick="Recover" />
-        </div>
-        <div>
-            <img src="_content/Bit.BlazorUI.Demo.Client.Core/images/icon/error-triangle.svg" />
-        </div>
-        <h1 class="title">Oops, something went wrong...</h1>
-        @if (ShowException)
-        {
-            <div class="exception">@CurrentException?.ToString()</div>
-        }
-        <div class="buttons">
-            <BitButton OnClick="Refresh" Variant="BitVariant.Fill">Refresh</BitButton>
-            <BitButton OnClick="GoHome" Variant="BitVariant.Outline">Home</BitButton>
-        </div>
-    </div>
+    @ErrorContent(CurrentException)
 }
 else
 {
-    @ErrorContent(CurrentException)
+    <main>
+        <BitStack Alignment="BitAlignment.Center">
+            <BitImage Src="_content/Bit.BlazorUI.Demo.Client.Core/images/icon/error-triangle.svg" />
+
+            <BitText Color="BitColor.Error" Typography="BitTypography.H3">
+                Oops, something went wrong...
+            </BitText>
+
+            @if (_showException)
+            {
+                <div class="exception">
+                    @CurrentException?.ToString()
+                </div>
+            }
+
+            <BitStack Horizontal Alignment="BitAlignment.Center" AutoHeight>
+                <BitButton OnClick="Refresh">Refresh</BitButton>
+                <BitButton OnClick="GoHome" Variant="BitVariant.Outline">Home</BitButton>
+                <BitButton OnClick="Recover" Variant="BitVariant.Outline">Recover</BitButton>
+            </BitStack>
+        </BitStack>
+    </main>
 }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor.cs
index 3e0bc1a246..9bcd2e2b66 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor.cs
@@ -2,16 +2,15 @@
 
 public partial class AppErrorBoundary
 {
-    [AutoInject] private IExceptionHandler _exceptionHandler = default!;
+    private bool _showException;
 
+    [AutoInject] private IExceptionHandler _exceptionHandler = default!;
     [AutoInject] private NavigationManager _navigationManager = default!;
 
-    private bool ShowException { get; set; }
-
 #if DEBUG
     protected override void OnInitialized()
     {
-        ShowException = true;
+        _showException = true;
     }
 #endif
 
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor.scss
index 2d05f8ce65..c772ea8b88 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppErrorBoundary.razor.scss
@@ -1,35 +1,15 @@
-@import '../Styles/abstracts/_colors.scss';
-@import '../Styles/abstracts/_functions.scss';
-@import '../Styles/abstracts/_bit-css-variables.scss';
+@import '../Styles/abstracts/_bit-css-variables.scss';
 
-.main {
+main {
     width: 100%;
-    display: flex;
-    padding: rem2(8px);
-    text-align: center;
-    max-width: rem2(800px);
-    flex-direction: column;
-    max-height: rem2(600px);
-    border-radius: rem2(2px);
-    background-color: $bit-color-background-primary;
-}
-
-.header {
-    text-align: right;
-}
-
-.title {
-    color: $bit-color-error;
+    height: 100%;
+    background-color: $bit-color-background-primary
 }
 
 .exception {
+    width: 90%;
+    margin: 1.5rem;
     overflow: auto;
     white-space: pre;
-    text-align: left;
-    margin: rem2(24px);
-    color: $bit-color-foreground-primary;
-}
-
-.buttons {
-    margin-bottom: rem2(24px);
+    text-align: start;
 }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Footer.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppFooter.razor
similarity index 94%
rename from src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Footer.razor
rename to src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppFooter.razor
index 7aee1c3723..b42a4cdd23 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Footer.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppFooter.razor
@@ -1,6 +1,6 @@
 @inherits AppComponentBase
 
-<footer class="@BitCss.Class.Color.Background.Primary">
+<div class="footer">
     <section>
         <div>
             <div class="bit-logo" />
@@ -23,7 +23,7 @@
                 <BitLink Href="https://github.com/bitfoundation/bitplatform/issues" Target="_blank">Github Issues</BitLink>
             </div>
 
-            <button class="go-to-top" onclick="goToTop()">Go to top</button>
+            <button class="go-to-top" @onclick="GoToTop">Go to top</button>
         </div>
     </section>
 
@@ -43,4 +43,4 @@
             <div class="copy-right-txt">Copyright © 2025 bit platform | All Rights Reserved </div>
         </div>
     </section>
-</footer>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppFooter.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppFooter.razor.cs
new file mode 100644
index 0000000000..02e651b97a
--- /dev/null
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppFooter.razor.cs
@@ -0,0 +1,14 @@
+namespace Bit.BlazorUI.Demo.Client.Core.Shared;
+
+public partial class AppFooter
+{
+    [Parameter] public BitAppShell? AppShell { get; set; }
+
+
+    private async Task GoToTop()
+    {
+        if (AppShell is null) return;
+
+        await AppShell.GoToTop();
+    }
+}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Footer.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppFooter.razor.scss
similarity index 98%
rename from src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Footer.razor.scss
rename to src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppFooter.razor.scss
index 0cabf1f446..d896ae8f18 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Footer.razor.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppFooter.razor.scss
@@ -2,13 +2,14 @@
 @import '../Styles/abstracts/_media-queries.scss';
 @import '../Styles/abstracts/_bit-css-variables.scss';
 
-footer {
+.footer {
     width: 100%;
     display: flex;
     align-items: center;
     box-sizing: border-box;
     flex-flow: column nowrap;
     justify-content: flex-start;
+    background-color: $bit-color-background-primary;
 }
 
 section {
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Header.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppHeader.razor
similarity index 70%
rename from src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Header.razor
rename to src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppHeader.razor
index 3e8ff16860..407e9f338f 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Header.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppHeader.razor
@@ -1,18 +1,20 @@
 @inherits AppComponentBase
 
-<header class="header @(_currentUrl == "/" ? "header--full-page" : null)">
-    <div class="container">
+<div class="header">
+    <div class="container@(IsHomePage ? " home-page" : "")">
         <div class="content">
-            @if (_currentUrl != "/")
+            @if (IsHomePage is false)
             {
-                <BitButton Class="menu-btn"
+                <BitButton FixedColor
+                           Class="menu-btn"
                            Variant="BitVariant.Text"
                            IconName="@BitIconName.CollapseMenu"
+                           Color="BitColor.SecondaryBackground"
                            OnClick=@WrapHandled(ToggleNavMenu) AriaLabel="Header menu button" />
             }
             <a class="logo" href="/" aria-label="Homepage"></a>
-            <a class="link @(_currentUrl == "/" ? "link--active" : "")" href="/">Home</a>
-            <a class="link @(_currentUrl != "/" ? "link--active" : "")" href="/overview">Docs</a>
+            <a class="link@(IsHomePage ? " active" : "")" href="/">Home</a>
+            <a class="link@(IsHomePage ? "" : " active")" href="/overview">Docs</a>
         </div>
         <div class="right-section">
             <a class="github-btn" target="_blank" aria-label="Github repository" href="https://github.com/bitfoundation/bitplatform"></a>
@@ -25,4 +27,4 @@
             </button>
         </div>
     </div>
-</header>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppHeader.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppHeader.razor.cs
new file mode 100644
index 0000000000..848f37f385
--- /dev/null
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppHeader.razor.cs
@@ -0,0 +1,32 @@
+using Microsoft.AspNetCore.Components.Routing;
+
+namespace Bit.BlazorUI.Demo.Client.Core.Shared;
+
+public partial class AppHeader
+{
+    private string _currentUrl = string.Empty;
+
+
+    [AutoInject] private BitThemeManager _bitThemeManager { get; set; } = default!;
+    [AutoInject] private IBitDeviceCoordinator _bitDeviceCoordinator { get; set; } = default!;
+
+
+    [Parameter] public bool IsHomePage { get; set; }
+    [Parameter] public EventCallback OnToggleNavPanel { get; set; }
+
+
+    protected override async Task OnInitAsync()
+    {
+        await base.OnInitAsync();
+    }
+
+    private async Task ToggleNavMenu()
+    {
+        await OnToggleNavPanel.InvokeAsync();
+    }
+
+    private async Task ToggleTheme()
+    {
+        await _bitDeviceCoordinator.ApplyTheme(await _bitThemeManager.ToggleDarkLightAsync() == "dark");
+    }
+}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Header.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppHeader.razor.scss
similarity index 83%
rename from src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Header.razor.scss
rename to src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppHeader.razor.scss
index d53abf8c8b..84843fae83 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Header.razor.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/AppHeader.razor.scss
@@ -1,30 +1,12 @@
-@import '../Styles/abstracts/_vars.scss';
-@import '../Styles/abstracts/_functions.scss';
+@import '../Styles/abstracts/_functions.scss';
 @import '../Styles/abstracts/_media-queries.scss';
 @import '../Styles/abstracts/_bit-css-variables.scss';
 
 .header {
-    top: 0;
     width: 100%;
-    z-index: 11;
-    position: fixed;
     backdrop-filter: blur(20px);
     box-shadow: $bit-box-shadow-1;
     -webkit-backdrop-filter: blur(20px);
-    padding-top: var(--bit-status-bar-height);
-    transition: top 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
-}
-
-.bit-ios {
-    .header {
-        padding-top: env(safe-area-inset-top);
-    }
-}
-
-.header--full-page {
-    .container {
-        max-width: rem2(1200px);
-    }
 }
 
 .container {
@@ -34,16 +16,20 @@
     margin-right: auto;
     align-items: center;
     flex-flow: row nowrap;
+    min-height: rem2(65px);
     box-sizing: border-box;
     padding-left: rem2(20px);
     padding-right: rem2(20px);
-    min-height: rem2($HeaderHeight);
     justify-content: space-between;
 
     @include lt-lg {
         padding-left: rem2(10px);
         padding-right: rem2(10px);
     }
+
+    &.home-page {
+        max-width: rem2(1200px);
+    }
 }
 
 .content {
@@ -78,11 +64,11 @@
     text-decoration: none;
     box-sizing: border-box;
     color: $bit-color-foreground-secondary;
-}
 
-.link--active {
-    font-weight: 600;
-    color: $bit-color-primary;
+    &.active {
+        font-weight: 600;
+        color: $bit-color-primary;
+    }
 }
 
 .right-section {
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Header.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Header.razor.cs
deleted file mode 100644
index 5eff77dd28..0000000000
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/Header.razor.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Microsoft.AspNetCore.Components.Routing;
-
-namespace Bit.BlazorUI.Demo.Client.Core.Shared;
-
-public partial class Header
-{
-    private string _currentUrl = string.Empty;
-    private bool _isHeaderMenuOpen;
-
-    [AutoInject] private NavManuService _menuService { get; set; } = default!;
-    [AutoInject] private IBitDeviceCoordinator _bitDeviceCoordinator { get; set; } = default!;
-    [AutoInject] private BitThemeManager _bitThemeManager { get; set; } = default!;
-
-    protected override async Task OnInitAsync()
-    {
-        _currentUrl = NavigationManager.Uri.Replace(NavigationManager.BaseUri, "/", StringComparison.Ordinal);
-
-        NavigationManager.LocationChanged += OnLocationChanged;
-
-        await base.OnInitAsync();
-    }
-
-    private void OnLocationChanged(object? sender, LocationChangedEventArgs args)
-    {
-        _currentUrl = NavigationManager.Uri.Replace(NavigationManager.BaseUri, "/", StringComparison.Ordinal);
-        StateHasChanged();
-    }
-
-    private async Task ToggleNavMenu()
-    {
-        _isHeaderMenuOpen = false;
-        await _menuService.ToggleMenu();
-    }
-
-    private async Task ToggleHeaderMenu()
-    {
-        try
-        {
-            _isHeaderMenuOpen = !_isHeaderMenuOpen;
-
-            await JSRuntime.ToggleBodyOverflow(_isHeaderMenuOpen);
-        }
-        catch (Exception ex)
-        {
-            ExceptionHandler.Handle(ex);
-        }
-        finally
-        {
-            StateHasChanged();
-        }
-    }
-
-    private async Task ToggleTheme()
-    {
-        await _bitDeviceCoordinator.ApplyTheme(await _bitThemeManager.ToggleDarkLightAsync() == "dark");
-    }
-}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor
index 7cbbc4fd76..957e62aa8f 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor
@@ -1,23 +1,27 @@
 @inherits LayoutComponentBase
 
-<div class="status-bar">@_pageTitle - bit BlazorUI</div>
+<BitAppShell @ref="_appShellRef">
+    <BitLayout HideNavPanel="_isHomePage" NavPanelWidth="_isNavPanelOpen ? 0 : 14*16" StickyHeader>
+        <Header>
+            <AppHeader IsHomePage="_isHomePage" OnToggleNavPanel="() => _isNavPanelOpen = true" />
+        </Header>
+        <NavPanel>
+            <BitNavPanel @bind-IsOpen="_isNavPanelOpen"
+                         Top="65"
+                         Items="_navItems"
+                         SearchBoxPlaceholder="Search component"
+                         SearchBoxStyles="@(new() { Root = "padding-inline:8px" })"
+                         OnItemClick="async (BitNavItem item) => await HandleOnNavItemClick()" />
+        </NavPanel>
+        <Main>
+            <div class="site-content">
+                @Body
+            </div>
+        </Main>
+        <Footer>
+            <AppFooter AppShell="_appShellRef" />
+        </Footer>
+    </BitLayout>
+</BitAppShell>
 
-<Header />
-
-<main class="@($"{BitCss.Class.Color.Background.Primary}{(CurrentUrl == "/" ? " full-page" : "")}")">
-    @if (CurrentUrl != "/")
-    {
-        <NavMenu />
-    }
-
-    <div class="site-content">
-        <AppErrorBoundary>
-            @Body
-        </AppErrorBoundary>
-
-    </div>
-</main>
-
-<Footer />
-
-<MessageBox />
\ No newline at end of file
+<MessageBox />
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.NavItems.cs
similarity index 76%
rename from src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.cs
rename to src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.NavItems.cs
index 88e59091ab..4d4f9dc40b 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.NavItems.cs
@@ -1,13 +1,9 @@
 namespace Bit.BlazorUI.Demo.Client.Core.Shared;
 
-public partial class NavMenu : IDisposable
+public partial class MainLayout
 {
-    private bool _disposed;
-    private bool _isNavOpen = false;
-    private string _searchText = string.Empty;
-    private List<BitNavItem> _flatNavItemList = default!;
-    private List<BitNavItem> _filteredNavItems = default!;
-    private readonly List<BitNavItem> _allNavItems =
+
+    private readonly List<BitNavItem> _navItems =
     [
         new() { Text = "Overview", Url = "/overview" },
         new() { Text = "Getting started", Url = "/getting-started" },
@@ -155,13 +151,14 @@ public partial class NavMenu : IDisposable
             [
                 new() { Text = "DataGrid", Url = "/components/datagrid", AdditionalUrls = ["/components/data-grid"] },
                 new() { Text = "Chart", Url = "/components/chart" },
+                new() { Text = "NavPanel", Url = "/components/navpanel" },
                 new() { Text = "PdfReader", Url = "/components/pdfreader" },
-                new() { Text = "ProLayout", Url = "/components/prolayout" },
+                new() { Text = "AppShell", Url = "/components/appshell" },
                 new() { Text = "ProPanel", Url = "/components/propanel" },
-                new() 
-                { 
+                new()
+                {
                     Text = "Services",
-                    ChildItems = 
+                    ChildItems =
                     [
                         new() { Text = "ModalService", Url = "/components/modalservice" },
                     ]
@@ -171,84 +168,4 @@ public partial class NavMenu : IDisposable
         new() { Text = "Iconography", Url = "/iconography" },
         new() { Text = "Theming", Url = "/theming" },
     ];
-
-
-    [Inject] public NavManuService _navMenuService { get; set; } = default!;
-
-
-    protected override async Task OnInitAsync()
-    {
-        _flatNavItemList = Flatten(_allNavItems).ToList().FindAll(link => !string.IsNullOrEmpty(link.Url));
-
-        HandleClear();
-        _navMenuService.OnToggleMenu += ToggleMenu;
-
-        await base.OnInitAsync();
-    }
-
-
-    private async Task ToggleMenu()
-    {
-        try
-        {
-            _isNavOpen = !_isNavOpen;
-
-            await JSRuntime.ToggleBodyOverflow(_isNavOpen);
-        }
-        catch (Exception ex)
-        {
-            ExceptionHandler.Handle(ex);
-        }
-        finally
-        {
-            StateHasChanged();
-        }
-    }
-
-    private void HandleClear()
-    {
-        _filteredNavItems = _allNavItems;
-    }
-
-    private void HandleChange(string text)
-    {
-        _searchText = text;
-        _filteredNavItems = _allNavItems;
-        if (string.IsNullOrEmpty(text)) return;
-
-        var mainItems = _flatNavItemList
-                            .FindAll(item => text.Split(' ')
-                                                 .Where(t => t.HasValue())
-                                                 .Any(t => $"{item.Text} {item.Description}".Contains(t, StringComparison.InvariantCultureIgnoreCase)));
-
-        var subItems = _flatNavItemList
-                            .FindAll(item => text.Split(' ')
-                                                 .Where(t => t.HasValue())
-                                                 .Any(t => item.Data?.ToString()?.Contains(t, StringComparison.InvariantCultureIgnoreCase) ?? false));
-
-        _filteredNavItems = [.. mainItems, .. subItems];
-    }
-
-    private async Task HandleOnItemClick(BitNavItem item)
-    {
-        if (item.Url.HasNoValue()) return;
-
-        _searchText = string.Empty;
-        _filteredNavItems = _allNavItems;
-
-        await ToggleMenu();
-    }
-
-    private static IEnumerable<BitNavItem> Flatten(IEnumerable<BitNavItem> e) => e.SelectMany(c => Flatten(c.ChildItems)).Concat(e);
-
-    public override void Dispose()
-    {
-        if (_disposed) return;
-
-        _navMenuService.OnToggleMenu -= ToggleMenu;
-
-        _disposed = true;
-
-        base.Dispose();
-    }
 }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.cs
index d0beca2977..6f54771e9c 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.cs
@@ -4,18 +4,17 @@ namespace Bit.BlazorUI.Demo.Client.Core.Shared;
 
 public partial class MainLayout : IDisposable
 {
+    private bool _isHomePage;
     private string? _pageTitle;
+    private bool _isNavPanelOpen;
     private Action _unsubscribe = default!;
-
-    [AutoInject] private IPrerenderStateService _prerenderStateService = default!;
+    private BitAppShell _appShellRef = default!;
 
     [AutoInject] private IPubSubService _pubSubService = default!;
-
     [AutoInject] private IExceptionHandler _exceptionHandler = default!;
-
     [AutoInject] private NavigationManager _navigationManager = default!;
+    [AutoInject] private IPrerenderStateService _prerenderStateService = default!;
 
-    public string? CurrentUrl { get; set; }
 
     protected override void OnParametersSet()
     {
@@ -52,9 +51,17 @@ private void OnLocationChanged(object? sender, LocationChangedEventArgs args)
 
     private void SetCurrentUrl()
     {
-        CurrentUrl = _navigationManager.Uri.Replace(_navigationManager.BaseUri, "/", StringComparison.InvariantCultureIgnoreCase);
+        var url = _navigationManager.Uri.Replace(_navigationManager.BaseUri, "/", StringComparison.InvariantCultureIgnoreCase);
+        _isHomePage = url == "/";
     }
 
+    private async Task HandleOnNavItemClick()
+    {
+        await Task.Delay(1);
+        await _appShellRef.GoToTop();
+    }
+
+
     public void Dispose()
     {
         _unsubscribe.Invoke();
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.scss
index dc2f934ed3..73f2d2e832 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.scss
@@ -1,52 +1,30 @@
-@import '../Styles/abstracts/_vars.scss';
-@import '../Styles/abstracts/_colors.scss';
+@import '../Styles/abstracts/_colors.scss';
 @import '../Styles/abstracts/_functions.scss';
 @import '../Styles/abstracts/_media-queries.scss';
 @import '../Styles/abstracts/_bit-css-variables.scss';
 
-main {
+.site-content {
     width: 100%;
-    display: flex;
-    min-height: 100vh;
+    margin: 0 auto;
     position: relative;
-    box-sizing: border-box;
-    justify-content: flex-start;
-    padding-top: calc(rem2($HeaderHeight) + var(--bit-status-bar-height));
-
-    &.full-page {
-        .site-content {
-            padding: 0;
-            max-width: 100%;
-            background-color: unset;
-        }
-    }
+    background-color: $bit-color-background-secondary;
+}
 
-    .site-content {
+::deep {
+    .page-container {
         width: 100%;
+        padding: 2rem;
         margin: 0 auto;
-        position: relative;
-        padding: rem2(40px);
-        max-width: calc(100% - $NavMenuWidth);
-        background-color: $bit-color-background-secondary;
+        max-width: rem2(1200px);
 
         @include md {
-            max-width: 100%;
-            padding: rem2(30px);
+            padding: 1.5rem;
         }
 
         @include sm {
-            max-width: 100%;
-            padding: rem2(20px);
+            padding: 1rem;
         }
     }
-}
-
-::deep {
-    .page-container {
-        width: 100%;
-        margin: 0 auto;
-        max-width: rem2(1200px);
-    }
 
     .page-section {
         width: 100%;
@@ -91,126 +69,89 @@ main {
             margin-right: rem2(90px);
         }
     }
-}
 
-.bit-ios {
-    main {
-        padding-top: calc(rem2($HeaderHeight) + env(safe-area-inset-top));
+    .example-desc {
+        margin-bottom: rem2(8px);
     }
-}
 
-::deep .example-desc {
-    margin-bottom: rem2(8px);
-}
-
-::deep pre {
-    margin: 0;
-    width: 100%;
-    display: flex;
-    overflow: auto;
-    direction: ltr;
-    border-top: none;
-    flex-flow: column;
-    position: relative;
-    min-height: rem2(70px);
-    max-height: rem2(464px);
-    box-sizing: border-box;
-    align-items: flex-start;
-    justify-content: flex-start;
-    padding: 24px 80px 24px 24px;
-    border: rem2(1px) solid $bit-color-border-primary;
-    font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
-
-    &::-webkit-scrollbar {
-        width: rem2(8px);
-    }
+    pre {
+        margin: 0;
+        width: 100%;
+        display: flex;
+        overflow: auto;
+        direction: ltr;
+        border-top: none;
+        flex-flow: column;
+        position: relative;
+        min-height: rem2(70px);
+        max-height: rem2(464px);
+        box-sizing: border-box;
+        align-items: flex-start;
+        justify-content: flex-start;
+        padding: 24px 80px 24px 24px;
+        border: rem2(1px) solid $bit-color-border-primary;
+        font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
+
+        &::-webkit-scrollbar {
+            width: rem2(8px);
+        }
 
-    &::-webkit-scrollbar-thumb {
-        border-radius: rem2(8px);
-        border: rem2(4px) solid #c8c6c4;
-    }
+        &::-webkit-scrollbar-thumb {
+            border-radius: rem2(8px);
+            border: rem2(4px) solid #c8c6c4;
+        }
 
-    &::-webkit-scrollbar-button {
-        display: none;
-    }
+        &::-webkit-scrollbar-button {
+            display: none;
+        }
 
-    &::-webkit-scrollbar-thumb:hover {
-        border-radius: rem2(8px);
-        border: rem2(4px) solid $B3Color;
-    }
+        &::-webkit-scrollbar-thumb:hover {
+            border-radius: rem2(8px);
+            border: rem2(4px) solid $B3Color;
+        }
 
-    &::-webkit-scrollbar:horizontal {
-        height: rem2(8);
+        &::-webkit-scrollbar:horizontal {
+            height: rem2(8);
+        }
     }
-}
 
-::deep code {
-    line-height: 1.5;
-    font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
+    code {
+        line-height: 1.5;
+        font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
 
-    span {
-        font-family: inherit;
+        span {
+            font-family: inherit;
+        }
     }
-}
-
-::deep ::-webkit-scrollbar-thumb {
-    border-radius: 16px;
-    background-color: $bit-color-foreground-secondary;
-}
-
-.status-bar {
-    top: 0;
-    z-index: 12;
-    width: 100%;
-    display: none;
-    position: fixed;
-    overflow: hidden;
-    text-align: center;
-    align-items: center;
-    font-size: rem2(14px);
-    justify-content: center;
-    color: $bit-color-background-primary;
-    background-color: $bit-color-background-primary;
-}
 
-.bit-windows, .bit-macos {
-    .status-bar {
-        display: flex;
-        background-color: transparent;
-        height: var(--bit-status-bar-height);
-        color: $bit-color-foreground-primary;
+    ::-webkit-scrollbar-thumb {
+        border-radius: 16px;
+        background-color: $bit-color-foreground-secondary;
     }
-}
 
-.bit-ios .status-bar {
-    display: flex;
-    color: transparent;
-    background-color: transparent;
-    height: env(safe-area-inset-top);
-}
-
-::deep .code-box {
-    width: 100%;
-    display: flex;
-    padding: 1rem;
-    overflow-x: auto;
-    user-select: text;
-    white-space: nowrap;
-    align-items: center;
-    margin: rem2(16px) 0;
-    box-sizing: border-box;
-    -webkit-user-select: text;
-    justify-content: flex-start;
-    background-color: $bit-color-background-secondary;
-    border-left: rem2(4px) solid $bit-color-border-secondary;
-    font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
+    .code-box {
+        width: 100%;
+        display: flex;
+        padding: 1rem;
+        overflow-x: auto;
+        user-select: text;
+        white-space: nowrap;
+        align-items: center;
+        margin: rem2(16px) 0;
+        box-sizing: border-box;
+        -webkit-user-select: text;
+        justify-content: flex-start;
+        background-color: $bit-color-background-secondary;
+        border-left: rem2(4px) solid $bit-color-border-secondary;
+        font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
 
-    &::-webkit-scrollbar {
-        height: rem2(5px);
-    }
+        &::-webkit-scrollbar {
+            height: rem2(5px);
+        }
 
-    &::-webkit-scrollbar-thumb {
-        border-radius: rem2(8px);
-        background-color: $bit-color-border-secondary;
+        &::-webkit-scrollbar-thumb {
+            border-radius: rem2(8px);
+            background-color: $bit-color-border-secondary;
+        }
     }
 }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor
deleted file mode 100644
index d559ebb931..0000000000
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor
+++ /dev/null
@@ -1,32 +0,0 @@
-@inherits AppComponentBase
-
-@if (_isNavOpen)
-{
-    <div class="nav-menu-overlay nav-menu--mobile" @onclick="@ToggleMenu"></div>
-}
-<div class="nav-menu @(_isNavOpen is false ? "nav-menu--desktop" : null)">
-    <div class="search-box-container">
-        <BitSearchBox Underlined
-                      Immediate
-                      DebounceTime="300"
-                      Value="@_searchText"
-                      OnClear="@HandleClear"
-                      Class="nav-menu-search-box"
-                      ValueChanged="@HandleChange"
-                      IconName="@BitIconName.Search"
-                      Placeholder="Search components" />
-        @if (_filteredNavItems.Count == 0)
-        {
-            <br />
-            <div>nothing found!</div>
-        }
-    </div>
-    <div class="nav-menu-list">
-        <BitNav Class="side-nav"
-                Items="_filteredNavItems"
-                AriaLabel="bit BlazorUI Nav"
-                OnItemClick="WrapHandled<BitNavItem>(HandleOnItemClick)">
-        </BitNav>
-        <div style="height:50px"></div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.scss
deleted file mode 100644
index 68273cef06..0000000000
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.scss
+++ /dev/null
@@ -1,82 +0,0 @@
-@import '../Styles/abstracts/_vars.scss';
-@import '../Styles/abstracts/_functions.scss';
-@import '../Styles/abstracts/_media-queries.scss';
-@import '../Styles/abstracts/_bit-css-variables.scss';
-
-.nav-menu {
-    left: 0;
-    outline: 0;
-    z-index: 1;
-    display: flex;
-    flex-shrink: 0;
-    flex: 1 0 auto;
-    position: sticky;
-    overflow-y: auto;
-    flex-direction: column;
-    width: rem2($NavMenuWidth);
-    max-width: rem2($NavMenuWidth);
-    background-color: $bit-color-background-primary;
-    top: calc(rem2($HeaderHeight) + var(--bit-status-bar-height));
-    height: calc(100vh - rem2($HeaderHeight) - var(--bit-status-bar-height));
-
-    @include lt-lg {
-        top: 0;
-        inset: 0;
-        z-index: 13;
-        height: 100vh;
-        position: fixed;
-        border-radius: 0 rem2(10px) rem2(10px) 0;
-        padding-top: var(--bit-status-bar-height);
-    }
-}
-
-.bit-ios {
-    .nav-menu {
-        padding-top: env(safe-area-inset-top);
-    }
-}
-
-.nav-menu--desktop {
-    display: flex;
-
-    @include lt-lg {
-        display: none;
-    }
-}
-
-.nav-menu--mobile {
-    display: none;
-
-    @include lt-lg {
-        display: block;
-    }
-}
-
-.nav-menu-overlay {
-    inset: 0;
-    z-index: 12;
-    position: fixed;
-    background-color: $bit-color-background-overlay;
-}
-
-.search-box-container {
-    width: 100%;
-    box-sizing: border-box;
-    padding: rem2(24px) rem2(22px);
-}
-
-.nav-menu-list {
-    width: 100%;
-    overflow-y: auto;
-    overflow-x: hidden;
-    box-sizing: border-box;
-    height: calc(100% - #{rem2(89px)});
-
-    &::-webkit-scrollbar {
-        width: rem2(0px);
-    }
-}
-
-::deep a {
-    text-decoration: none;
-}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/abstracts/_media-queries.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/abstracts/_media-queries.scss
index 1fee942fce..546e1dca22 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/abstracts/_media-queries.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/abstracts/_media-queries.scss
@@ -6,11 +6,11 @@
 $screen-xl-min: rem2(1201px);
 $screen-xl-max: rem2(1920px);
 
-$screen-lg-min: rem2(901px);
+$screen-lg-min: rem2(961px);
 $screen-lg-max: rem2(1200px);
 
 $screen-md-min: rem2(601px);
-$screen-md-max: rem2(900px);
+$screen-md-max: rem2(960px);
 
 $screen-sm-max: rem2(600px);
 
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/abstracts/_vars.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/abstracts/_vars.scss
deleted file mode 100644
index fb14089f32..0000000000
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/abstracts/_vars.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-$NavMenuWidth: 300px;
-$HeaderHeight: 65px;
-$HeaderSecondRowHeight: 44px;
\ No newline at end of file
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/app.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/app.scss
index 14b32caf51..9fd6161176 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/app.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Styles/app.scss
@@ -1,10 +1,6 @@
 @import 'abstracts/_functions.scss';
 @import 'abstracts/_bit-css-variables.scss';
 
-:root {
-    --bit-status-bar-height: 0px;
-}
-
 * {
     box-sizing: border-box;
     font-family: "Segoe UI";
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/compilerconfig.json b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/compilerconfig.json
index d9e1a8c69c..fd12fc508f 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/compilerconfig.json
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/compilerconfig.json
@@ -47,6 +47,12 @@
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
+    {
+        "outputFile": "Pages/Components/Extras/AppShell/BitAppShellDemo.razor.css",
+        "inputFile": "Pages/Components/Extras/AppShell/BitAppShellDemo.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
     {
         "outputFile": "Pages/Components/Extras/Chart/BitChartDemo.razor.css",
         "inputFile": "Pages/Components/Extras/Chart/BitChartDemo.razor.scss",
@@ -498,26 +504,26 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/MainLayout.razor.css",
-        "inputFile": "Shared/MainLayout.razor.scss",
+        "outputFile": "Shared/AppErrorBoundary.razor.css",
+        "inputFile": "Shared/AppErrorBoundary.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/Footer.razor.css",
-        "inputFile": "Shared/Footer.razor.scss",
+        "outputFile": "Shared/AppFooter.razor.css",
+        "inputFile": "Shared/AppFooter.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/NavMenu.razor.css",
-        "inputFile": "Shared/NavMenu.razor.scss",
+        "outputFile": "Shared/AppHeader.razor.css",
+        "inputFile": "Shared/AppHeader.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/Header.razor.css",
-        "inputFile": "Shared/Header.razor.scss",
+        "outputFile": "Shared/MainLayout.razor.css",
+        "inputFile": "Shared/MainLayout.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -527,12 +533,6 @@
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
-    {
-        "outputFile": "Shared/AppErrorBoundary.razor.css",
-        "inputFile": "Shared/AppErrorBoundary.razor.scss",
-        "minify": { "enabled": false },
-        "options": { "sourceMap": false }
-    },
     {
         "outputFile": "Shared/MessageBox.razor.css",
         "inputFile": "Shared/MessageBox.razor.scss",
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/wwwroot/index.html b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/wwwroot/index.html
index 0076c2e05e..01cbb664c3 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/wwwroot/index.html
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/wwwroot/index.html
@@ -19,9 +19,9 @@
     <link rel="preload" href="_content/Bit.BlazorUI.Assets/fonts/segoe-ui-semilight.woff2" as="font" type="font/woff2" crossorigin>
 
     <link rel="stylesheet" href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
+    <link rel="stylesheet" href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" />
     <link rel="stylesheet" href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
     <link rel="stylesheet" href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
-    <link rel="stylesheet" href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" />
     <link rel="stylesheet" href="_content/Bit.BlazorUI.Demo.Client.Core/styles/app.css" />
     <link rel="stylesheet" href="Bit.BlazorUI.Demo.Client.Windows.styles.css" />
     <link rel="stylesheet" href="Bit.BlazorUI.Demo.Client.Maui.styles.css" />

From 36e1add43f2b94e66f86064a6729fd1f62707ec4 Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Mon, 30 Dec 2024 20:42:27 +0330
Subject: [PATCH 14/28] feat(prerelease): v-9.2.0-pre-01 #9563 (#9564)

---
 src/Besql/Bit.Besql/wwwroot/bit-besql.js       |  2 +-
 src/Bit.Build.props                            |  2 +-
 src/BlazorUI/Bit.BlazorUI/Scripts/general.ts   |  2 +-
 .../Bit.BlazorUI.Demo.Server.csproj            |  4 ++--
 .../Bit.BlazorUI.Demo.Shared.csproj            |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Core.csproj       |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Maui.csproj       |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Web.csproj        |  6 +++---
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.BlazorUI.Demo.Client.Windows.csproj    |  4 ++--
 src/BlazorUI/Demo/Directory.Build.props        |  2 +-
 .../Bit.Bswup.Demo/wwwroot/service-worker.js   |  2 +-
 .../wwwroot/service-worker.published.js        |  2 +-
 .../wwwroot/service-worker.js                  |  2 +-
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.Bswup/Scripts/bit-bswup.progress.ts    |  2 +-
 src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts    |  2 +-
 src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts       |  2 +-
 .../FullDemo/Client/wwwroot/service-worker.js  |  2 +-
 .../Client/wwwroot/service-worker.published.js |  2 +-
 src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts    |  2 +-
 src/Bup/Bit.Bup/Scripts/bit-bup.ts             |  2 +-
 src/Butil/Bit.Butil/Scripts/butil.ts           |  2 +-
 .../BlazorEmpty.Client.csproj                  |  8 ++++----
 .../BlazorEmpty/BlazorEmpty.csproj             |  8 ++++----
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.Boilerplate/src/Directory.Build.props  |  2 +-
 .../src/Directory.Packages.props               | 18 +++++++++---------
 .../src/Directory.Packages8.props              | 18 +++++++++---------
 .../Bit.Websites.Careers.Client.csproj         | 10 +++++-----
 .../Bit.Websites.Careers.Server.csproj         |  4 ++--
 .../Bit.Websites.Careers.Shared.csproj         |  4 ++--
 src/Websites/Careers/src/Directory.Build.props |  2 +-
 .../Bit.Websites.Platform.Client.csproj        | 12 ++++++------
 .../Templates03GettingStartedPage.razor        |  4 ++--
 .../Templates03GettingStartedPage.razor.cs     |  2 +-
 .../Bit.Websites.Platform.Server.csproj        |  4 ++--
 .../Bit.Websites.Platform.Shared.csproj        |  4 ++--
 .../Platform/src/Directory.Build.props         |  2 +-
 .../Bit.Websites.Sales.Client.csproj           | 10 +++++-----
 .../Bit.Websites.Sales.Server.csproj           |  4 ++--
 .../Bit.Websites.Sales.Shared.csproj           |  4 ++--
 src/Websites/Sales/src/Directory.Build.props   |  2 +-
 43 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/src/Besql/Bit.Besql/wwwroot/bit-besql.js b/src/Besql/Bit.Besql/wwwroot/bit-besql.js
index a7229e8651..15294a1618 100644
--- a/src/Besql/Bit.Besql/wwwroot/bit-besql.js
+++ b/src/Besql/Bit.Besql/wwwroot/bit-besql.js
@@ -1,5 +1,5 @@
 var BitBesql = window.BitBesql || {};
-BitBesql.version = window['bit-besql version'] = '9.1.2';
+BitBesql.version = window['bit-besql version'] = '9.2.0-pre-01';
 
 BitBesql.init = async function init(fileName) {
     const sqliteFilePath = `/${fileName}`;
diff --git a/src/Bit.Build.props b/src/Bit.Build.props
index 5735276475..4e528195f7 100644
--- a/src/Bit.Build.props
+++ b/src/Bit.Build.props
@@ -27,7 +27,7 @@
 		<PackageProjectUrl>https://github.com/bitfoundation/bitplatform</PackageProjectUrl>
 
 		<!-- Version -->
-		<ReleaseVersion>9.1.2</ReleaseVersion>
+		<ReleaseVersion>9.2.0-pre-01</ReleaseVersion>
   		<PackageVersion>$(ReleaseVersion)</PackageVersion>
 		<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)</PackageReleaseNotes>
 		<Version Condition=" '$(Configuration)' == 'Release' ">$([System.String]::Copy($(ReleaseVersion)).Replace('-pre-', '.'))</Version>
diff --git a/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts b/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
index 439d021720..7f00cba13e 100644
--- a/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
+++ b/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
@@ -1,4 +1,4 @@
-(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '9.1.2';
+(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '9.2.0-pre-01';
 
 interface DotNetObject {
     invokeMethod<T>(methodIdentifier: string, ...args: any[]): T;
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
index 80815d7c14..ccd9fb8e34 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
@@ -5,11 +5,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
index 2ec56da0bd..c298c2ff08 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
@@ -5,11 +5,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
index 8f446710aa..21bf43c6b3 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
@@ -16,11 +16,11 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
index a78bc9e22f..e15472cdef 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
@@ -85,12 +85,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
index fa833eaa74..1026d95260 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
@@ -24,13 +24,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.Bswup" Version="9.1.2" />
+        <PackageReference Include="Bit.Bswup" Version="9.2.0-pre-01" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
index cbf2648732..b450079a2f 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.1.2
+// bit version: 9.2.0-pre-01
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 self.assetsInclude = [];
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
index 0964aff69a..c8e98a026a 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
@@ -29,11 +29,11 @@
         <Using Include="Bit.BlazorUI.Demo.Client.Core.Services" />
         <Using Include="Bit.BlazorUI.Demo.Shared" />
         <Watch Remove="*.scss" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Directory.Build.props b/src/BlazorUI/Demo/Directory.Build.props
index 3cb6a10806..b9bc35054f 100644
--- a/src/BlazorUI/Demo/Directory.Build.props
+++ b/src/BlazorUI/Demo/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-bp template v-9.1.2 -->
+<!-- Generated by bit-bp template v-9.2.0-pre-01 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
index f947871964..e2d5520106 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.1.2
+// bit version: 9.2.0-pre-01
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
index 0a69c38c32..29d8832622 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.1.2
+// bit version: 9.2.0-pre-01
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
index b21dcb871a..a9b44b0d59 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.1.2
+// bit version: 9.2.0-pre-01
 
 // In development, always fetch from the network and do not enable offline support.
 // This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
index 093c23c631..277910ac04 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.1.2
+// bit version: 9.2.0-pre-01
 
 self.assetsInclude = [];
 self.assetsExclude = [
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
index 8e31f78a6c..4da601897d 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bswup.progress version'] = '9.1.2';
+window['bit-bswup.progress version'] = '9.2.0-pre-01';
 
 ; (function () {
     (window as any).startBswupProgress = (autoReload: boolean,
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
index c35e3e61bb..a5738bdc89 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
@@ -1,4 +1,4 @@
-self['bit-bswup.sw version'] = '9.1.2';
+self['bit-bswup.sw version'] = '9.2.0-pre-01';
 
 interface Window {
     clients: any
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
index cc7cc54e27..57836ecdbb 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
@@ -1,5 +1,5 @@
 const BitBswup = {} as any;
-BitBswup.version = window['bit-bswup version'] = '9.1.2';
+BitBswup.version = window['bit-bswup version'] = '9.2.0-pre-01';
 
 declare const Blazor: any;
 
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
index 859ed8e409..8d6fd74283 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.1.2
+// bit version: 9.2.0-pre-01
 
 // In development, always fetch from the network and do not enable offline support.
 // This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
index 582cb9d837..db868d3652 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.1.2
+// bit version: 9.2.0-pre-01
 
 self.assetsInclude = [];
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
index 2a3046e8c1..7e5a86f685 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bup.progress version'] = '9.1.2';
+window['bit-bup.progress version'] = '9.2.0-pre-01';
 
 ; (function () {
     (window as any).startBupProgress = (showLogs: boolean, showAssets: boolean, appContainerSelector: string, hideApp: boolean, autoHide: boolean) => {
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
index 784cd1ce6c..24ef974b23 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
@@ -1,5 +1,5 @@
 var BitBup = BitBup || {};
-BitBup.version = window['bit-bup version'] = '9.1.2';
+BitBup.version = window['bit-bup version'] = '9.2.0-pre-01';
 
 declare const Blazor: any;
 
diff --git a/src/Butil/Bit.Butil/Scripts/butil.ts b/src/Butil/Bit.Butil/Scripts/butil.ts
index 91f0c54d26..3d97a62324 100644
--- a/src/Butil/Bit.Butil/Scripts/butil.ts
+++ b/src/Butil/Bit.Butil/Scripts/butil.ts
@@ -1,2 +1,2 @@
 var BitButil = BitButil || {};
-BitButil.version = window['bit-butil version'] = '9.1.2';
\ No newline at end of file
+BitButil.version = window['bit-butil version'] = '9.2.0-pre-01';
\ No newline at end of file
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
index 61a4b13249..70b6d8ca5d 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
@@ -1,4 +1,4 @@
-<!-- Generated by bit-empty template v-9.1.2 -->
+<!-- Generated by bit-empty template v-9.2.0-pre-01 -->
 
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
@@ -17,14 +17,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bit.BlazorUI" Version="9.1.2" />
+    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
 
-    <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
index cb4b6d36aa..01102a408a 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
@@ -1,4 +1,4 @@
-<!-- Generated by bit-empty template v-9.1.2 -->
+<!-- Generated by bit-empty template v-9.2.0-pre-01 -->
 
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
@@ -19,14 +19,14 @@
   <!--#endif -->
 
   <ItemGroup>
-    <PackageReference Include="Bit.BlazorUI" Version="9.1.2" />
+    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
 
-    <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
index db3aa7997c..47ec1e8d14 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
@@ -1,5 +1,5 @@
 //+:cnd:noEmit
-// bit version: 9.1.2
+// bit version: 9.2.0-pre-01
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 //#if (notification == true)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
index 2516669b7d..360b7f79ba 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-bp template v-9.1.2 -->
+<!-- Generated by bit-bp template v-9.2.0-pre-01 -->
 <Project>
     <!--/-:msbuild-conditional:noEmit -->
     <PropertyGroup>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
index 236556000f..c35a766472 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
@@ -1,14 +1,14 @@
 <Project>
     <ItemGroup>
         <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-        <PackageVersion Include="Bit.Butil" Version="9.1.2" />
-        <PackageVersion Include="Bit.BlazorUI" Version="9.1.2" />
-        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.1.2" />
-        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.1.2" />
-        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.1.2" />
-        <PackageVersion Include="Bit.Bswup" Version="9.1.2" />
-        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.1.2" />
-        <PackageVersion Include="Bit.SourceGenerators" Version="9.1.2" />
+        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-01" />
         <PackageVersion Include="libphonenumber-csharp" Version="8.13.52" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.0" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
@@ -49,7 +49,7 @@
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.Firebase.Messaging" Version="124.1.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Plugin.LocalNotification" Version="11.1.4" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="AdsPush" Version="2.0.0" />
-        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.1.2" />
+        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-01" />
         <PackageVersion Condition=" '$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
         <PackageVersion Condition="'$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.Azure.SignalR" Version="1.29.0" />
         <PackageVersion Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
index 226b07c7ca..94c25fe328 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
@@ -1,14 +1,14 @@
 <Project>
     <ItemGroup>
         <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-        <PackageVersion Include="Bit.Butil" Version="9.1.2" />
-        <PackageVersion Include="Bit.BlazorUI" Version="9.1.2" />
-        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.1.2" />
-        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.1.2" />
-        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.1.2" />
-        <PackageVersion Include="Bit.Bswup" Version="9.1.2" />
-        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.1.2" />
-        <PackageVersion Include="Bit.SourceGenerators" Version="9.1.2" />
+        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-01" />
         <PackageVersion Include="libphonenumber-csharp" Version="8.13.52" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.11" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
@@ -46,7 +46,7 @@
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.Firebase.Messaging" Version="124.1.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Plugin.LocalNotification" Version="11.1.4" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="AdsPush" Version="2.0.0" />
-        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.1.2" />
+        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-01" />
         <PackageVersion Condition=" '$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.11" />
         <PackageVersion Condition="'$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.Azure.SignalR" Version="1.29.0" />
         <PackageVersion Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
index 6e5dc0f98c..9c132939df 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
@@ -22,15 +22,15 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.BlazorUI" Version="9.1.2" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.1.2" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-01" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.1.2" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-01" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
index 639d2f8331..477ecc0361 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
index a892a3d0d6..ad6b1e15e5 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Directory.Build.props b/src/Websites/Careers/src/Directory.Build.props
index dd9c961fde..9956ce5850 100644
--- a/src/Websites/Careers/src/Directory.Build.props
+++ b/src/Websites/Careers/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.1.2 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-01 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
index f8cad9ead6..373a5c1382 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
@@ -22,16 +22,16 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.Butil" Version="9.1.2" />
-        <PackageReference Include="Bit.BlazorUI" Version="9.1.2" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.1.2" />
+        <PackageReference Include="Bit.Butil" Version="9.2.0-pre-01" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-01" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.1.2" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-01" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
index 0d0fe3a3ef..164456dbd7 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
@@ -174,8 +174,8 @@ rm $HOME/dotnet.tar.gz</CodeBox>
                             }
                         </li>
                         <li>
-                            <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/9.1.2" target="_blank">Bit Boilerplate</a> project template</div>
-                            <CodeBox>dotnet new install Bit.Boilerplate::9.1.2</CodeBox>
+                            <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/9.2.0-pre-01" target="_blank">Bit Boilerplate</a> project template</div>
+                            <CodeBox>dotnet new install Bit.Boilerplate::9.2.0-pre-01</CodeBox>
                         </li>
                         @if (showCrossPlatform && devOS is "Windows")
                         {
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
index 96198b6292..ce4d3d67ba 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
@@ -38,7 +38,7 @@ public partial class Templates03GettingStartedPage
             command:"dotnet nuget add source \"https://api.nuget.org/v3/index.json\" --name \"nuget.org\"; dotnet workload install wasm-tools;"),
 
             (text:@"echo 'Install the Bit.Boilerplate project template https://www.nuget.org/packages/Boilerplate.Templates';",
-            command:"dotnet new install Bit.Boilerplate::9.1.2;")
+            command:"dotnet new install Bit.Boilerplate::9.2.0-pre-01;")
         ];
 
         if (enableVirtualization)
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
index bdca6c4f9f..37dab34ba6 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
index a892a3d0d6..ad6b1e15e5 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Directory.Build.props b/src/Websites/Platform/src/Directory.Build.props
index aea297c3a4..e635894027 100644
--- a/src/Websites/Platform/src/Directory.Build.props
+++ b/src/Websites/Platform/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.1.2 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-01 -->
 <Project>
     <PropertyGroup>
         <LangVersion>preview</LangVersion>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
index 19d29cf8d1..75f65ffe1d 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
@@ -22,15 +22,15 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.BlazorUI" Version="9.1.2" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.1.2" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-01" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.1.2" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-01" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
index 1234b62265..e94bcd3e95 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
index a892a3d0d6..ad6b1e15e5 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.1.2">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.1.2">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Directory.Build.props b/src/Websites/Sales/src/Directory.Build.props
index 94a048bc08..b465747f20 100644
--- a/src/Websites/Sales/src/Directory.Build.props
+++ b/src/Websites/Sales/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.1.2 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-01 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>

From 2f14590470c730db29bfd342ac5396b4017463b4 Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Tue, 31 Dec 2024 12:58:26 +0330
Subject: [PATCH 15/28] feat(blazorui): improve api and styles of BitNavPanel
 #9567 (#9568)

---
 .../Components/NavPanel/BitNavPanel.razor     |  6 +--
 .../Components/NavPanel/BitNavPanel.razor.cs  | 26 ++++++-------
 .../Components/NavPanel/BitNavPanel.scss      | 38 ++++++++++++-------
 .../Extras/NavPanel/BitNavPanelDemo.razor     |  8 ++--
 .../Extras/NavPanel/BitNavPanelDemo.razor.cs  | 25 +++++++-----
 .../NavPanel/BitNavPanelDemo.razor.scss       | 10 +++++
 .../Shared/MainLayout.razor                   |  1 +
 7 files changed, 71 insertions(+), 43 deletions(-)

diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor
index 669093d062..7476e5a453 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor
@@ -8,7 +8,7 @@
 }
 
 @{
-    var isToggled = Togglable && IsToggled;
+    var isToggled = (NoToggle is false) && IsToggled;
 }
 
 <div @ref="RootElement" @attributes="HtmlAttributes"
@@ -39,7 +39,7 @@
 
                     <div class="bit-npn-spc" style="@(isToggled ? "display:none;" : "")" />
 
-                    @if (Togglable)
+                    @if (NoToggle is false)
                     {
                         <BitButton IconOnly FixedColor
                                    Size="BitSize.Large"
@@ -103,7 +103,7 @@
                         Class="@Classes?.Nav"
                         Items="_filteredNavItems"
                         DefaultSelectedItem="_filteredNavItems[0]"
-                        Accent="Padded ? BitColor.SecondaryBackground : null"
+                        Accent="NoPad ? null : BitColor.SecondaryBackground"
                         OnItemClick="(TItem item) => HandleNavItemClick(item)" />
             }
 
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor.cs
index 9b3fb46972..435c226fdb 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.razor.cs
@@ -72,15 +72,20 @@ public partial class BitNavPanel<TItem> : BitComponentBase, IDisposable where TI
     [Parameter] public BitNavClassStyles? NavStyles { get; set; }
 
     /// <summary>
-    /// Event fired up when an item is clicked.
+    /// Disables the padded mode of the nav panel.
     /// </summary>
-    [Parameter] public EventCallback<TItem> OnItemClick { get; set; }
+    [Parameter, ResetClassBuilder]
+    public bool NoPad { get; set; }
 
     /// <summary>
-    /// Enables the padded mode of the nav panel.
+    /// Disables the toggle feature of the nav panel.
     /// </summary>
-    [Parameter, ResetClassBuilder]
-    public bool Padded { get; set; }
+    [Parameter] public bool NoToggle { get; set; }
+
+    /// <summary>
+    /// Event fired up when an item is clicked.
+    /// </summary>
+    [Parameter] public EventCallback<TItem> OnItemClick { get; set; }
 
     /// <summary>
     /// Custom CSS classes for different parts of the search box of the nav panel.
@@ -102,11 +107,6 @@ public partial class BitNavPanel<TItem> : BitComponentBase, IDisposable where TI
     /// </summary>
     [Parameter] public BitNavPanelClassStyles? Styles { get; set; }
 
-    /// <summary>
-    /// Enables the toggle feature of the nav panel.
-    /// </summary>
-    [Parameter] public bool Togglable { get; set; }
-
     /// <summary>
     /// The top CSS property value of the root element of the nav panel in px.
     /// </summary>
@@ -121,7 +121,7 @@ protected override void RegisterCssClasses()
     {
         ClassBuilder.Register(() => Classes?.Root);
         ClassBuilder.Register(() => IsOpen ? string.Empty : "bit-npn-cls");
-        ClassBuilder.Register(() => Padded ? "bit-npn-pad" : string.Empty);
+        ClassBuilder.Register(() => NoPad ? string.Empty : "bit-npn-pad");
     }
 
     protected override void RegisterCssStyles()
@@ -150,7 +150,7 @@ private async Task HandleNavItemClick(TItem item)
 
     private async Task ClosePanel()
     {
-        if (await AssignIsOpen(false)) return;
+        await AssignIsOpen(false);
     }
 
     private async Task ToggleNavPanel()
@@ -165,7 +165,7 @@ private async Task ToggleNavPanel()
 
     private async Task ToggleForSearch()
     {
-        if (await AssignIsToggled(false)) return;
+        if (await AssignIsToggled(false) is false) return;
 
         await Task.Delay(1);
         await _searchBoxRef.FocusAsync();
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.scss
index b726fef594..a2842436b8 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.scss
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/NavPanel/BitNavPanel.scss
@@ -1,14 +1,15 @@
+@import "../../Styles/extra-variables.scss";
 @import "../../../Bit.BlazorUI/Styles/functions.scss";
 @import "../../../Bit.BlazorUI/Styles/media-queries.scss";
 
 .bit-npn {
     top: 0;
     position: sticky;
-    min-width: 14rem;
-    max-width: 14rem;
     overflow: hidden auto;
+    max-width: spacing(28);
+    min-width: spacing(28);
     background-color: $clr-bg-pri;
-    height: var(--bit-env-height-avl);
+    height: $bit-env-height-available;
 
     @include lt-md {
         left: 0;
@@ -17,8 +18,8 @@
         position: fixed;
         height: unset !important;
         z-index: $zindex-callout;
-        bottom: var(--bit-env-inset-bottom);
-        top: var(--bit-env-inset-top) !important;
+        bottom: $bit-env-inset-bottom;
+        top: $bit-env-inset-top !important;
         transition: transform 150ms ease-out, opacity 100ms ease-in;
 
         &.bit-rtl {
@@ -37,24 +38,33 @@
     }
 
     &.bit-npn-tgl {
-        min-width: 3rem;
-        max-width: 3rem;
+        min-width: spacing(6);
+        max-width: spacing(6);
 
         .bit-npn-cnt {
             align-items: center;
         }
 
         &.bit-npn-pad {
-            min-width: 6rem;
-            max-width: 6rem;
+            min-width: spacing(12);
+            max-width: spacing(12);
         }
     }
 
     &.bit-npn-pad {
-        padding: 1rem;
+        padding: spacing(2);
+
+        @include lt-md {
+            padding: 0;
+
+            &.bit-npn-tgl {
+                min-width: spacing(8);
+                max-width: spacing(8);
+            }
+        }
 
         .bit-npn-cnt {
-            padding: 0.5rem;
+            padding: spacing(1);
             background-color: $clr-bg-sec;
         }
     }
@@ -91,9 +101,9 @@
 }
 
 .bit-npn-cnt {
-    gap: 1rem;
     width: auto;
     display: flex;
+    gap: spacing(2);
     min-height: 100%;
     height: fit-content;
     flex-direction: column;
@@ -106,8 +116,8 @@
 }
 
 .bit-npn-img {
-    max-width: 38px;
-    max-height: 38px;
+    max-width: spacing(4.75);
+    max-height: spacing(4.75);
 }
 
 .bit-npn-spc {
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor
index 5c683b628e..2a002c5dc2 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor
@@ -13,19 +13,19 @@
                ComponentSubClasses="componentSubClasses">
     <ComponentExampleBox Title="Basic" RazorCode="@example1RazorCode" CsharpCode="@example1CsharpCode" Id="example1">
         <ExamplePreview>
-            <div style="display:flex; justify-content:center">
+            <div class="open-btn">
                 <BitToggleButton @bind-IsChecked="basicIsOpen" OnText="Close" OffText="Open" />
             </div>
-            <BitNavPanel @bind-IsOpen="basicIsOpen" Items="basicNavItems" Togglable />
+            <BitNavPanel @bind-IsOpen="basicIsOpen" Items="basicNavItems" NoPad />
         </ExamplePreview>
     </ComponentExampleBox>
 
     <ComponentExampleBox Title="RTL" RazorCode="@example2RazorCode" CsharpCode="@example2CsharpCode" Id="example2">
         <ExamplePreview>
-            <div style="display:flex; justify-content:center">
+            <div class="open-btn">
                 <BitToggleButton @bind-IsChecked="rtlIsOpen" OnText="Close" OffText="Open" />
             </div>
-            <BitNavPanel @bind-IsOpen="rtlIsOpen" Items="basicNavItems" Dir="BitDir.Rtl" Togglable Padded />
+            <BitNavPanel @bind-IsOpen="rtlIsOpen" Items="basicNavItems" Dir="BitDir.Rtl" />
         </ExamplePreview>
     </ComponentExampleBox>
 </ComponentDemo>
\ No newline at end of file
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.cs
index 3497c9812a..861c32f955 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.cs
@@ -85,6 +85,20 @@ public partial class BitNavPanelDemo
             Description = "Custom CSS styles for different parts of the nav component of the nav panel.",
          },
          new()
+         {
+            Name = "NoPad",
+            Type = "bool",
+            DefaultValue = "false",
+            Description = "Disables the padded mode of the nav panel.",
+         },
+         new()
+         {
+            Name = "NoToggle",
+            Type = "bool",
+            DefaultValue = "false",
+            Description = "Disables the toggle feature of the nav panel.",
+         },
+         new()
          {
             Name = "OnItemClick",
             Type = "EventCallback<TItem>",
@@ -122,13 +136,6 @@ public partial class BitNavPanelDemo
             LinkType = LinkType.Link,
          },
          new()
-         {
-            Name = "Togglable",
-            Type = "bool",
-            DefaultValue = "false",
-            Description = "Enables the toggle feature of the nav panel.",
-         },
-         new()
          {
             Name = "Top",
             Type = "int",
@@ -279,7 +286,7 @@ public partial class BitNavPanelDemo
     private readonly string example1RazorCode = @"
 <BitToggleButton @bind-IsChecked=""basicIsOpen"" OnText=""Close"" OffText=""Open"" />
 
-<BitNavPanel @bind-IsOpen=""basicIsOpen"" Items=""basicNavItems"" Togglable />";
+<BitNavPanel @bind-IsOpen=""basicIsOpen"" Items=""basicNavItems"" NoPad />";
     private readonly string example1CsharpCode = @"
 private bool basicIsOpen;
 
@@ -337,7 +344,7 @@ public partial class BitNavPanelDemo
     private readonly string example2RazorCode = @"
 <BitToggleButton @bind-IsChecked=""rtlIsOpen"" OnText=""Close"" OffText=""Open"" />
 
-<BitNavPanel @bind-IsOpen=""rtlIsOpen"" Items=""basicNavItems"" Dir=""BitDir.Rtl"" Togglable Padded />";
+<BitNavPanel @bind-IsOpen=""rtlIsOpen"" Items=""basicNavItems"" Dir=""BitDir.Rtl"" />";
     private readonly string example2CsharpCode = @"
 private bool rtlIsOpen;
 
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.scss
index e69de29bb2..48203604cf 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/NavPanel/BitNavPanelDemo.razor.scss
@@ -0,0 +1,10 @@
+@import "../../../../Styles/abstracts/_media-queries.scss";
+
+.open-btn {
+    display: none;
+    justify-content: center;
+
+    @include lt-lg {
+        display: flex;
+    }
+}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor
index 957e62aa8f..4fe35fd1e1 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor
@@ -8,6 +8,7 @@
         <NavPanel>
             <BitNavPanel @bind-IsOpen="_isNavPanelOpen"
                          Top="65"
+                         NoPad NoToggle
                          Items="_navItems"
                          SearchBoxPlaceholder="Search component"
                          SearchBoxStyles="@(new() { Root = "padding-inline:8px" })"

From d79abf2dbad9428ca6a56b0486f681670bdb0c2b Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Tue, 31 Dec 2024 12:11:01 +0100
Subject: [PATCH 16/28] fix(templates): resolve Boilerplate Server.Web issues
 in Standalone api mode #9572 (#9573)

---
 .../.template.config/template.json            |  3 +-
 .../IClientCoreServiceCollectionExtensions.cs |  2 +-
 .../Services/AuthManager.cs                   |  6 +--
 .../Services/Contracts/IAuthTokenProvider.cs  | 10 ++--
 .../AuthDelegatingHandler.cs                  |  2 +-
 .../Program.Services.cs                       |  8 +--
 .../Program.Middlewares.cs                    |  4 ++
 .../Program.Services.cs                       | 28 +++++++++-
 .../Services/SimpleJwtSecureDataFormat.cs     | 53 +++++++++++++++++++
 9 files changed, 100 insertions(+), 16 deletions(-)
 create mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Services/SimpleJwtSecureDataFormat.cs

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json b/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json
index 7289c1cfc1..5c93f24890 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json
@@ -525,7 +525,8 @@
                 {
                     "condition": "(api == Integrated)",
                     "exclude": [
-                        "src/Server/Boilerplate.Server.Web/appsettings*.json"
+                        "src/Server/Boilerplate.Server.Web/appsettings*.json",
+                        "src/Server/Boilerplate.Server.Web/Services/SimpleJwtSecureDataFormat.cs"
                     ]
                 },
                 {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs
index 764b689c74..cffdd82c3d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs
@@ -158,7 +158,7 @@ public static IServiceCollection AddClientCoreProjectServices(this IServiceColle
                         var accessToken = await authTokenProvider.GetAccessToken();
 
                         if (string.IsNullOrEmpty(accessToken) is false &&
-                            authTokenProvider.ParseAccessToken(accessToken, validateExpiry: true).IsAuthenticated() is false)
+                            IAuthTokenProvider.ParseAccessToken(accessToken, validateExpiry: true).IsAuthenticated() is false)
                         {
                             return await authManager.RefreshToken(requestedBy: nameof(HubConnectionBuilder));
                         }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthManager.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthManager.cs
index 26fb1b29c5..9861b41f62 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthManager.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthManager.cs
@@ -157,18 +157,18 @@ public override async Task<AuthenticationState> GetAuthenticationStateAsync()
         {
             var accessToken = await prerenderStateService.GetValue(() => tokenProvider.GetAccessToken());
 
-            return new AuthenticationState(tokenProvider.ParseAccessToken(accessToken, validateExpiry: false));
+            return new AuthenticationState(IAuthTokenProvider.ParseAccessToken(accessToken, validateExpiry: false));
         }
         catch (Exception exp)
         {
             exceptionHandler.Handle(exp); // Do not throw exceptions in GetAuthenticationStateAsync. This will fault CascadingAuthenticationState's state unless NotifyAuthenticationStateChanged is called again.
-            return new AuthenticationState(tokenProvider.Anonymous());
+            return new AuthenticationState(IAuthTokenProvider.Anonymous());
         }
     }
 
     public async Task<bool> TryEnterElevatedAccessMode(CancellationToken cancellationToken)
     {
-        var user = tokenProvider.ParseAccessToken(await tokenProvider.GetAccessToken(), validateExpiry: true);
+        var user = IAuthTokenProvider.ParseAccessToken(await tokenProvider.GetAccessToken(), validateExpiry: true);
         var hasElevatedAccess = await authorizationService.AuthorizeAsync(user, AuthPolicies.ELEVATED_ACCESS) is { Succeeded: true };
         if (hasElevatedAccess)
             return true;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/IAuthTokenProvider.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/IAuthTokenProvider.cs
index 842adfefe9..120e1d2509 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/IAuthTokenProvider.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/IAuthTokenProvider.cs
@@ -6,9 +6,9 @@ public interface IAuthTokenProvider
 {
     Task<string?> GetAccessToken();
 
-    public ClaimsPrincipal Anonymous() => new(new ClaimsIdentity());
+    public static ClaimsPrincipal Anonymous() => new(new ClaimsIdentity());
 
-    public ClaimsPrincipal ParseAccessToken(string? accessToken, bool validateExpiry)
+    public static ClaimsPrincipal ParseAccessToken(string? accessToken, bool validateExpiry)
     {
         if (string.IsNullOrEmpty(accessToken) is true)
             return Anonymous();
@@ -25,7 +25,7 @@ public ClaimsPrincipal ParseAccessToken(string? accessToken, bool validateExpiry
         return claimPrinciple;
     }
 
-    private IEnumerable<Claim>? ReadClaims(string accessToken, bool validateExpiry)
+    private static IEnumerable<Claim>? ReadClaims(string accessToken, bool validateExpiry)
     {
         var parsedClaims = DeserializeAccessToken(accessToken);
 
@@ -55,7 +55,7 @@ public ClaimsPrincipal ParseAccessToken(string? accessToken, bool validateExpiry
         return claims;
     }
 
-    private Dictionary<string, JsonElement> DeserializeAccessToken(string accessToken)
+    private static Dictionary<string, JsonElement> DeserializeAccessToken(string accessToken)
     {
         // Split the token to get the payload
         string base64UrlPayload = accessToken.Split('.')[1];
@@ -72,7 +72,7 @@ private Dictionary<string, JsonElement> DeserializeAccessToken(string accessToke
         return claims;
     }
 
-    private string ConvertBase64UrlToBase64(string base64Url)
+    private static string ConvertBase64UrlToBase64(string base64Url)
     {
         base64Url = base64Url.Replace('-', '+').Replace('_', '/');
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
index cf4774e3dc..943ec7f960 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
@@ -27,7 +27,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 var accessToken = await tokenProvider.GetAccessToken();
                 if (string.IsNullOrEmpty(accessToken) is false && HasAuthorizedApiAttribute(request))
                 {
-                    if (tokenProvider.ParseAccessToken(accessToken, validateExpiry: true).IsAuthenticated() is false)
+                    if (IAuthTokenProvider.ParseAccessToken(accessToken, validateExpiry: true).IsAuthenticated() is false)
                     {
                         logScopeData["ClientSideAccessTokenValidationFailed"] = true;
                         throw new UnauthorizedException(localizer[nameof(AppStrings.YouNeedToSignIn)]);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
index 34a6b89d56..83ed4fe62b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
@@ -299,9 +299,9 @@ private static void AddIdentity(WebApplicationBuilder builder)
 
         var authenticationBuilder = services.AddAuthentication(options =>
         {
-            options.DefaultAuthenticateScheme = IdentityConstants.BearerScheme;
-            options.DefaultChallengeScheme = IdentityConstants.BearerScheme;
             options.DefaultScheme = IdentityConstants.BearerScheme;
+            options.DefaultChallengeScheme = IdentityConstants.BearerScheme;
+            options.DefaultAuthenticateScheme = IdentityConstants.BearerScheme;
         })
         .AddBearerToken(IdentityConstants.BearerScheme, options =>
         {
@@ -340,6 +340,8 @@ private static void AddIdentity(WebApplicationBuilder builder)
             configuration.GetRequiredSection("Identity").Bind(options);
         });
 
+        services.AddAuthorization();
+
         if (string.IsNullOrEmpty(configuration["Authentication:Google:ClientId"]) is false)
         {
             authenticationBuilder.AddGoogle(options =>
@@ -379,8 +381,6 @@ private static void AddIdentity(WebApplicationBuilder builder)
                 configuration.GetRequiredSection("Authentication:Apple").Bind(options);
             });
         }
-
-        services.AddAuthorization();
     }
 
     private static void AddSwaggerGen(WebApplicationBuilder builder)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs
index 863fe95df7..9f42c9a27e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs
@@ -47,7 +47,9 @@ public static void ConfigureMiddlewares(this WebApplication app)
             app.UseRequestLocalization(options);
         }
 
+        //#if (api == "Integrated")
         app.UseExceptionHandler("/", createScopeForErrors: true);
+        //#endif
 
         if (env.IsDevelopment())
         {
@@ -107,7 +109,9 @@ public static void ConfigureMiddlewares(this WebApplication app)
             });
         }
 
+        //#if (api == "Integrated")
         app.UseCors();
+        //#endif
 
         app.UseAuthentication();
         app.UseAuthorization();
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs
index 1ac4e6cd98..170b476682 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs
@@ -4,6 +4,8 @@
 using Microsoft.AspNetCore.ResponseCompression;
 //#if (api == "Integrated")
 using Boilerplate.Server.Api;
+//#else
+using Microsoft.AspNetCore.Identity;
 //#endif
 using Boilerplate.Client.Web;
 using Boilerplate.Server.Web.Services;
@@ -36,7 +38,6 @@ public static void AddServerWebProjectServices(this WebApplicationBuilder builde
         //#if (api == "Integrated")
         builder.AddServerApiProjectServices();
         //#else
-
         services.AddResponseCaching();
 
         services.AddHttpContextAccessor();
@@ -56,6 +57,31 @@ public static void AddServerWebProjectServices(this WebApplicationBuilder builde
         //#endif
 
         services.AddAntiforgery();
+
+        //#if (IsInsideProjectTemplate)
+        /*
+        //#endif
+        services.AddAuthentication(options =>
+        {
+            options.DefaultScheme = IdentityConstants.BearerScheme;
+        }).AddBearerToken(IdentityConstants.BearerScheme, options =>
+        {
+            options.BearerTokenProtector = new SimpleJWTFormat();
+            options.RefreshTokenProtector = new SimpleJWTFormat();
+
+            options.Events = new()
+            {
+                OnMessageReceived = async context =>
+                {
+                    // The server accepts the accessToken from either the authorization header, the cookie, or the request URL query string
+                    context.Token ??= context.Request.Query.ContainsKey("access_token") ? context.Request.Query["access_token"] : context.Request.Cookies["access_token"];
+                }
+            };
+        });
+        //#if (IsInsideProjectTemplate)
+        */
+        //#endif
+        services.AddAuthorization();
         //#endif
 
         services.AddOptions<ServerWebSettings>()
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Services/SimpleJwtSecureDataFormat.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Services/SimpleJwtSecureDataFormat.cs
new file mode 100644
index 0000000000..86f0e64ad0
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Services/SimpleJwtSecureDataFormat.cs
@@ -0,0 +1,53 @@
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Authentication;
+using Boilerplate.Client.Core.Services.Contracts;
+
+namespace Boilerplate.Server.Web.Services;
+
+/// <summary>
+/// In standalone API mode, this code only runs during Blazor pre-rendering or Blazor Server.
+/// Since the `AppSecureJWTFormat` in the Server.Api project strictly validates access tokens using the provided PFX file, 
+/// strict validation isn't necessary here. Instead, we simply parse the token, similar to how it's handled on the client side (Blazor WASM and Blazor Hybrid).
+/// </summary>
+public partial class SimpleJwtSecureDataFormat : ISecureDataFormat<AuthenticationTicket>
+{
+    public AuthenticationTicket? Unprotect(string? protectedText) => Unprotect(protectedText, null);
+
+    public AuthenticationTicket? Unprotect(string? protectedText, string? purpose)
+    {
+        try
+        {
+            if (string.IsNullOrEmpty(protectedText))
+            {
+                return NotSignedIn();
+            }
+
+            var claimsPrincipal = IAuthTokenProvider.ParseAccessToken(protectedText, validateExpiry: true);
+            var properties = new AuthenticationProperties() { ExpiresUtc = DateTimeOffset.FromUnixTimeSeconds(long.Parse(claimsPrincipal.FindFirstValue("exp")!)) };
+            var data = new AuthenticationTicket(claimsPrincipal, properties: properties, IdentityConstants.BearerScheme);
+
+            return data;
+        }
+        catch (Exception ex)
+        {
+            if (AppEnvironment.IsDev())
+            {
+                Console.WriteLine(ex); // since we do not have access to any logger at this point!
+            }
+
+            return NotSignedIn();
+        }
+    }
+
+    private static AuthenticationTicket NotSignedIn()
+    {
+        return new AuthenticationTicket(new ClaimsPrincipal(new ClaimsIdentity()), string.Empty);
+    }
+
+    public string Protect(AuthenticationTicket data) => Protect(data, null);
+
+    public string Protect(AuthenticationTicket data, string? purpose)
+    {
+        throw new NotImplementedException(); // In standalone API mode, Blazor Server is not expected to issue JWT tokens.
+    }
+}

From c0a6a6b11d344ba5ca8225ad984dbb8fada7a4d5 Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Tue, 31 Dec 2024 14:41:28 +0330
Subject: [PATCH 17/28] feat(prerelease): v-9.2.0-pre-02 #9569 (#9571)

---
 src/Besql/Bit.Besql/wwwroot/bit-besql.js       |  2 +-
 src/Bit.Build.props                            |  2 +-
 src/BlazorUI/Bit.BlazorUI/Scripts/general.ts   |  2 +-
 .../Bit.BlazorUI.Demo.Server.csproj            |  4 ++--
 .../Bit.BlazorUI.Demo.Shared.csproj            |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Core.csproj       |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Maui.csproj       |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Web.csproj        |  6 +++---
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.BlazorUI.Demo.Client.Windows.csproj    |  4 ++--
 src/BlazorUI/Demo/Directory.Build.props        |  2 +-
 .../Bit.Bswup.Demo/wwwroot/service-worker.js   |  2 +-
 .../wwwroot/service-worker.published.js        |  2 +-
 .../wwwroot/service-worker.js                  |  2 +-
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.Bswup/Scripts/bit-bswup.progress.ts    |  2 +-
 src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts    |  2 +-
 src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts       |  2 +-
 .../FullDemo/Client/wwwroot/service-worker.js  |  2 +-
 .../Client/wwwroot/service-worker.published.js |  2 +-
 src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts    |  2 +-
 src/Bup/Bit.Bup/Scripts/bit-bup.ts             |  2 +-
 src/Butil/Bit.Butil/Scripts/butil.ts           |  2 +-
 .../BlazorEmpty.Client.csproj                  |  8 ++++----
 .../BlazorEmpty/BlazorEmpty.csproj             |  8 ++++----
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.Boilerplate/src/Directory.Build.props  |  2 +-
 .../src/Directory.Packages.props               | 18 +++++++++---------
 .../src/Directory.Packages8.props              | 18 +++++++++---------
 .../Bit.Websites.Careers.Client.csproj         | 10 +++++-----
 .../Bit.Websites.Careers.Server.csproj         |  4 ++--
 .../Bit.Websites.Careers.Shared.csproj         |  4 ++--
 src/Websites/Careers/src/Directory.Build.props |  2 +-
 .../Bit.Websites.Platform.Client.csproj        | 12 ++++++------
 .../Templates03GettingStartedPage.razor        |  4 ++--
 .../Templates03GettingStartedPage.razor.cs     |  2 +-
 .../Bit.Websites.Platform.Server.csproj        |  4 ++--
 .../Bit.Websites.Platform.Shared.csproj        |  4 ++--
 .../Platform/src/Directory.Build.props         |  2 +-
 .../Bit.Websites.Sales.Client.csproj           | 10 +++++-----
 .../Bit.Websites.Sales.Server.csproj           |  4 ++--
 .../Bit.Websites.Sales.Shared.csproj           |  4 ++--
 src/Websites/Sales/src/Directory.Build.props   |  2 +-
 43 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/src/Besql/Bit.Besql/wwwroot/bit-besql.js b/src/Besql/Bit.Besql/wwwroot/bit-besql.js
index 15294a1618..ed5940c923 100644
--- a/src/Besql/Bit.Besql/wwwroot/bit-besql.js
+++ b/src/Besql/Bit.Besql/wwwroot/bit-besql.js
@@ -1,5 +1,5 @@
 var BitBesql = window.BitBesql || {};
-BitBesql.version = window['bit-besql version'] = '9.2.0-pre-01';
+BitBesql.version = window['bit-besql version'] = '9.2.0-pre-02';
 
 BitBesql.init = async function init(fileName) {
     const sqliteFilePath = `/${fileName}`;
diff --git a/src/Bit.Build.props b/src/Bit.Build.props
index 4e528195f7..4fa3adda96 100644
--- a/src/Bit.Build.props
+++ b/src/Bit.Build.props
@@ -27,7 +27,7 @@
 		<PackageProjectUrl>https://github.com/bitfoundation/bitplatform</PackageProjectUrl>
 
 		<!-- Version -->
-		<ReleaseVersion>9.2.0-pre-01</ReleaseVersion>
+		<ReleaseVersion>9.2.0-pre-02</ReleaseVersion>
   		<PackageVersion>$(ReleaseVersion)</PackageVersion>
 		<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)</PackageReleaseNotes>
 		<Version Condition=" '$(Configuration)' == 'Release' ">$([System.String]::Copy($(ReleaseVersion)).Replace('-pre-', '.'))</Version>
diff --git a/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts b/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
index 7f00cba13e..b5be21d82c 100644
--- a/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
+++ b/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
@@ -1,4 +1,4 @@
-(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '9.2.0-pre-01';
+(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '9.2.0-pre-02';
 
 interface DotNetObject {
     invokeMethod<T>(methodIdentifier: string, ...args: any[]): T;
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
index ccd9fb8e34..39b128c671 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
@@ -5,11 +5,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
index c298c2ff08..d28d648982 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
@@ -5,11 +5,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
index 21bf43c6b3..c38ae6d1d1 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
@@ -16,11 +16,11 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
index e15472cdef..c8ee537f55 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
@@ -85,12 +85,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
index 1026d95260..deb4592e1a 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
@@ -24,13 +24,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.Bswup" Version="9.2.0-pre-01" />
+        <PackageReference Include="Bit.Bswup" Version="9.2.0-pre-02" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
index b450079a2f..7245260184 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-01
+// bit version: 9.2.0-pre-02
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 self.assetsInclude = [];
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
index c8e98a026a..5684edac33 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
@@ -29,11 +29,11 @@
         <Using Include="Bit.BlazorUI.Demo.Client.Core.Services" />
         <Using Include="Bit.BlazorUI.Demo.Shared" />
         <Watch Remove="*.scss" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Directory.Build.props b/src/BlazorUI/Demo/Directory.Build.props
index b9bc35054f..410de4a231 100644
--- a/src/BlazorUI/Demo/Directory.Build.props
+++ b/src/BlazorUI/Demo/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-bp template v-9.2.0-pre-01 -->
+<!-- Generated by bit-bp template v-9.2.0-pre-02 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
index e2d5520106..ac182d5c96 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-01
+// bit version: 9.2.0-pre-02
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
index 29d8832622..260c786479 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-01
+// bit version: 9.2.0-pre-02
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
index a9b44b0d59..886a391552 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-01
+// bit version: 9.2.0-pre-02
 
 // In development, always fetch from the network and do not enable offline support.
 // This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
index 277910ac04..f002eb90d2 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-01
+// bit version: 9.2.0-pre-02
 
 self.assetsInclude = [];
 self.assetsExclude = [
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
index 4da601897d..044f5e8970 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bswup.progress version'] = '9.2.0-pre-01';
+window['bit-bswup.progress version'] = '9.2.0-pre-02';
 
 ; (function () {
     (window as any).startBswupProgress = (autoReload: boolean,
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
index a5738bdc89..fbd6adfbe9 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
@@ -1,4 +1,4 @@
-self['bit-bswup.sw version'] = '9.2.0-pre-01';
+self['bit-bswup.sw version'] = '9.2.0-pre-02';
 
 interface Window {
     clients: any
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
index 57836ecdbb..5344f0fb71 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
@@ -1,5 +1,5 @@
 const BitBswup = {} as any;
-BitBswup.version = window['bit-bswup version'] = '9.2.0-pre-01';
+BitBswup.version = window['bit-bswup version'] = '9.2.0-pre-02';
 
 declare const Blazor: any;
 
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
index 8d6fd74283..5b52b3a80d 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-01
+// bit version: 9.2.0-pre-02
 
 // In development, always fetch from the network and do not enable offline support.
 // This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
index db868d3652..84b8e4864d 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-01
+// bit version: 9.2.0-pre-02
 
 self.assetsInclude = [];
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
index 7e5a86f685..6c753f432e 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bup.progress version'] = '9.2.0-pre-01';
+window['bit-bup.progress version'] = '9.2.0-pre-02';
 
 ; (function () {
     (window as any).startBupProgress = (showLogs: boolean, showAssets: boolean, appContainerSelector: string, hideApp: boolean, autoHide: boolean) => {
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
index 24ef974b23..4cd2b039da 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
@@ -1,5 +1,5 @@
 var BitBup = BitBup || {};
-BitBup.version = window['bit-bup version'] = '9.2.0-pre-01';
+BitBup.version = window['bit-bup version'] = '9.2.0-pre-02';
 
 declare const Blazor: any;
 
diff --git a/src/Butil/Bit.Butil/Scripts/butil.ts b/src/Butil/Bit.Butil/Scripts/butil.ts
index 3d97a62324..99c25eef6c 100644
--- a/src/Butil/Bit.Butil/Scripts/butil.ts
+++ b/src/Butil/Bit.Butil/Scripts/butil.ts
@@ -1,2 +1,2 @@
 var BitButil = BitButil || {};
-BitButil.version = window['bit-butil version'] = '9.2.0-pre-01';
\ No newline at end of file
+BitButil.version = window['bit-butil version'] = '9.2.0-pre-02';
\ No newline at end of file
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
index 70b6d8ca5d..7a8a95a69f 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
@@ -1,4 +1,4 @@
-<!-- Generated by bit-empty template v-9.2.0-pre-01 -->
+<!-- Generated by bit-empty template v-9.2.0-pre-02 -->
 
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
@@ -17,14 +17,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
+    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
 
-    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
index 01102a408a..5f288e5e0e 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
@@ -1,4 +1,4 @@
-<!-- Generated by bit-empty template v-9.2.0-pre-01 -->
+<!-- Generated by bit-empty template v-9.2.0-pre-02 -->
 
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
@@ -19,14 +19,14 @@
   <!--#endif -->
 
   <ItemGroup>
-    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
+    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
 
-    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
index 47ec1e8d14..be38e62045 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
@@ -1,5 +1,5 @@
 //+:cnd:noEmit
-// bit version: 9.2.0-pre-01
+// bit version: 9.2.0-pre-02
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 //#if (notification == true)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
index 360b7f79ba..8d8121f25e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-bp template v-9.2.0-pre-01 -->
+<!-- Generated by bit-bp template v-9.2.0-pre-02 -->
 <Project>
     <!--/-:msbuild-conditional:noEmit -->
     <PropertyGroup>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
index c35a766472..b6a6aa6723 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
@@ -1,14 +1,14 @@
 <Project>
     <ItemGroup>
         <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-02" />
         <PackageVersion Include="libphonenumber-csharp" Version="8.13.52" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.0" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
@@ -49,7 +49,7 @@
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.Firebase.Messaging" Version="124.1.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Plugin.LocalNotification" Version="11.1.4" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="AdsPush" Version="2.0.0" />
-        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-01" />
+        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-02" />
         <PackageVersion Condition=" '$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
         <PackageVersion Condition="'$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.Azure.SignalR" Version="1.29.0" />
         <PackageVersion Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
index 94c25fe328..33dbf4ebc8 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
@@ -1,14 +1,14 @@
 <Project>
     <ItemGroup>
         <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01" />
-        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-01" />
+        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-02" />
         <PackageVersion Include="libphonenumber-csharp" Version="8.13.52" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.11" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
@@ -46,7 +46,7 @@
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.Firebase.Messaging" Version="124.1.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Plugin.LocalNotification" Version="11.1.4" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="AdsPush" Version="2.0.0" />
-        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-01" />
+        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-02" />
         <PackageVersion Condition=" '$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.11" />
         <PackageVersion Condition="'$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.Azure.SignalR" Version="1.29.0" />
         <PackageVersion Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
index 9c132939df..794f92bbb9 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
@@ -22,15 +22,15 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-01" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-02" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-01" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-02" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
index 477ecc0361..b10ac543f4 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
index ad6b1e15e5..1a25ac836e 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Directory.Build.props b/src/Websites/Careers/src/Directory.Build.props
index 9956ce5850..0f38a40cf6 100644
--- a/src/Websites/Careers/src/Directory.Build.props
+++ b/src/Websites/Careers/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-01 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-02 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
index 373a5c1382..e7d36d07e1 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
@@ -22,16 +22,16 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.Butil" Version="9.2.0-pre-01" />
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-01" />
+        <PackageReference Include="Bit.Butil" Version="9.2.0-pre-02" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-02" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-01" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-02" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
index 164456dbd7..1b3fe51163 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
@@ -174,8 +174,8 @@ rm $HOME/dotnet.tar.gz</CodeBox>
                             }
                         </li>
                         <li>
-                            <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/9.2.0-pre-01" target="_blank">Bit Boilerplate</a> project template</div>
-                            <CodeBox>dotnet new install Bit.Boilerplate::9.2.0-pre-01</CodeBox>
+                            <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/9.2.0-pre-02" target="_blank">Bit Boilerplate</a> project template</div>
+                            <CodeBox>dotnet new install Bit.Boilerplate::9.2.0-pre-02</CodeBox>
                         </li>
                         @if (showCrossPlatform && devOS is "Windows")
                         {
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
index ce4d3d67ba..6884c05f6c 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
@@ -38,7 +38,7 @@ public partial class Templates03GettingStartedPage
             command:"dotnet nuget add source \"https://api.nuget.org/v3/index.json\" --name \"nuget.org\"; dotnet workload install wasm-tools;"),
 
             (text:@"echo 'Install the Bit.Boilerplate project template https://www.nuget.org/packages/Boilerplate.Templates';",
-            command:"dotnet new install Bit.Boilerplate::9.2.0-pre-01;")
+            command:"dotnet new install Bit.Boilerplate::9.2.0-pre-02;")
         ];
 
         if (enableVirtualization)
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
index 37dab34ba6..1df8293351 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
index ad6b1e15e5..1a25ac836e 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Directory.Build.props b/src/Websites/Platform/src/Directory.Build.props
index e635894027..3ffee19f42 100644
--- a/src/Websites/Platform/src/Directory.Build.props
+++ b/src/Websites/Platform/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-01 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-02 -->
 <Project>
     <PropertyGroup>
         <LangVersion>preview</LangVersion>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
index 75f65ffe1d..aabdebc7be 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
@@ -22,15 +22,15 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-01" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-01" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-02" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-01" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-02" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
index e94bcd3e95..402d4589d9 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
index ad6b1e15e5..1a25ac836e 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-01">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Directory.Build.props b/src/Websites/Sales/src/Directory.Build.props
index b465747f20..e86c021477 100644
--- a/src/Websites/Sales/src/Directory.Build.props
+++ b/src/Websites/Sales/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-01 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-02 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>

From fad92c8e85f38d7f7abff1acc522d820dc74d74b Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Tue, 31 Dec 2024 13:41:50 +0100
Subject: [PATCH 18/28] feat(templates): improve platform detection in
 Boilerplate #9576 (#9577)

---
 .../Components/ClientAppCoordinator.cs        |  5 +++--
 .../Extensions/IJSRuntimeExtensions.cs        |  5 -----
 .../Boilerplate.Client.Core/Scripts/app.ts    | 19 -------------------
 .../Services/AppTelemetryContext.cs           |  2 --
 .../Services/Contracts/ITelemetryContext.cs   |  3 ---
 .../RequestHeadersDelegatingHandler.cs        |  2 +-
 .../MauiAppInsightsTelemetryInitializer.cs    |  1 -
 .../WindowsAppInsightsTelemetryInitializer.cs |  1 -
 8 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/ClientAppCoordinator.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/ClientAppCoordinator.cs
index a77bd51200..2782afb47e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/ClientAppCoordinator.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/ClientAppCoordinator.cs
@@ -25,6 +25,7 @@ public partial class ClientAppCoordinator : AppComponentBase
     [AutoInject] private IApplicationInsights appInsights = default!;
     //#endif
     [AutoInject] private Navigator navigator = default!;
+    [AutoInject] private UserAgent userAgent = default!;
     [AutoInject] private IJSRuntime jsRuntime = default!;
     [AutoInject] private IStorageService storageService = default!;
     [AutoInject] private ILogger<AuthManager> authLogger = default!;
@@ -51,13 +52,13 @@ protected override async Task OnInitAsync()
             {
                 NavigationManager.NavigateTo(uri!.ToString()!);
             });
-            TelemetryContext.UserAgent = await navigator.GetUserAgent();
             TelemetryContext.TimeZone = await jsRuntime.GetTimeZone();
             TelemetryContext.Culture = CultureInfo.CurrentCulture.Name;
             TelemetryContext.PageUrl = NavigationManager.Uri;
             if (AppPlatform.IsBlazorHybrid is false)
             {
-                TelemetryContext.Platform = await jsRuntime.GetBrowserPlatform();
+                var userAgentData = await userAgent.Extract();
+                TelemetryContext.Platform = string.Join(' ', [userAgentData.Manufacturer, userAgentData.OsName, userAgentData.Name, "browser"]);
             }
 
             //#if (appInsights == true)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IJSRuntimeExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IJSRuntimeExtensions.cs
index f8a6baf7db..d120fd3bdb 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IJSRuntimeExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IJSRuntimeExtensions.cs
@@ -8,11 +8,6 @@ namespace Microsoft.JSInterop;
 
 public static partial class IJSRuntimeExtensions
 {
-    public static ValueTask<string> GetBrowserPlatform(this IJSRuntime jsRuntime)
-    {
-        return jsRuntime.InvokeAsync<string>("App.getPlatform");
-    }
-
     public static ValueTask<string> GetTimeZone(this IJSRuntime jsRuntime)
     {
         return jsRuntime.InvokeAsync<string>("App.getTimeZone");
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Scripts/app.ts b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Scripts/app.ts
index 947cee0255..b116975150 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Scripts/app.ts
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Scripts/app.ts
@@ -27,25 +27,6 @@ class App {
         Object.keys(cssVariables).forEach(key => document.body.style.setProperty(key, cssVariables[key]));
     }
 
-    public static getPlatform(): string {
-        let data = [(navigator as any).userAgentData?.platform ?? navigator?.platform];
-
-        if (navigator.userAgent.includes('Firefox'))
-            data.push('Firefox browser');
-        else if (navigator.userAgent.includes('Edg'))
-            data.push('Edge browser');
-        else if (navigator.userAgent.includes('OPR'))
-            data.push('Opera browser');
-        else if (navigator.userAgent.includes('Chrome'))
-            data.push('Chrome browser');
-        else if (navigator.userAgent.includes('Safari'))
-            data.push('Safari browser');
-        else
-            data.push('Unknown browser');
-
-        return data.filter(d => d != null).join(' ');
-    }
-
     public static getTimeZone(): string {
         return Intl.DateTimeFormat().resolvedOptions().timeZone;
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppTelemetryContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppTelemetryContext.cs
index 1ecb936ce9..ee54fa8092 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppTelemetryContext.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppTelemetryContext.cs
@@ -19,8 +19,6 @@ public class AppTelemetryContext : ITelemetryContext
 
     public virtual string? PageUrl { get; set; }
 
-    public virtual string? UserAgent { get; set; }
-
     public string? TimeZone { get; set; }
 
     public string? Culture { get; set; } = CultureInfo.CurrentCulture.Name;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs
index 25ff971cbb..ea653d361a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs
@@ -41,8 +41,6 @@ public static ITelemetryContext? Current
 
     public string? PageUrl { get; set; }
 
-    public string? UserAgent { get; set; }
-
     public string? TimeZone { get; set; }
     public string? Culture { get; set; }
 
@@ -63,7 +61,6 @@ public static ITelemetryContext? Current
             { nameof(Platform), Platform },
             { nameof(AppVersion), AppVersion },
             { nameof(PageUrl), PageUrl },
-            { nameof(UserAgent), UserAgent },
             { nameof(TimeZone), TimeZone },
             { "ClientDateTime", DateTimeOffset.UtcNow.ToString("u") },
             { nameof(Culture), Culture },
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RequestHeadersDelegatingHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RequestHeadersDelegatingHandler.cs
index ff8486cb77..772a467771 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RequestHeadersDelegatingHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RequestHeadersDelegatingHandler.cs
@@ -13,7 +13,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
 
         if (request.Headers.UserAgent.Any() is false)
         {
-            request.Headers.UserAgent.TryParseAdd(telemetryContext.UserAgent ?? telemetryContext.Platform);
+            request.Headers.UserAgent.TryParseAdd(telemetryContext.Platform);
         }
 
         if (CultureInfoManager.MultilingualEnabled && string.IsNullOrEmpty(CultureInfo.CurrentUICulture.Name) is false)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiAppInsightsTelemetryInitializer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiAppInsightsTelemetryInitializer.cs
index 70e34e4400..23d8192663 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiAppInsightsTelemetryInitializer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiAppInsightsTelemetryInitializer.cs
@@ -17,7 +17,6 @@ public void Initialize(ITelemetry telemetry)
 
             telemetry.Context.GlobalProperties[nameof(ITelemetryContext.UserSessionId)] = ITelemetryContext.Current.UserSessionId?.ToString();
             telemetry.Context.GlobalProperties[nameof(ITelemetryContext.WebView)] = ITelemetryContext.Current.WebView;
-            telemetry.Context.GlobalProperties[nameof(ITelemetryContext.UserAgent)] = ITelemetryContext.Current.UserAgent;
             telemetry.Context.GlobalProperties[nameof(ITelemetryContext.TimeZone)] = ITelemetryContext.Current.TimeZone;
             telemetry.Context.GlobalProperties[nameof(ITelemetryContext.Culture)] = ITelemetryContext.Current.Culture;
             telemetry.Context.GlobalProperties[nameof(ITelemetryContext.IsOnline)] = ITelemetryContext.Current.IsOnline?.ToString().ToLowerInvariant();
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsAppInsightsTelemetryInitializer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsAppInsightsTelemetryInitializer.cs
index a8da3ff43d..f964a25ff4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsAppInsightsTelemetryInitializer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsAppInsightsTelemetryInitializer.cs
@@ -17,7 +17,6 @@ public void Initialize(ITelemetry telemetry)
 
             telemetry.Context.GlobalProperties[nameof(ITelemetryContext.UserSessionId)] = ITelemetryContext.Current.UserSessionId?.ToString();
             telemetry.Context.GlobalProperties[nameof(ITelemetryContext.WebView)] = ITelemetryContext.Current.WebView;
-            telemetry.Context.GlobalProperties[nameof(ITelemetryContext.UserAgent)] = ITelemetryContext.Current.UserAgent;
             telemetry.Context.GlobalProperties[nameof(ITelemetryContext.TimeZone)] = ITelemetryContext.Current.TimeZone;
             telemetry.Context.GlobalProperties[nameof(ITelemetryContext.Culture)] = ITelemetryContext.Current.Culture;
             telemetry.Context.GlobalProperties[nameof(ITelemetryContext.IsOnline)] = ITelemetryContext.Current.IsOnline?.ToString().ToLowerInvariant();

From c2649a5f1493f2c00e6edd48db2781a598668ae1 Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Tue, 31 Dec 2024 14:00:16 +0100
Subject: [PATCH 19/28] feat(deps): update project dependencies #9578 (#9579)

---
 src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj     | 2 +-
 .../.config/dotnet-tools.json                                 | 2 +-
 .../Bit.BlazorUI.Demo.Client.Windows.csproj                   | 2 +-
 .../Boilerplate.Client.Windows/.config/dotnet-tools.json      | 2 +-
 .../Boilerplate/Bit.Boilerplate/src/Directory.Packages.props  | 4 ++--
 .../Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj b/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj
index fb70e9cf9e..120da4bfd8 100644
--- a/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj
+++ b/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj
@@ -17,7 +17,7 @@
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
 		<PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
-		<PackageReference Include="coverlet.collector" Version="6.0.2">
+		<PackageReference Include="coverlet.collector" Version="6.0.3">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/.config/dotnet-tools.json b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/.config/dotnet-tools.json
index c9d700ceaa..e6a3ff39bf 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/.config/dotnet-tools.json
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
     "isRoot": true,
     "tools": {
         "vpk": {
-            "version": "0.0.942",
+            "version": "0.0.1053",
             "commands": [
                 "vpk"
             ]
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
index 5684edac33..d4780f4c44 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
@@ -41,7 +41,7 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="9.0.21" />
         <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
-        <PackageReference Include="Velopack" Version="0.0.1015" />
+        <PackageReference Include="Velopack" Version="0.0.1053" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <Content Include="..\Bit.BlazorUI.Demo.Client.Maui\wwwroot\index.html" Link="wwwroot\index.html">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json
index 5d6ab1af3b..6d20b3f7df 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
     "isRoot": true,
     "tools": {
         "vpk": {
-            "version": "0.0.1015",
+            "version": "0.0.1053",
             "commands": [
                 "vpk"
             ]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
index b6a6aa6723..c0f42fc822 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
@@ -22,7 +22,7 @@
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="9.0.21" />
         <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
         <PackageVersion Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
-        <PackageVersion Include="Velopack" Version="0.0.1015" />
+        <PackageVersion Include="Velopack" Version="0.0.1053" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
@@ -67,7 +67,7 @@
         <!--/-:msbuild-conditional:noEmit -->
         <PackageVersion Include="Humanizer" Version="2.14.1" />
         <PackageVersion Include="QRCoder" Version="1.6.0" />
-        <PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.2.0" />
+        <PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.3.0" />
         <PackageVersion Include="FluentEmail.Smtp" Version="3.0.2" />
         <PackageVersion Include="FluentStorage" Version="5.6.0" />
         <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
index 33dbf4ebc8..e2aa78d5c1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
@@ -22,7 +22,7 @@
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="8.0.100" />
         <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
         <PackageVersion Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
-        <PackageVersion Include="Velopack" Version="0.0.1015" />
+        <PackageVersion Include="Velopack" Version="0.0.1053" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
         <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />

From 140ef2875073a6e124c9b0e2f49dda3567cccd09 Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Tue, 31 Dec 2024 16:32:52 +0330
Subject: [PATCH 20/28] feat(templates): update layout structure of Boilerplate
 #9565 (#9566)

---
 .../Components/ClientAppCoordinator.cs        |   7 -
 .../Layout/DiagnosticModal.razor.scss         |  15 +-
 .../Layout/IdentityHeader.razor.scss          |   4 +-
 .../{RootLayout.razor => MainLayout.razor}    |  17 ++-
 ...ootLayout.razor.cs => MainLayout.razor.cs} |  18 ++-
 ...ayout.razor.scss => MainLayout.razor.scss} |   2 +-
 .../Components/Layout/MessageBox.razor.scss   |   5 +-
 .../Components/Layout/NavBar.razor            |   2 +-
 .../Components/Layout/NavBar.razor.scss       |   4 +-
 .../Components/Layout/NavPanel.razor          |  85 -----------
 .../Components/Layout/NavPanel.razor.cs       | 144 ------------------
 .../Components/Layout/NavPanel.razor.items.cs |  92 -----------
 .../Components/Layout/NavPanel.razor.scss     |  91 -----------
 .../Components/Layout/Prompt.razor.scss       |   5 +-
 .../Components/Layout/RootContainer.razor     |  23 ---
 .../Components/Layout/RootContainer.razor.cs  |  19 ---
 .../Layout/RootContainer.razor.scss           |  54 -------
 .../Components/Layout/SnackBar.razor.scss     |   4 +-
 .../Components/Layout/UserMenu.razor.scss     |   7 +-
 .../Categories/CategoriesPage.razor.scss      |   6 +-
 .../Products/ProductsPage.razor.scss          |   6 +-
 .../Pages/Authorized/Todo/TodoPage.razor.scss |  10 +-
 .../Components/Routes.razor                   |   2 +-
 .../Extensions/IJSRuntimeExtensions.cs        |   5 -
 .../MainLayout.razor.items.cs                 |  93 +++++++++++
 .../Boilerplate.Client.Core/Scripts/app.ts    |   5 -
 .../Styles/abstracts/_bit-css-variables.scss  |  19 +++
 .../Boilerplate.Client.Core/Styles/app.scss   |  35 +----
 .../compilerconfig.json                       |  18 +--
 29 files changed, 190 insertions(+), 607 deletions(-)
 rename src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/{RootLayout.razor => MainLayout.razor} (65%)
 rename src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/{RootLayout.razor.cs => MainLayout.razor.cs} (91%)
 rename src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/{RootLayout.razor.scss => MainLayout.razor.scss} (98%)
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.cs
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.items.cs
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.scss
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.cs
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.scss
 create mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/MainLayout.razor.items.cs

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/ClientAppCoordinator.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/ClientAppCoordinator.cs
index 2782afb47e..2f78be08af 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/ClientAppCoordinator.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/ClientAppCoordinator.cs
@@ -241,13 +241,6 @@ private async Task ConfigureUISetup()
                                                  await storageService.GetItem("Culture") ?? // 2- User settings
                                                  CultureInfo.CurrentUICulture.Name); // 3- OS settings
         }
-
-        var platformCssClass = AppPlatform.IsWindows ? "bit-windows" :
-                               AppPlatform.IsMacOS ? "bit-macos" :
-                               AppPlatform.IsIOS ? "bit-ios" :
-                               AppPlatform.IsAndroid ? "bit-android" : "bit-unknown";
-
-        await jsRuntime.ApplyBodyElementClasses(cssClasses: [platformCssClass], cssVariables: []);
     }
 
     private List<IDisposable> signalROnDisposables = [];
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/DiagnosticModal.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/DiagnosticModal.razor.scss
index f365a8aeeb..e3e0f9bb53 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/DiagnosticModal.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/DiagnosticModal.razor.scss
@@ -1,4 +1,5 @@
 @import '../../Styles/abstracts/_media-queries.scss';
+@import '../../Styles/abstracts/_bit-css-variables.scss';
 
 section {
     width: 100%;
@@ -8,10 +9,10 @@ section {
 ::deep {
     .modal {
         width: unset;
-        top: var(--app-inset-top);
-        left: var(--app-inset-left);
-        right: var(--app-inset-right);
-        bottom: var(--app-inset-bottom);
+        top: $bit-env-inset-top;
+        left: $bit-env-inset-left;
+        right: $bit-env-inset-right;
+        bottom: $bit-env-inset-bottom;
     }
 
     .container {
@@ -26,7 +27,7 @@ section {
         left: 50%;
         position: fixed;
         transform: translateX(-50%);
-        bottom: calc(var(--app-inset-bottom) + 1rem);
+        bottom: calc(#{$bit-env-inset-bottom} + 1rem);
     }
 
     .log-modal {
@@ -34,7 +35,7 @@ section {
         max-width: 40rem;
         max-height: 40rem;
         white-space: nowrap;
-        height: min(20rem, var(--app-height) - 4rem);
-        width: min(40rem, calc(var(--app-width) - 2rem));
+        height: min(20rem, #{$bit-env-height-available} - 4rem);
+        width: min(40rem, calc(#{$bit-env-width-available} - 2rem));
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss
index fea1898c1f..3fb393b9a1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss
@@ -15,8 +15,8 @@ header {
             height: unset;
             max-width: 225px;
             box-shadow: none;
-            bottom: var(--app-inset-bottom);
-            top: var(--app-inset-top) !important;
+            bottom: $bit-env-inset-bottom;
+            top: $bit-env-inset-top !important;
         }
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor
similarity index 65%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor
index d06dc35b58..cf13a1541d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor
@@ -1,11 +1,12 @@
 @inherits LayoutComponentBase
 
-<RootContainer IsOnline="isOnline"
-               CurrentDir="currentDir"
-               CurrentTheme="currentTheme"
-               IsAuthenticated="isAuthenticated"
-               CurrentRouteData="currentRouteData"
-               IsCrossLayoutPage="isCrossLayoutPage">
+
+<BitAppShell CascadingValues="@([new(currentDir),
+                                 new(isOnline, Parameters.IsOnline),
+                                 new(currentTheme, Parameters.CurrentTheme),
+                                 new(isAuthenticated, Parameters.IsAuthenticated),
+                                 new(currentRouteData, Parameters.CurrentRouteData),
+                                 new(isCrossLayoutPage, Parameters.IsCrossLayoutPage)])">
     <main class="@GetMainCssClass()">
         <div class="root">
             @if (isAuthenticated is false)
@@ -14,7 +15,7 @@
             }
             else if (isAuthenticated is true)
             {
-                <NavPanel />
+                <BitNavPanel @bind-IsOpen="isNavPanelOpen" Items="navPanelItems" />
             }
 
             <div class="stack">
@@ -41,7 +42,7 @@
             <NavBar />
         }
     </main>
-</RootContainer>
+</BitAppShell>
 
 <SnackBar />
 <DiagnosticModal />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor.cs
similarity index 91%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor.cs
index 352b1f01d5..c97dc08cec 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor.cs
@@ -3,9 +3,10 @@
 
 namespace Boilerplate.Client.Core.Components.Layout;
 
-public partial class RootLayout : IAsyncDisposable
+public partial class MainLayout : IAsyncDisposable
 {
     private BitDir? currentDir;
+    private bool isNavPanelOpen;
     private readonly BitModalParameters modalParameters = new() { Classes = new() { Root = "modal" } };
 
     /// <summary>
@@ -21,12 +22,14 @@ public partial class RootLayout : IAsyncDisposable
     private AppThemeType? currentTheme;
     private RouteData? currentRouteData;
     private List<Action> unsubscribers = [];
+    private List<BitNavItem> navPanelItems = [];
 
 
     [AutoInject] private Keyboard keyboard = default!;
     [AutoInject] private AuthManager authManager = default!;
     [AutoInject] private ThemeService themeService = default!;
     [AutoInject] private PubSubService pubSubService = default!;
+    [AutoInject] private BitExtraServices bitExtraServices = default!;
     [AutoInject] private IExceptionHandler exceptionHandler = default!;
     [AutoInject] private ITelemetryContext telemetryContext = default!;
     [AutoInject] private NavigationManager navigationManager = default!;
@@ -40,19 +43,24 @@ protected override async Task OnInitializedAsync()
     {
         try
         {
+            InitializeNavPanelItems();
+
             navigationManager.LocationChanged += NavigationManagerLocationChanged;
             authManager.AuthenticationStateChanged += AuthenticationStateChanged;
+
             unsubscribers.Add(pubSubService.Subscribe(ClientPubSubMessages.CULTURE_CHANGED, async _ =>
             {
                 SetCurrentDir();
                 StateHasChanged();
             }));
+
             unsubscribers.Add(pubSubService.Subscribe(ClientPubSubMessages.THEME_CHANGED, async payload =>
             {
                 if (payload is null) return;
                 currentTheme = (AppThemeType)payload;
                 StateHasChanged();
             }));
+
             unsubscribers.Add(pubSubService.Subscribe(ClientPubSubMessages.ROUTE_DATA_UPDATED, async payload =>
             {
                 currentRouteData = (RouteData?)payload;
@@ -66,11 +74,19 @@ protected override async Task OnInitializedAsync()
                 await InvokeAsync(StateHasChanged);
             }));
 
+            unsubscribers.Add(pubSubService.Subscribe(ClientPubSubMessages.OPEN_NAV_PANEL, async _ =>
+            {
+                isNavPanelOpen = true;
+                StateHasChanged();
+            }));
+
             isAuthenticated = await prerenderStateService.GetValue(async () => (await AuthenticationStateTask).User.IsAuthenticated());
 
             SetCurrentDir();
             currentTheme = await themeService.GetCurrentTheme();
 
+            await bitExtraServices.AddRootCssClasses();
+
             await base.OnInitializedAsync();
         }
         catch (Exception exp)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor.scss
similarity index 98%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.scss
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor.scss
index 92e4903066..c70dd126e9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor.scss
@@ -7,7 +7,7 @@ main {
 
     @include lt-md {
         height: unset;
-        min-height: var(--app-height);
+        min-height: $bit-env-height-available;
     }
 
     &.unauthenticated {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MessageBox.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MessageBox.razor.scss
index 0e7cb6ba05..6b2cdb1430 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MessageBox.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MessageBox.razor.scss
@@ -1,9 +1,10 @@
 @import '../../Styles/abstracts/_media-queries.scss';
+@import '../../Styles/abstracts/_bit-css-variables.scss';
 
 section {
     padding: 1rem;
     min-width: 20rem;
-    max-height: var(--app-height);
+    max-height: $bit-env-height-available;
 
     @include lt-md {
         min-width: unset;
@@ -20,6 +21,6 @@ section {
 
 ::deep {
     .stack {
-        max-height: calc(var(--app-height) - 3rem);
+        max-height: calc(#{$bit-env-height-available} - 3rem);
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor
index 467e7ba42c..69a1f4d1f4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor
@@ -9,8 +9,8 @@
         @*#endif*@
         @*#if (sample == "Admin")*@
         <BitNavBarOption Text="@Localizer[nameof(AppStrings.Dashboard)]" IconName="@BitIconName.BarChartVerticalFill" Url="@Urls.DashboardPage" />
-        <BitNavBarOption Text="@Localizer[nameof(AppStrings.Products)]" IconName="@BitIconName.Product" Url="@Urls.ProductsPage" />
         <BitNavBarOption Text="@Localizer[nameof(AppStrings.Categories)]" IconName="@BitIconName.BuildQueue" Url="@Urls.CategoriesPage" />
+        <BitNavBarOption Text="@Localizer[nameof(AppStrings.Products)]" IconName="@BitIconName.Product" Url="@Urls.ProductsPage" />
         @*#endif*@
         <BitNavBarOption Text="@Localizer[nameof(AppStrings.Terms)]" IconName="@BitIconName.EntityExtraction" Url="@Urls.TermsPage" />
     </BitNavBar>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor.scss
index b38dfc96a2..930eab31cc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor.scss
@@ -7,9 +7,9 @@ section {
     height: 3.5rem;
     position: fixed;
     align-items: center;
-    max-width: var(--app-width);
+    bottom: $bit-env-inset-bottom;
     justify-content: space-around;
-    bottom: var(--app-inset-bottom);
+    max-width: $bit-env-width-available;
     background-color: $bit-color-background-primary;
     border-top: 1px solid $bit-color-border-tertiary;
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor
deleted file mode 100644
index a7704aab71..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor
+++ /dev/null
@@ -1,85 +0,0 @@
-@inherits AppComponentBase;
-
-@{
-    var isToggled = !isPanelOpen && isPanelToggled;
-}
-
-@if (isPanelOpen)
-{
-    <div class="panel-overlay" @onclick=ClosePanel></div>
-}
-
-<section class="@($"{(isPanelOpen ? "" : "closed")} {(isToggled ? "toggled" : "")} {(currentDir == BitDir.Rtl ? "rtl" : "")}".Trim())"
-         style="@GetPanelStyle()">
-    <BitSwipeTrap Style="width:100%; height:100%"
-                  Threshold="5"
-                  Throttle="10"
-                  OnMove="HandleOnSwipeMove"
-                  OnEnd="HandleOnSwipeEnd"
-                  OnTrigger="HandleOnSwipeTrigger">
-        <BitCard Class="panel">
-            <BitStack HorizontalAlign="@(isToggled ? BitAlignment.Center : BitAlignment.Start)" Grows>
-                <BitStack Horizontal AutoHeight Alignment="BitAlignment.Center">
-                    <BitImage Src="_content/Boilerplate.Client.Core/images/bit-logo.svg"
-                              Visibility="@(isToggled ? BitVisibility.Collapsed : BitVisibility.Visible)" />
-                    <BitSpacer Visibility="@(isToggled ? BitVisibility.Collapsed : BitVisibility.Visible)" />
-                    <BitButton IconOnly FixedColor
-                               Class="toggle-btn"
-                               Size="BitSize.Large"
-                               OnClick="TogglePanel"
-                               Variant="BitVariant.Text"
-                               Color="BitColor.TertiaryBackground"
-                               IconName="@BitIconName.ColumnRightTwoThirds" />
-                </BitStack>
-
-                <BitSearchBox @ref="searchBoxRef"
-                              Underlined Immediate DebounceTime="500"
-                              OnChange="WrapHandled<string?>(SearchNavItems)"
-                              Style="@(isToggled ? "display:none" : "")"
-                              Styles="@(new() { Root="width:100%", InputContainer="width:100%" })" />
-
-                @if (isToggled)
-                {
-                    <BitButton IconOnly FixedColor
-                               Class="toggle-btn"
-                               Size="BitSize.Large"
-                               OnClick="ToggleForSearch"
-                               Variant="BitVariant.Text"
-                               IconName="@BitIconName.Search"
-                               Color="BitColor.TertiaryBackground" />
-                }
-
-                @if (filteredNavItems.Count == 0)
-                {
-                    if (isToggled is false)
-                    {
-                        <BitText>@Localizer[nameof(AppStrings.NothingFound)]</BitText>
-                    }
-                }
-                else
-                {
-                    <BitNav FullWidth
-                            IconOnly="isToggled"
-                            Items="filteredNavItems"
-                            Accent="BitColor.SecondaryBackground"
-                            DefaultSelectedItem="filteredNavItems[0]"
-                            OnItemClick="(BitNavItem item) => HandleNavItemClick(item)"
-                            Styles="@(new() { SelectedItemContainer = "background-color: var(--bit-clr-bg-sec-active)" })" />
-                }
-
-                <BitSpacer />
-
-                <BitActionButton IconOnly="isToggled"
-                                 Color="BitColor.Error"
-                                 FullWidth="!isToggled"
-                                 OnClick="ShowSignOutConfirm"
-                                 IconName="@BitIconName.SignOut"
-                                 Title="@Localizer[nameof(AppStrings.SignOut)]">
-                    @(isToggled ? "" : Localizer[nameof(AppStrings.SignOut)])
-                </BitActionButton>
-            </BitStack>
-        </BitCard>
-    </BitSwipeTrap>
-</section>
-
-<SignOutConfirmDialog @bind-IsOpen="isSignOutConfirmOpen" />
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.cs
deleted file mode 100644
index c4c59f8bc9..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-namespace Boilerplate.Client.Core.Components.Layout;
-
-public partial class NavPanel
-{
-    private bool disposed;
-    private bool isPanelOpen;
-    private bool isPanelToggled;
-    private bool isSignOutConfirmOpen;
-    private List<BitNavItem> allNavItems = [];
-    private Action unsubOpenNavPanel = default!;
-    private BitSearchBox searchBoxRef = default!;
-    private Action unsubUserDataChange = default!;
-    private List<BitNavItem> flatNavItemList = [];
-    private List<BitNavItem> filteredNavItems = [];
-
-
-    [CascadingParameter] private BitDir? currentDir { get; set; }
-
-
-    protected override async Task OnInitAsync()
-    {
-        CreateNavItems();
-        flatNavItemList = Flatten(allNavItems).ToList().FindAll(link => !string.IsNullOrEmpty(link.Url));
-
-        SearchNavItems(null);
-
-        unsubOpenNavPanel = PubSubService.Subscribe(ClientPubSubMessages.OPEN_NAV_PANEL, async _ =>
-        {
-            isPanelOpen = true;
-            StateHasChanged();
-        });
-    }
-
-
-    private void ShowSignOutConfirm()
-    {
-        isSignOutConfirmOpen = true;
-        ClosePanel();
-    }
-
-    private void HandleNavItemClick(BitNavItem item)
-    {
-        if (string.IsNullOrEmpty(item.Url)) return;
-
-        filteredNavItems = allNavItems;
-
-        ClosePanel();
-    }
-
-    private void ClosePanel()
-    {
-        isPanelOpen = false;
-    }
-
-    private void TogglePanel()
-    {
-        isPanelToggled = !isPanelToggled;
-        if (isPanelToggled)
-        {
-            SearchNavItems(null);
-        }
-    }
-
-    private async Task ToggleForSearch()
-    {
-        isPanelToggled = false;
-        await Task.Delay(1);
-        await searchBoxRef.FocusAsync();
-    }
-
-    private void SearchNavItems(string? searchText)
-    {
-        filteredNavItems = allNavItems;
-        if (searchText is null) return;
-
-        filteredNavItems = allNavItems;
-        if (string.IsNullOrEmpty(searchText)) return;
-
-        var mainItems = flatNavItemList
-            .FindAll(item => searchText.Split(' ')
-                                    .Where(t => string.IsNullOrEmpty(t) is false)
-                                    .Any(t => $"{item.Text} {item.Description}".Contains(t, StringComparison.InvariantCultureIgnoreCase)));
-
-        var subItems = flatNavItemList
-            .FindAll(item => searchText.Split(' ')
-                                    .Where(t => string.IsNullOrEmpty(t) is false)
-                                    .Any(t => item.Data?.ToString()?.Contains(t, StringComparison.InvariantCultureIgnoreCase) ?? false));
-
-        filteredNavItems = [.. mainItems, .. subItems];
-    }
-
-
-    private decimal diffXPanel;
-    private void HandleOnSwipeMove(BitSwipeTrapEventArgs args)
-    {
-        if (isPanelOpen is false) return;
-        
-        diffXPanel = args.DiffX;
-        StateHasChanged();
-    }
-    private void HandleOnSwipeEnd(BitSwipeTrapEventArgs args)
-    {
-        if (isPanelOpen is false) return;
-
-        diffXPanel = 0;
-        StateHasChanged();
-    }
-    private void HandleOnSwipeTrigger(BitSwipeTrapTriggerArgs args)
-    {
-        if (isPanelOpen is false) return;
-
-        if ((currentDir != BitDir.Rtl && args.Direction == BitSwipeDirection.Left) ||
-            (currentDir == BitDir.Rtl && args.Direction == BitSwipeDirection.Right))
-        {
-            diffXPanel = 0;
-            ClosePanel();
-            StateHasChanged();
-        }
-    }
-    private string GetPanelStyle()
-    {
-        if (isPanelOpen is false) return string.Empty;
-
-        return ((currentDir != BitDir.Rtl && diffXPanel < 0) || (currentDir == BitDir.Rtl && diffXPanel > 0))
-                ? $"transform: translateX({diffXPanel}px)"
-                : string.Empty;
-    }
-
-
-    private static IEnumerable<BitNavItem> Flatten(IEnumerable<BitNavItem> e) => e.SelectMany(c => Flatten(c.ChildItems)).Concat(e);
-
-
-    protected override async ValueTask DisposeAsync(bool disposing)
-    {
-        await base.DisposeAsync(disposing);
-
-        if (disposed || disposing is false) return;
-
-        unsubOpenNavPanel?.Invoke();
-        unsubUserDataChange?.Invoke();
-
-        disposed = true;
-    }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.items.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.items.cs
deleted file mode 100644
index ef671012e4..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.items.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//+:cnd:noEmit
-namespace Boilerplate.Client.Core.Components.Layout;
-
-public partial class NavPanel
-{
-    private void CreateNavItems()
-    {
-        allNavItems =
-        [
-            new()
-            {
-                Text = Localizer[nameof(AppStrings.Home)],
-                IconName = BitIconName.Home,
-                Url = Urls.HomePage,
-            },
-            //#if (sample == "Admin")
-            new()
-            {
-                Text = Localizer[nameof(AppStrings.AdminPanel)],
-                IconName = BitIconName.Admin,
-                ChildItems =
-                [
-                    new() {
-                        Text = Localizer[nameof(AppStrings.Dashboard)],
-                        IconName = BitIconName.BarChartVerticalFill,
-                        Url = Urls.DashboardPage,
-                    },
-                    new() {
-                        Text = Localizer[nameof(AppStrings.Categories)],
-                        IconName = BitIconName.BuildQueue,
-                        Url = Urls.CategoriesPage,
-                    },
-                    new() {
-                        Text = Localizer[nameof(AppStrings.Products)],
-                        IconName = BitIconName.Product,
-                        Url = Urls.ProductsPage,
-                    }
-                ]
-            },
-            //#elif (sample == "Todo")
-            new()
-            {
-                Text = Localizer[nameof(AppStrings.Todo)],
-                IconName = BitIconName.ToDoLogoOutline,
-                Url = Urls.TodoPage,
-            },
-            //#endif
-            new()
-            {
-                Text = Localizer[nameof(AppStrings.Settings)],
-                IconName = BitIconName.Equalizer,
-                Url = Urls.SettingsPage,
-                AdditionalUrls =
-                [
-                    $"{Urls.SettingsPage}/{Urls.SettingsSections.Profile}",
-                    $"{Urls.SettingsPage}/{Urls.SettingsSections.Account}",
-                    $"{Urls.SettingsPage}/{Urls.SettingsSections.Tfa}",
-                    $"{Urls.SettingsPage}/{Urls.SettingsSections.Sessions}",
-                ]
-            },
-            //#if (offlineDb == true)
-            new()
-            {
-                Text = Localizer[nameof(AppStrings.OfflineEditProfileTitle)],
-                IconName = BitIconName.EditContact,
-                Url = Urls.OfflineEditProfilePage,
-            },
-            //#endif
-            new()
-            {
-                Text = Localizer[nameof(AppStrings.Terms)],
-                IconName = BitIconName.EntityExtraction,
-                Url = Urls.TermsPage,
-            }
-        ];
-
-        if (AppPlatform.IsBlazorHybrid)
-        {
-            // Currently, the "About" page is absent from the Client/Core project, rendering it inaccessible on the web platform.
-            // In order to exhibit a sample page that grants direct access to native functionalities without dependence on
-            // dependency injection (DI) or publish-subscribe patterns, the "About" page is integrated within Blazor
-            // hybrid projects like Client/Maui.
-
-            allNavItems.Add(new()
-            {
-                Text = Localizer[nameof(AppStrings.AboutTitle)],
-                IconName = BitIconName.Info,
-                Url = Urls.AboutPage,
-            });
-        }
-    }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.scss
deleted file mode 100644
index 8f262970e9..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor.scss
+++ /dev/null
@@ -1,91 +0,0 @@
-@import '../../Styles/abstracts/_media-queries.scss';
-@import '../../Styles/abstracts/_bit-css-variables.scss';
-
-section {
-    top: 0;
-    padding: 1rem;
-    min-width: 14rem;
-    max-width: 14rem;
-    position: sticky;
-    overflow: hidden auto;
-    height: var(--app-height);
-
-    &.toggled {
-        min-width: 6rem;
-        max-width: 6rem;
-    }
-
-    @include lt-md {
-        z-index: 3;
-        padding: 0;
-        opacity: 1;
-        position: fixed;
-        height: unset !important;
-        top: var(--app-inset-top);
-        bottom: var(--app-inset-bottom);
-        transition: transform 150ms ease-out, opacity 100ms ease-in;
-
-        &.closed {
-            opacity: 0;
-            transform: translateX(-100%);
-
-            &.rtl {
-                transform: translateX(100%);
-            }
-        }
-    }
-
-    &::-webkit-scrollbar {
-        width: 0;
-    }
-}
-
-.bit-macos {
-    section {
-        height: -webkit-fill-available;
-
-        ::deep .panel {
-            height: -webkit-fill-available;
-        }
-    }
-}
-
-.panel-overlay {
-    inset: 0;
-    z-index: 2;
-    width: 100%;
-    height: 100%;
-    position: fixed;
-    min-height: 100vh;
-    background-color: rgb(0, 0, 0, 0.42);
-
-    @include gt-sm {
-        display: none;
-    }
-}
-
-::deep {
-    .panel {
-        width: auto;
-        display: flex;
-        padding: 0.5rem;
-        min-height: 100%;
-        height: fit-content;
-        flex-direction: column;
-        background-color: $bit-color-background-secondary;
-
-        @include lt-md {
-            padding: 1rem;
-        }
-    }
-
-    .toggle-btn {
-        @include lt-md {
-            display: none;
-        }
-    }
-
-    a {
-        text-decoration: none;
-    }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Prompt.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Prompt.razor.scss
index 0e7cb6ba05..6b2cdb1430 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Prompt.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Prompt.razor.scss
@@ -1,9 +1,10 @@
 @import '../../Styles/abstracts/_media-queries.scss';
+@import '../../Styles/abstracts/_bit-css-variables.scss';
 
 section {
     padding: 1rem;
     min-width: 20rem;
-    max-height: var(--app-height);
+    max-height: $bit-env-height-available;
 
     @include lt-md {
         min-width: unset;
@@ -20,6 +21,6 @@ section {
 
 ::deep {
     .stack {
-        max-height: calc(var(--app-height) - 3rem);
+        max-height: calc(#{$bit-env-height-available} - 3rem);
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor
deleted file mode 100644
index 5469518310..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-<CascadingValue Value="CurrentDir">
-    <CascadingValue Value="CurrentTheme" Name="@Parameters.CurrentTheme">
-        <CascadingValue Value="CurrentRouteData" Name="@Parameters.CurrentRouteData">
-            <CascadingValue Value="IsAuthenticated" Name="@Parameters.IsAuthenticated">
-                <CascadingValue Value="IsCrossLayoutPage" Name="@Parameters.IsCrossLayoutPage">
-                    <CascadingValue Value="IsOnline" Name="@Parameters.IsOnline">
-                        <div class="layout">
-                            <div class="inset-top"></div>
-                            <div class="inset-center" dir="@CurrentDir?.ToString().ToLower()">
-                                <div class="inset-left"></div>
-                                <div class="inset-main" id="bit-inset-main">
-                                    @ChildContent
-                                </div>
-                                <div class="inset-right"></div>
-                            </div>
-                            <div class="inset-bottom"></div>
-                        </div>
-                    </CascadingValue>
-                </CascadingValue>
-            </CascadingValue>
-        </CascadingValue>
-    </CascadingValue>
-</CascadingValue>
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.cs
deleted file mode 100644
index 08bf0365c0..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Boilerplate.Client.Core.Components.Layout;
-
-public partial class RootContainer
-{
-    [Parameter] public RenderFragment? ChildContent { get; set; }
-
-    /// <summary>
-    /// <inheritdoc cref="Parameters.IsOnline"/>
-    /// </summary>
-    [Parameter] public bool? IsOnline { get; set; }
-    [Parameter] public BitDir? CurrentDir { get; set; }
-    [Parameter] public bool? IsAuthenticated { get; set; }
-    /// <summary>
-    /// <inheritdoc cref="Parameters.IsCrossLayoutPage"/>
-    /// </summary>
-    [Parameter] public bool? IsCrossLayoutPage { get; set; }
-    [Parameter] public AppThemeType? CurrentTheme { get; set; }
-    [Parameter] public RouteData? CurrentRouteData { get; set; }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.scss
deleted file mode 100644
index 64d032ac15..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-@import '../../Styles/abstracts/_media-queries.scss';
-@import '../../Styles/abstracts/_bit-css-variables.scss';
-
-.layout {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    background-color: $bit-color-background-primary;
-}
-
-.inset-top {
-    width: 100%;
-    z-index: 999999;
-    height: var(--app-inset-top);
-    background-color: $bit-color-background-primary;
-}
-
-.inset-bottom {
-    width: 100%;
-    z-index: 999999;
-    height: var(--app-inset-bottom);
-    background-color: $bit-color-background-primary;
-}
-
-.inset-center {
-    width: 100%;
-    display: flex;
-    height: calc(100% - var(--app-inset-top) - var(--app-inset-bottom));
-}
-
-.inset-main {
-    height: 100%;
-    display: flex;
-    overflow: auto;
-    position: relative;
-    scroll-behavior: smooth;
-    overscroll-behavior: none;
-    width: calc(100% - var(--app-inset-left) - var(--app-inset-right));
-}
-
-.inset-left {
-    height: 100%;
-    z-index: 999999;
-    width: var(--app-inset-left);
-    background-color: $bit-color-background-primary;
-}
-
-.inset-right {
-    height: 100%;
-    z-index: 999999;
-    width: var(--app-inset-right);
-    background-color: $bit-color-background-primary;
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/SnackBar.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/SnackBar.razor.scss
index 2d6c5aa7f5..50090790da 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/SnackBar.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/SnackBar.razor.scss
@@ -1,3 +1,5 @@
+@import '../../Styles/abstracts/_bit-css-variables.scss';
+
 .snackbar {
-    bottom: calc(var(--app-inset-bottom) + var(--bit-spa-scaling-factor));
+    bottom: calc(#{$bit-env-inset-bottom} + 1rem);
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor.scss
index ae7f9ec7ea..a80cfcd084 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor.scss
@@ -1,4 +1,5 @@
 @import '../../Styles/abstracts/_media-queries.scss';
+@import '../../Styles/abstracts/_bit-css-variables.scss';
 
 ::deep {
     .user-menu-callout {
@@ -7,9 +8,9 @@
         @include lt-sm {
             height: unset;
             box-shadow: none;
-            top: var(--app-inset-top) !important;
-            bottom: var(--app-inset-bottom) !important;
-            inset-inline-end: var(--app-inset-inline-start) !important;
+            top: $bit-env-inset-top !important;
+            bottom: $bit-env-inset-bottom !important;
+            inset-inline-end: $bit-env-inset-inline-start !important;
         }
     }
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/CategoriesPage.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/CategoriesPage.razor.scss
index 2c20fa7e0e..bfd93bb1c8 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/CategoriesPage.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/CategoriesPage.razor.scss
@@ -7,14 +7,14 @@ section {
 
 .grid-container {
     overflow: auto;
-    height: calc(var(--app-height) - 14rem);
+    height: calc(#{$bit-env-height-available} - 14rem);
 
     @include lt-md {
-        height: calc(var(--app-height) - 17rem);
+        height: calc(#{$bit-env-height-available} - 17rem);
     }
 
     @include lt-sm {
-        height: calc(var(--app-height) - 16rem);
+        height: calc(#{$bit-env-height-available} - 16rem);
     }
 }
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor.scss
index 3c36cb4352..06bda495a9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor.scss
@@ -7,14 +7,14 @@ section {
 
 .grid-container {
     overflow: auto;
-    height: calc(var(--app-height) - 14rem);
+    height: calc(#{$bit-env-height-available} - 14rem);
 
     @include lt-md {
-        height: calc(var(--app-height) - 17rem);
+        height: calc(#{$bit-env-height-available} - 17rem);
     }
 
     @include lt-sm {
-        height: calc(var(--app-height) - 16rem);
+        height: calc(#{$bit-env-height-available} - 16rem);
     }
 }
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Todo/TodoPage.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Todo/TodoPage.razor.scss
index b22d8d1fb4..bdf0421e21 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Todo/TodoPage.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Todo/TodoPage.razor.scss
@@ -42,22 +42,22 @@ section {
         @include lt-sm {
             height: unset;
             box-shadow: none;
-            bottom: var(--app-inset-bottom);
-            top: var(--app-inset-top) !important;
+            bottom: $bit-env-inset-bottom;
+            top: $bit-env-inset-top !important;
         }
     }
 
     .todo-list {
         width: 100%;
         background-color: var(--bit-clr-bg-sec);
-        height: calc(var(--app-height) - 14rem);
+        height: calc(#{$bit-env-height-available} - 14rem);
 
         @include lt-md {
-            height: calc(var(--app-height) - 17rem);
+            height: calc(#{$bit-env-height-available} - 17rem);
         }
 
         @include lt-sm {
-            height: calc(var(--app-height) - 18rem);
+            height: calc(#{$bit-env-height-available} - 18rem);
         }
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Routes.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Routes.razor
index 878de0a5f2..987329802f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Routes.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Routes.razor
@@ -1,7 +1,7 @@
 <AppErrorBoundary>
     <CascadingAuthenticationState>
         <ClientAppCoordinator />
-        <LayoutView Layout="@typeof(RootLayout)">
+        <LayoutView Layout="@typeof(MainLayout)">
             <Router AppAssembly="@GetType().Assembly"
                     AdditionalAssemblies="@(AssemblyLoadContext.Default.Assemblies.Where(asm => asm.GetName().Name?.Contains("Boilerplate.Client") is true))">
                 <Found Context="routeData">
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IJSRuntimeExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IJSRuntimeExtensions.cs
index d120fd3bdb..c16c1e1052 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IJSRuntimeExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IJSRuntimeExtensions.cs
@@ -13,11 +13,6 @@ public static ValueTask<string> GetTimeZone(this IJSRuntime jsRuntime)
         return jsRuntime.InvokeAsync<string>("App.getTimeZone");
     }
 
-    public static ValueTask ApplyBodyElementClasses(this IJSRuntime jsRuntime, List<string> cssClasses, Dictionary<string, string> cssVariables)
-    {
-        return jsRuntime.InvokeVoidAsync("App.applyBodyElementClasses", cssClasses, cssVariables);
-    }
-
     //#if (captcha == "reCaptcha")
     public static ValueTask<string> GoogleRecaptchaGetResponse(this IJSRuntime jsRuntime)
     {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/MainLayout.razor.items.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/MainLayout.razor.items.cs
new file mode 100644
index 0000000000..9ac9225f68
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/MainLayout.razor.items.cs
@@ -0,0 +1,93 @@
+namespace Boilerplate.Client.Core.Components.Layout;
+
+public partial class MainLayout
+{
+    [AutoInject] protected IStringLocalizer<AppStrings> localizer = default!;
+
+    private void InitializeNavPanelItems()
+    {
+        navPanelItems =
+        [
+            new()
+            {
+                Text = localizer[nameof(AppStrings.Home)],
+                IconName = BitIconName.Home,
+                Url = Urls.HomePage,
+            },
+            //#if (sample == "Admin")
+            new()
+            {
+                Text = localizer[nameof(AppStrings.AdminPanel)],
+                IconName = BitIconName.Admin,
+                ChildItems =
+                [
+                    new() {
+                        Text = localizer[nameof(AppStrings.Dashboard)],
+                        IconName = BitIconName.BarChartVerticalFill,
+                        Url = Urls.DashboardPage,
+                    },
+                    new() {
+                        Text = localizer[nameof(AppStrings.Categories)],
+                        IconName = BitIconName.BuildQueue,
+                        Url = Urls.CategoriesPage,
+                    },
+                    new() {
+                        Text = localizer[nameof(AppStrings.Products)],
+                        IconName = BitIconName.Product,
+                        Url = Urls.ProductsPage,
+                    }
+                ]
+            },
+            //#elif (sample == "Todo")
+            new()
+            {
+                Text = localizer[nameof(AppStrings.Todo)],
+                IconName = BitIconName.ToDoLogoOutline,
+                Url = Urls.TodoPage,
+            },
+            //#endif
+            //#if (offlineDb == true)
+            new()
+            {
+                Text = localizer[nameof(AppStrings.OfflineEditProfileTitle)],
+                IconName = BitIconName.EditContact,
+                Url = Urls.OfflineEditProfilePage,
+            },
+            //#endif
+            new()
+            {
+                Text = localizer[nameof(AppStrings.Terms)],
+                IconName = BitIconName.EntityExtraction,
+                Url = Urls.TermsPage,
+            }
+        ];
+
+        // Currently, the "About" page is absent from the Client/Core project, rendering it inaccessible on the web platform.
+        // In order to exhibit a sample page that grants direct access to native functionalities without dependence on
+        // dependency injection (DI) or publish-subscribe patterns, the "About" page is integrated within Blazor
+        // hybrid projects like Client/Maui.
+        if (AppPlatform.IsBlazorHybrid)
+        {
+            navPanelItems.Add(new()
+            {
+                Text = localizer[nameof(AppStrings.AboutTitle)],
+                IconName = BitIconName.Info,
+                Url = Urls.AboutPage,
+            });
+        }
+
+        navPanelItems.Add(new()
+        {
+            Text = localizer[nameof(AppStrings.Settings)],
+            IconName = BitIconName.Equalizer,
+            Url = Urls.SettingsPage,
+            AdditionalUrls =
+            [
+                $"{Urls.SettingsPage}/{Urls.SettingsSections.Profile}",
+                $"{Urls.SettingsPage}/{Urls.SettingsSections.Account}",
+                $"{Urls.SettingsPage}/{Urls.SettingsSections.Tfa}",
+                $"{Urls.SettingsPage}/{Urls.SettingsSections.Sessions}",
+            ]
+        });
+    }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Scripts/app.ts b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Scripts/app.ts
index b116975150..e3cae28eb5 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Scripts/app.ts
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Scripts/app.ts
@@ -22,11 +22,6 @@ class App {
         return App.jsBridgeObj?.invokeMethodAsync('PublishMessage', message, payload);
     }
 
-    public static applyBodyElementClasses(cssClasses: string[], cssVariables: any): void {
-        cssClasses?.forEach(c => document.body.classList.add(c));
-        Object.keys(cssVariables).forEach(key => document.body.style.setProperty(key, cssVariables[key]));
-    }
-
     public static getTimeZone(): string {
         return Intl.DateTimeFormat().resolvedOptions().timeZone;
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/abstracts/_bit-css-variables.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/abstracts/_bit-css-variables.scss
index 3182fe1539..3f0c001bbc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/abstracts/_bit-css-variables.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/abstracts/_bit-css-variables.scss
@@ -320,3 +320,22 @@ $bit-typography-inherit-font-weight: var(--bit-tpg-inherit-font-weight);
 $bit-typography-inherit-font-size: var(--bit-tpg-inherit-font-size);
 $bit-typography-inherit-line-height: var(--bit-tpg-inherit-line-height);
 $bit-typography-inherit-letter-spacing: var(--bit-tpg-inherit-letter-spacing);
+
+// Extras
+$bit-env-inset-top: var(--bit-env-inset-top);
+$bit-env-inset-left: var(--bit-env-inset-left);
+$bit-env-inset-right: var(--bit-env-inset-right);
+$bit-env-inset-bottom: var(--bit-env-inset-bottom);
+//--
+$bit-env-width-vw: var(--bit-env-width-vw);
+$bit-env-height-vh: var(--bit-env-height-vh);
+$bit-env-width-percent: var(--bit-env-width-per);
+$bit-env-height-percent: var(--bit-env-height-per);
+$bit-env-width-available: var(--bit-env-width-avl);
+$bit-env-height-available: var(--bit-env-height-avl);
+//--
+$bit-env-inset-inline-start: var(--bit-env-inset-inline-start);
+$bit-env-inset-inline-end: var(--bit-env-inset-inline-end);
+//--
+$bit-env-window-width: var(--bit-env-win-width);
+$bit-env-window-height: var(--bit-env-win-height);
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/app.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/app.scss
index cda4bec71d..c13f5c9fe4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/app.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/app.scss
@@ -1,32 +1,11 @@
 @import '../Styles/abstracts/_media-queries.scss';
+@import '../Styles/abstracts/_bit-css-variables.scss';
 
 :root[bit-theme="dark"] {
     //--bit-clr-bg-pri: #010409;
     // In case you need to change the background color, make sure to also update ThemeColors.cs's PrimaryDarkBgColor accordingly.
 }
 
-:root {
-    --app-inset-top: env(safe-area-inset-top);
-    --app-inset-left: env(safe-area-inset-left);
-    --app-inset-right: env(safe-area-inset-right);
-    --app-inset-bottom: env(safe-area-inset-bottom);
-    //--
-    --app-width-vw: calc(100vw - var(--app-inset-left) - var(--app-inset-right));
-    --app-height-vh: calc(100vh - var(--app-inset-top) - var(--app-inset-bottom));
-    --app-width-per: calc(100% - var(--app-inset-left) - var(--app-inset-right));
-    --app-height-per: calc(100% - var(--app-inset-top) - var(--app-inset-bottom));
-    --app-width: calc(var(--win-width) - var(--app-inset-left) - var(--app-inset-right));
-    --app-height: calc(var(--win-height) - var(--app-inset-top) - var(--app-inset-bottom));
-    //--
-    --app-inset-inline-start: var(--app-inset-left);
-    --app-inset-inline-end: var(--app-inset-right);
-
-    [dir="rtl"] {
-        --app-inset-inline-start: var(--app-inset-right);
-        --app-inset-inline-end: var(--app-inset-left);
-    }
-}
-
 * {
     box-sizing: border-box;
     font-family: "Segoe UI";
@@ -72,12 +51,12 @@ p {
 }
 
 .modal {
-    width: var(--app-width);
-    height: var(--app-height);
-    top: var(--app-inset-top);
-    left: var(--app-inset-left);
-    right: var(--app-inset-right);
-    bottom: var(--app-inset-bottom);
+    top: $bit-env-inset-top;
+    left: $bit-env-inset-left;
+    right: $bit-env-inset-right;
+    bottom: $bit-env-inset-bottom;
+    width: $bit-env-width-available;
+    height: $bit-env-height-available;
 }
 
 div[dir=rtl] {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/compilerconfig.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/compilerconfig.json
index 3b4ebe9f7d..dba186dabc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/compilerconfig.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/compilerconfig.json
@@ -30,6 +30,12 @@
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
+    {
+        "outputFile": "Components/Layout/MainLayout.razor.css",
+        "inputFile": "Components/Layout/MainLayout.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
     {
         "outputFile": "Components/Layout/MessageBox.razor.css",
         "inputFile": "Components/Layout/MessageBox.razor.scss",
@@ -60,18 +66,6 @@
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
-    {
-        "outputFile": "Components/Layout/RootContainer.razor.css",
-        "inputFile": "Components/Layout/RootContainer.razor.scss",
-        "minify": { "enabled": false },
-        "options": { "sourceMap": false }
-    },
-    {
-        "outputFile": "Components/Layout/RootLayout.razor.css",
-        "inputFile": "Components/Layout/RootLayout.razor.scss",
-        "minify": { "enabled": false },
-        "options": { "sourceMap": false }
-    },
     {
         "outputFile": "Components/Layout/SignOutConfirmDialog.razor.css",
         "inputFile": "Components/Layout/SignOutConfirmDialog.razor.scss",

From 7f4b6bd296973e75cd6993585d62e5f0a11577f1 Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Tue, 31 Dec 2024 18:34:44 +0330
Subject: [PATCH 21/28] feat(templates): enable sending null titles to header
 as page title #9581 (#9582)

---
 .../Boilerplate.Client.Core/Components/Pages/AppPageBase.cs  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/AppPageBase.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/AppPageBase.cs
index f4d1c3d13a..1cad719547 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/AppPageBase.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/AppPageBase.cs
@@ -24,10 +24,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
                 }
             }
 
-            if (string.IsNullOrEmpty(Title) is false)
-            {
-                PubSubService.Publish(ClientPubSubMessages.PAGE_TITLE_CHANGED, (Title, Subtitle), persistent: true);
-            }
+            PubSubService.Publish(ClientPubSubMessages.PAGE_TITLE_CHANGED, (Title, Subtitle), persistent: true);
         }
     }
 }

From 0a7c4235d79b175c869522af3f3b6e31e3a26a62 Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Tue, 31 Dec 2024 23:23:54 +0330
Subject: [PATCH 22/28] fix(blazorui): correct BitExtraServices registration
 #9586 (#9587)

---
 .../Extensions/IServiceCollectionExtensions.cs                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/IServiceCollectionExtensions.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/IServiceCollectionExtensions.cs
index ffc6573935..a6bc011de1 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/IServiceCollectionExtensions.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Extensions/IServiceCollectionExtensions.cs
@@ -16,14 +16,14 @@ public static IServiceCollection AddBitBlazorUIExtrasServices(this IServiceColle
         if (trySingleton)
         {
             services.TryAddSingleton<BitModalService>();
-            services.TryAddSingleton<BitExtraServices>();
         }
         else
         {
             services.TryAddScoped<BitModalService>();
-            services.TryAddScoped<BitExtraServices>();
         }
 
+        services.TryAddScoped<BitExtraServices>();
+
         return services;
     }
 }

From e9be030c0b86151c9fe447d3d0ae5acc31834602 Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Tue, 31 Dec 2024 21:32:11 +0100
Subject: [PATCH 23/28] fix(templates): resolve small issues in Boilerplate
 #9583 (#9584)

---
 .../Components/Layout/MainLayout.razor        | 91 ++++++++++---------
 .../Pages/Identity/SignIn/SignInPanel.razor   |  2 +-
 .../Pages/Identity/SignUp/SignUpPage.razor    |  4 +-
 .../Boilerplate.Client.Windows/Program.cs     |  6 +-
 .../Program.Services.cs                       |  4 +-
 ...ataFormat.cs => AppJwtSecureDataFormat.cs} |  2 +-
 .../Boilerplate.Server.Api/appsettings.json   |  6 +-
 .../wwwroot/scripts/swagger-utils.js          |  6 +-
 .../Program.Services.cs                       |  4 +-
 .../src/Tests/IdentityPagesTests.cs           |  1 -
 10 files changed, 72 insertions(+), 54 deletions(-)
 rename src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/Identity/{AppSecureJwtDataFormat.cs => AppJwtSecureDataFormat.cs} (97%)

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor
index cf13a1541d..94f3c94d90 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor
@@ -1,48 +1,55 @@
 @inherits LayoutComponentBase
 
 
-<BitAppShell CascadingValues="@([new(currentDir),
-                                 new(isOnline, Parameters.IsOnline),
-                                 new(currentTheme, Parameters.CurrentTheme),
-                                 new(isAuthenticated, Parameters.IsAuthenticated),
-                                 new(currentRouteData, Parameters.CurrentRouteData),
-                                 new(isCrossLayoutPage, Parameters.IsCrossLayoutPage)])">
-    <main class="@GetMainCssClass()">
-        <div class="root">
-            @if (isAuthenticated is false)
-            {
-                <IdentityHeader />
-            }
-            else if (isAuthenticated is true)
-            {
-                <BitNavPanel @bind-IsOpen="isNavPanelOpen" Items="navPanelItems" />
-            }
-
-            <div class="stack">
-                @if (isAuthenticated is true)
-                {
-                    <AuthorizedHeader />
-                }
-
-                <div class="body">
-                    @Body
-                </div>
-
-                @if (isAuthenticated is false && isCrossLayoutPage is false)
-                {
-                    <div class="panel">
-                        <BitImage Width="70%" Src="_content/Boilerplate.Client.Core/images/identitylayout-image.webp" />
-                    </div>
-                }
-            </div>
-        </div>
-
-        @if (isAuthenticated is true)
-        {
-            <NavBar />
-        }
-    </main>
-</BitAppShell>
+<CascadingValue Value=currentDir>
+    <CascadingValue Name=@Parameters.IsOnline Value=isOnline>
+        <CascadingValue Name=@Parameters.CurrentTheme Value=currentTheme>
+            <CascadingValue Name=@Parameters.IsAuthenticated Value=isAuthenticated>
+                <CascadingValue Name=@Parameters.CurrentRouteData Value=currentRouteData>
+                    <CascadingValue Name=@Parameters.IsCrossLayoutPage Value=isCrossLayoutPage>
+                        <BitAppShell>
+                            <main class="@GetMainCssClass()">
+                                <div class="root">
+                                    @if (isAuthenticated is false)
+                                    {
+                                        <IdentityHeader />
+                                    }
+                                    else if (isAuthenticated is true)
+                                    {
+                                        <BitNavPanel @bind-IsOpen="isNavPanelOpen" Items="navPanelItems" />
+                                    }
+
+                                    <div class="stack">
+                                        @if (isAuthenticated is true)
+                                        {
+                                            <AuthorizedHeader />
+                                        }
+
+                                        <div class="body">
+                                            @Body
+                                        </div>
+
+                                        @if (isAuthenticated is false && isCrossLayoutPage is false)
+                                        {
+                                            <div class="panel">
+                                                <BitImage Width="70%" Src="_content/Boilerplate.Client.Core/images/identitylayout-image.webp" />
+                                            </div>
+                                        }
+                                    </div>
+                                </div>
+
+                                @if (isAuthenticated is true)
+                                {
+                                    <NavBar />
+                                }
+                            </main>
+                        </BitAppShell>
+                    </CascadingValue>
+                </CascadingValue>
+            </CascadingValue>
+        </CascadingValue>
+    </CascadingValue>
+</CascadingValue>
 
 <SnackBar />
 <DiagnosticModal />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPanel.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPanel.razor
index 9a31e2fac4..813ef4c5dd 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPanel.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPanel.razor
@@ -26,7 +26,7 @@
                     @if (selectedKey is EmailKey)
                     {
                         <BitTextField @bind-Value="Model.Email"
-                                      AutoFocus TabIndex="1"
+                                      TabIndex="1"
                                       Type="BitInputType.Email"
                                       Immediate DebounceTime="500"
                                       Label="@Localizer[nameof(AppStrings.Email)]"
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor
index 97eabfb526..f8efbad1d5 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor
@@ -29,7 +29,7 @@
                         <BitPivot Alignment="BitAlignment.Center">
                         @* <BitPivotItem HeaderText="@Localizer[nameof(AppStrings.UserName)]">
                             <BitTextField @bind-Value="signUpModel.UserName"
-                                          AutoFocus TabIndex="1"
+                                          TabIndex="1"
                                           Type="BitInputType.Text"
                                           Label="@Localizer[nameof(AppStrings.UserName)]"
                                           Placeholder="@Localizer[nameof(AppStrings.UserName)]" />
@@ -38,7 +38,7 @@
 
                             <BitPivotItem HeaderText="@Localizer[nameof(AppStrings.Email)]">
                                 <BitTextField @bind-Value="signUpModel.Email"
-                                              AutoFocus TabIndex="1"
+                                              TabIndex="1"
                                               Type="BitInputType.Email"
                                               Label="@Localizer[nameof(AppStrings.Email)]"
                                               Placeholder="@Localizer[nameof(AppStrings.EmailPlaceholder)]" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs
index 5f994c7865..0f4c43fd9a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs
@@ -33,8 +33,12 @@ public static void Main(string[] args)
 
         if (CultureInfoManager.MultilingualEnabled)
         {
+            var culture = Services.GetRequiredService<IStorageService>()
+                .GetItem("Culture")
+                .GetAwaiter()
+                .GetResult();
             Services.GetRequiredService<CultureInfoManager>().SetCurrentCulture(
-                Application.UserAppDataRegistry.GetValue("Culture") as string ?? // 1- User settings
+                culture ?? // 1- User settings
                 CultureInfo.CurrentUICulture.Name); // 2- OS Settings
         }
         Services.GetRequiredService<PubSubService>().Subscribe(ClientPubSubMessages.CULTURE_CHANGED, async culture =>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
index 83ed4fe62b..0edb327c30 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
@@ -325,8 +325,8 @@ private static void AddIdentity(WebApplicationBuilder builder)
                 AuthenticationType = IdentityConstants.BearerScheme
             };
 
-            options.BearerTokenProtector = new AppSecureJwtDataFormat(appSettings, validationParameters);
-            options.RefreshTokenProtector = new AppSecureJwtDataFormat(appSettings, validationParameters);
+            options.BearerTokenProtector = new AppJwtSecureDataFormat(appSettings, validationParameters);
+            options.RefreshTokenProtector = new AppJwtSecureDataFormat(appSettings, validationParameters);
 
             options.Events = new()
             {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/Identity/AppSecureJwtDataFormat.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/Identity/AppJwtSecureDataFormat.cs
similarity index 97%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/Identity/AppSecureJwtDataFormat.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/Identity/AppJwtSecureDataFormat.cs
index ce0e33da48..721e248d0c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/Identity/AppSecureJwtDataFormat.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/Identity/AppJwtSecureDataFormat.cs
@@ -7,7 +7,7 @@ namespace Boilerplate.Server.Api.Services.Identity;
 /// <summary>
 /// Stores bearer token in jwt format
 /// </summary>
-public partial class AppSecureJwtDataFormat(ServerApiSettings appSettings, TokenValidationParameters validationParameters)
+public partial class AppJwtSecureDataFormat(ServerApiSettings appSettings, TokenValidationParameters validationParameters)
     : ISecureDataFormat<AuthenticationTicket>
 {
     public AuthenticationTicket? Unprotect(string? protectedText) => Unprotect(protectedText, null);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/appsettings.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/appsettings.json
index 9d790c5e2d..1a3c9bcc0b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/appsettings.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/appsettings.json
@@ -71,7 +71,11 @@
         "AdsPushVapid_Comment": "Web push's vapid. More info at https://tools.reactpwa.com/vapid",
         "Subject": "mailto:test@bitplatform.dev",
         "PrivateKey": "dMIR1ICj-lDWYZ-ZYCwXKyC2ShYayYYkEL-oOPnpq9c",
-        "PublicKey_Comment": "Set public key in Client.Core's appsettings.json"
+        //#if (api == "Integrated")
+        "PublicKey_Comment": "Set public key in Client.Web's appsettings.json",
+        //#else
+        "PublicKey": "BDSNUvuIISD8NQVByQANEtZ2foKaENIcIGUxsiQs9kDz11fQik8c9WeiMwUHs3iTgNNH4nvXioNQIEsn4OAjTKc"
+        //#endif
     },
     "AdsPushAPNS": {
         "P8PrivateKey": null,
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/wwwroot/scripts/swagger-utils.js b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/wwwroot/scripts/swagger-utils.js
index 154c64bc12..bf2caa7866 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/wwwroot/scripts/swagger-utils.js
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/wwwroot/scripts/swagger-utils.js
@@ -11,7 +11,7 @@ let accessTokenExpiresIn = 0;
 const initSignInForm = () => {
     const swagger = window.ui;
     if (!swagger) {
-        console.error('Swagger wasn\'t found');
+        alert('Swagger wasn\'t found');
         return;
     }
 
@@ -204,6 +204,10 @@ const signIn = async (swagger, userName, email, phone, password) => {
     })
     if (response.ok) {
         const result = await response.json();
+        if (result.requiresTwoFactor == true) {
+            alert("Two factor enabled user is not supported.");
+            return;
+        }
         const accessToken = result.accessToken;
         accessTokenExpiresIn = result.expiresIn;
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs
index 170b476682..d3abab3493 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs
@@ -66,8 +66,8 @@ public static void AddServerWebProjectServices(this WebApplicationBuilder builde
             options.DefaultScheme = IdentityConstants.BearerScheme;
         }).AddBearerToken(IdentityConstants.BearerScheme, options =>
         {
-            options.BearerTokenProtector = new SimpleJWTFormat();
-            options.RefreshTokenProtector = new SimpleJWTFormat();
+            options.BearerTokenProtector = new SimpleJwtSecureDataFormat();
+            options.RefreshTokenProtector = new SimpleJwtSecureDataFormat();
 
             options.Events = new()
             {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/IdentityPagesTests.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/IdentityPagesTests.cs
index 3d4e5fcef9..a5e5795a32 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/IdentityPagesTests.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/IdentityPagesTests.cs
@@ -42,7 +42,6 @@ public async Task SignIn_Should_WorkAsExpected()
         await Expect(Page.GetByRole(AriaRole.Button, new() { Name = userFullName })).ToBeVisibleAsync();
         await Expect(Page.Locator(".bit-prs.persona").First).ToContainTextAsync(userFullName);
         await Expect(Page.Locator(".bit-prs.persona").Last).ToContainTextAsync(userFullName);
-        await Expect(Page.GetByRole(AriaRole.Button, new() { Name = AppStrings.SignOut })).ToBeVisibleAsync();
         await Expect(Page.GetByRole(AriaRole.Button, new() { Name = AppStrings.SignIn })).ToBeHiddenAsync();
     }
 

From 201a4bc4a5afb0e530ab44ddb5a29436955e9d66 Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Wed, 1 Jan 2025 00:03:37 +0330
Subject: [PATCH 24/28] feat(prerelease): v-9.2.0-pre-03 #9588 (#9589)

---
 src/Besql/Bit.Besql/wwwroot/bit-besql.js       |  2 +-
 src/Bit.Build.props                            |  2 +-
 src/BlazorUI/Bit.BlazorUI/Scripts/general.ts   |  2 +-
 .../Bit.BlazorUI.Demo.Server.csproj            |  4 ++--
 .../Bit.BlazorUI.Demo.Shared.csproj            |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Core.csproj       |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Maui.csproj       |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Web.csproj        |  6 +++---
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.BlazorUI.Demo.Client.Windows.csproj    |  4 ++--
 src/BlazorUI/Demo/Directory.Build.props        |  2 +-
 .../Bit.Bswup.Demo/wwwroot/service-worker.js   |  2 +-
 .../wwwroot/service-worker.published.js        |  2 +-
 .../wwwroot/service-worker.js                  |  2 +-
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.Bswup/Scripts/bit-bswup.progress.ts    |  2 +-
 src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts    |  2 +-
 src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts       |  2 +-
 .../FullDemo/Client/wwwroot/service-worker.js  |  2 +-
 .../Client/wwwroot/service-worker.published.js |  2 +-
 src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts    |  2 +-
 src/Bup/Bit.Bup/Scripts/bit-bup.ts             |  2 +-
 src/Butil/Bit.Butil/Scripts/butil.ts           |  2 +-
 .../BlazorEmpty.Client.csproj                  |  8 ++++----
 .../BlazorEmpty/BlazorEmpty.csproj             |  8 ++++----
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.Boilerplate/src/Directory.Build.props  |  2 +-
 .../src/Directory.Packages.props               | 18 +++++++++---------
 .../src/Directory.Packages8.props              | 18 +++++++++---------
 .../Bit.Websites.Careers.Client.csproj         | 10 +++++-----
 .../Bit.Websites.Careers.Server.csproj         |  4 ++--
 .../Bit.Websites.Careers.Shared.csproj         |  4 ++--
 src/Websites/Careers/src/Directory.Build.props |  2 +-
 .../Bit.Websites.Platform.Client.csproj        | 12 ++++++------
 .../Templates03GettingStartedPage.razor        |  4 ++--
 .../Templates03GettingStartedPage.razor.cs     |  2 +-
 .../Bit.Websites.Platform.Server.csproj        |  4 ++--
 .../Bit.Websites.Platform.Shared.csproj        |  4 ++--
 .../Platform/src/Directory.Build.props         |  2 +-
 .../Bit.Websites.Sales.Client.csproj           | 10 +++++-----
 .../Bit.Websites.Sales.Server.csproj           |  4 ++--
 .../Bit.Websites.Sales.Shared.csproj           |  4 ++--
 src/Websites/Sales/src/Directory.Build.props   |  2 +-
 43 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/src/Besql/Bit.Besql/wwwroot/bit-besql.js b/src/Besql/Bit.Besql/wwwroot/bit-besql.js
index ed5940c923..58b7040348 100644
--- a/src/Besql/Bit.Besql/wwwroot/bit-besql.js
+++ b/src/Besql/Bit.Besql/wwwroot/bit-besql.js
@@ -1,5 +1,5 @@
 var BitBesql = window.BitBesql || {};
-BitBesql.version = window['bit-besql version'] = '9.2.0-pre-02';
+BitBesql.version = window['bit-besql version'] = '9.2.0-pre-03';
 
 BitBesql.init = async function init(fileName) {
     const sqliteFilePath = `/${fileName}`;
diff --git a/src/Bit.Build.props b/src/Bit.Build.props
index 4fa3adda96..88f4c02e5e 100644
--- a/src/Bit.Build.props
+++ b/src/Bit.Build.props
@@ -27,7 +27,7 @@
 		<PackageProjectUrl>https://github.com/bitfoundation/bitplatform</PackageProjectUrl>
 
 		<!-- Version -->
-		<ReleaseVersion>9.2.0-pre-02</ReleaseVersion>
+		<ReleaseVersion>9.2.0-pre-03</ReleaseVersion>
   		<PackageVersion>$(ReleaseVersion)</PackageVersion>
 		<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)</PackageReleaseNotes>
 		<Version Condition=" '$(Configuration)' == 'Release' ">$([System.String]::Copy($(ReleaseVersion)).Replace('-pre-', '.'))</Version>
diff --git a/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts b/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
index b5be21d82c..f5c004889a 100644
--- a/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
+++ b/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
@@ -1,4 +1,4 @@
-(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '9.2.0-pre-02';
+(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '9.2.0-pre-03';
 
 interface DotNetObject {
     invokeMethod<T>(methodIdentifier: string, ...args: any[]): T;
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
index 39b128c671..97359183bd 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
@@ -5,11 +5,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
index d28d648982..f0b84de414 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
@@ -5,11 +5,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
index c38ae6d1d1..1129d6ba7a 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
@@ -16,11 +16,11 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
index c8ee537f55..7d7f96eb53 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
@@ -85,12 +85,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
index deb4592e1a..246634b8d5 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
@@ -24,13 +24,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.Bswup" Version="9.2.0-pre-02" />
+        <PackageReference Include="Bit.Bswup" Version="9.2.0-pre-03" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
index 7245260184..da324306c4 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-02
+// bit version: 9.2.0-pre-03
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 self.assetsInclude = [];
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
index d4780f4c44..66539efa3a 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
@@ -29,11 +29,11 @@
         <Using Include="Bit.BlazorUI.Demo.Client.Core.Services" />
         <Using Include="Bit.BlazorUI.Demo.Shared" />
         <Watch Remove="*.scss" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Directory.Build.props b/src/BlazorUI/Demo/Directory.Build.props
index 410de4a231..bdf54f5977 100644
--- a/src/BlazorUI/Demo/Directory.Build.props
+++ b/src/BlazorUI/Demo/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-bp template v-9.2.0-pre-02 -->
+<!-- Generated by bit-bp template v-9.2.0-pre-03 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
index ac182d5c96..d672e2bdd9 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-02
+// bit version: 9.2.0-pre-03
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
index 260c786479..62f841d54c 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-02
+// bit version: 9.2.0-pre-03
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
index 886a391552..8381231e31 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-02
+// bit version: 9.2.0-pre-03
 
 // In development, always fetch from the network and do not enable offline support.
 // This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
index f002eb90d2..35f0e21647 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-02
+// bit version: 9.2.0-pre-03
 
 self.assetsInclude = [];
 self.assetsExclude = [
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
index 044f5e8970..7ec450521c 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bswup.progress version'] = '9.2.0-pre-02';
+window['bit-bswup.progress version'] = '9.2.0-pre-03';
 
 ; (function () {
     (window as any).startBswupProgress = (autoReload: boolean,
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
index fbd6adfbe9..7c015d0a7b 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
@@ -1,4 +1,4 @@
-self['bit-bswup.sw version'] = '9.2.0-pre-02';
+self['bit-bswup.sw version'] = '9.2.0-pre-03';
 
 interface Window {
     clients: any
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
index 5344f0fb71..b0df6984fe 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
@@ -1,5 +1,5 @@
 const BitBswup = {} as any;
-BitBswup.version = window['bit-bswup version'] = '9.2.0-pre-02';
+BitBswup.version = window['bit-bswup version'] = '9.2.0-pre-03';
 
 declare const Blazor: any;
 
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
index 5b52b3a80d..474070205f 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-02
+// bit version: 9.2.0-pre-03
 
 // In development, always fetch from the network and do not enable offline support.
 // This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
index 84b8e4864d..4cae8694bf 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-02
+// bit version: 9.2.0-pre-03
 
 self.assetsInclude = [];
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
index 6c753f432e..13b38094ee 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bup.progress version'] = '9.2.0-pre-02';
+window['bit-bup.progress version'] = '9.2.0-pre-03';
 
 ; (function () {
     (window as any).startBupProgress = (showLogs: boolean, showAssets: boolean, appContainerSelector: string, hideApp: boolean, autoHide: boolean) => {
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
index 4cd2b039da..34884d996a 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
@@ -1,5 +1,5 @@
 var BitBup = BitBup || {};
-BitBup.version = window['bit-bup version'] = '9.2.0-pre-02';
+BitBup.version = window['bit-bup version'] = '9.2.0-pre-03';
 
 declare const Blazor: any;
 
diff --git a/src/Butil/Bit.Butil/Scripts/butil.ts b/src/Butil/Bit.Butil/Scripts/butil.ts
index 99c25eef6c..d9625be30d 100644
--- a/src/Butil/Bit.Butil/Scripts/butil.ts
+++ b/src/Butil/Bit.Butil/Scripts/butil.ts
@@ -1,2 +1,2 @@
 var BitButil = BitButil || {};
-BitButil.version = window['bit-butil version'] = '9.2.0-pre-02';
\ No newline at end of file
+BitButil.version = window['bit-butil version'] = '9.2.0-pre-03';
\ No newline at end of file
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
index 7a8a95a69f..2480fa2b2e 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
@@ -1,4 +1,4 @@
-<!-- Generated by bit-empty template v-9.2.0-pre-02 -->
+<!-- Generated by bit-empty template v-9.2.0-pre-03 -->
 
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
@@ -17,14 +17,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
+    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
 
-    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
index 5f288e5e0e..15b3299339 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
@@ -1,4 +1,4 @@
-<!-- Generated by bit-empty template v-9.2.0-pre-02 -->
+<!-- Generated by bit-empty template v-9.2.0-pre-03 -->
 
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
@@ -19,14 +19,14 @@
   <!--#endif -->
 
   <ItemGroup>
-    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
+    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
 
-    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
index be38e62045..6d1b3c98a4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
@@ -1,5 +1,5 @@
 //+:cnd:noEmit
-// bit version: 9.2.0-pre-02
+// bit version: 9.2.0-pre-03
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 //#if (notification == true)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
index 8d8121f25e..baaf09bce2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-bp template v-9.2.0-pre-02 -->
+<!-- Generated by bit-bp template v-9.2.0-pre-03 -->
 <Project>
     <!--/-:msbuild-conditional:noEmit -->
     <PropertyGroup>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
index c0f42fc822..e50496a461 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
@@ -1,14 +1,14 @@
 <Project>
     <ItemGroup>
         <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-03" />
         <PackageVersion Include="libphonenumber-csharp" Version="8.13.52" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.0" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
@@ -49,7 +49,7 @@
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.Firebase.Messaging" Version="124.1.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Plugin.LocalNotification" Version="11.1.4" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="AdsPush" Version="2.0.0" />
-        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-02" />
+        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-03" />
         <PackageVersion Condition=" '$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
         <PackageVersion Condition="'$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.Azure.SignalR" Version="1.29.0" />
         <PackageVersion Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
index e2aa78d5c1..7948e91c46 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
@@ -1,14 +1,14 @@
 <Project>
     <ItemGroup>
         <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02" />
-        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-02" />
+        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-03" />
         <PackageVersion Include="libphonenumber-csharp" Version="8.13.52" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.11" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
@@ -46,7 +46,7 @@
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.Firebase.Messaging" Version="124.1.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Plugin.LocalNotification" Version="11.1.4" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="AdsPush" Version="2.0.0" />
-        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-02" />
+        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-03" />
         <PackageVersion Condition=" '$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.11" />
         <PackageVersion Condition="'$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.Azure.SignalR" Version="1.29.0" />
         <PackageVersion Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
index 794f92bbb9..15a1a48947 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
@@ -22,15 +22,15 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-02" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-03" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-02" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-03" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
index b10ac543f4..47dee4dee4 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
index 1a25ac836e..f5c683681f 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Directory.Build.props b/src/Websites/Careers/src/Directory.Build.props
index 0f38a40cf6..a23a66c821 100644
--- a/src/Websites/Careers/src/Directory.Build.props
+++ b/src/Websites/Careers/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-02 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-03 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
index e7d36d07e1..68cabffa91 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
@@ -22,16 +22,16 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.Butil" Version="9.2.0-pre-02" />
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-02" />
+        <PackageReference Include="Bit.Butil" Version="9.2.0-pre-03" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-03" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-02" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-03" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
index 1b3fe51163..ffbcac0d95 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
@@ -174,8 +174,8 @@ rm $HOME/dotnet.tar.gz</CodeBox>
                             }
                         </li>
                         <li>
-                            <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/9.2.0-pre-02" target="_blank">Bit Boilerplate</a> project template</div>
-                            <CodeBox>dotnet new install Bit.Boilerplate::9.2.0-pre-02</CodeBox>
+                            <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/9.2.0-pre-03" target="_blank">Bit Boilerplate</a> project template</div>
+                            <CodeBox>dotnet new install Bit.Boilerplate::9.2.0-pre-03</CodeBox>
                         </li>
                         @if (showCrossPlatform && devOS is "Windows")
                         {
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
index 6884c05f6c..16d6ccf4d1 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
@@ -38,7 +38,7 @@ public partial class Templates03GettingStartedPage
             command:"dotnet nuget add source \"https://api.nuget.org/v3/index.json\" --name \"nuget.org\"; dotnet workload install wasm-tools;"),
 
             (text:@"echo 'Install the Bit.Boilerplate project template https://www.nuget.org/packages/Boilerplate.Templates';",
-            command:"dotnet new install Bit.Boilerplate::9.2.0-pre-02;")
+            command:"dotnet new install Bit.Boilerplate::9.2.0-pre-03;")
         ];
 
         if (enableVirtualization)
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
index 1df8293351..13bf02cbd0 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
index 1a25ac836e..f5c683681f 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Directory.Build.props b/src/Websites/Platform/src/Directory.Build.props
index 3ffee19f42..24d6de0d1d 100644
--- a/src/Websites/Platform/src/Directory.Build.props
+++ b/src/Websites/Platform/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-02 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-03 -->
 <Project>
     <PropertyGroup>
         <LangVersion>preview</LangVersion>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
index aabdebc7be..59a0bd4536 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
@@ -22,15 +22,15 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-02" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-02" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-03" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-02" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-03" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
index 402d4589d9..e3c8f31f15 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
index 1a25ac836e..f5c683681f 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-02">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Directory.Build.props b/src/Websites/Sales/src/Directory.Build.props
index e86c021477..9ea83a8174 100644
--- a/src/Websites/Sales/src/Directory.Build.props
+++ b/src/Websites/Sales/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-02 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-03 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>

From 60b6a13c9835d5def13a81afda6835e90de513b3 Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Wed, 1 Jan 2025 05:47:46 +0100
Subject: [PATCH 25/28] feat(templates): improve social sign-in for Android
 apps in Boilerplate #9590 (#9591)

---
 .../Boilerplate.Client.Maui/MauiProgram.Services.cs |  7 ++++++-
 .../Services/MauiExternalNavigationService.cs       | 13 +++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs
index 78ba7c58a2..c169776987 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.Services.cs
@@ -39,7 +39,12 @@ public static void ConfigureServices(this MauiAppBuilder builder)
             return settings;
         });
         services.AddSingleton(ITelemetryContext.Current!);
-        services.AddSingleton<ILocalHttpServer, MauiLocalHttpServer>();
+        if (AppPlatform.IsAndroid is false)
+        {
+            // Handle social sign-in callback on local HTTP server.
+            // But in Android, leverage Universal Links for smoother sign-in flows.
+            services.AddSingleton<ILocalHttpServer, MauiLocalHttpServer>();
+        }
 
         services.AddMauiBlazorWebView();
         services.AddBlazorWebViewDeveloperTools();
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExternalNavigationService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExternalNavigationService.cs
index c629f6a373..6494c1c326 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExternalNavigationService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExternalNavigationService.cs
@@ -1,9 +1,18 @@
-namespace Boilerplate.Client.Maui.Services;
+using Boilerplate.Client.Core.Styles;
+
+namespace Boilerplate.Client.Maui.Services;
 
 public partial class MauiExternalNavigationService : IExternalNavigationService
 {
     public async Task NavigateToAsync(string url)
     {
-        await Browser.OpenAsync(url, AppPlatform.IsWindows || AppPlatform.IsMacOS ? BrowserLaunchMode.External : BrowserLaunchMode.SystemPreferred /* in app browser */);
+        var isDark = Application.Current!.UserAppTheme == AppTheme.Dark;
+
+        await Browser.OpenAsync(url, options: new()
+        {
+            TitleMode = BrowserTitleMode.Hide,
+            PreferredToolbarColor = Color.Parse(isDark ? ThemeColors.PrimaryDarkBgColor : ThemeColors.PrimaryLightBgColor),
+            LaunchMode = AppPlatform.IsWindows || AppPlatform.IsMacOS ? BrowserLaunchMode.External : BrowserLaunchMode.SystemPreferred /* in app browser */
+        });
     }
 }

From 23f0f061406afd7461fc7987668dc21362db85a0 Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Wed, 1 Jan 2025 09:42:37 +0330
Subject: [PATCH 26/28] feat(blazorui): assign null as SelectedItem when no
 item found for current URL #9574 (#9580)

---
 .../Bit.BlazorUI/Components/Navs/Nav/BitNav.razor.cs         | 5 +----
 .../Bit.BlazorUI/Components/Navs/NavBar/BitNavBar.razor.cs   | 5 +----
 .../Shared/MainLayout.razor.scss                             | 1 +
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Nav/BitNav.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Nav/BitNav.razor.cs
index 7cc1a9bfa6..acd1178615 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Nav/BitNav.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Nav/BitNav.razor.cs
@@ -884,10 +884,7 @@ private void SetSelectedItemByCurrentUrl()
         var currentItem = Flatten(_items).FirstOrDefault(item => GetUrl(item) == currentUrl
                                                         || (GetAdditionalUrls(item)?.Contains(currentUrl) ?? false));
 
-        if (currentItem is not null)
-        {
-            _ = AssignSelectedItem(currentItem);
-        }
+        _ = AssignSelectedItem(currentItem);
     }
 
     private void SetIsExpanded(TItem item, bool value)
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Navs/NavBar/BitNavBar.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Navs/NavBar/BitNavBar.razor.cs
index d75894e18f..3fd80c28b4 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Navs/NavBar/BitNavBar.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Navs/NavBar/BitNavBar.razor.cs
@@ -211,10 +211,7 @@ private void SetSelectedItemByCurrentUrl()
         var currentItem = _items.FirstOrDefault(item => string.Equals(GetUrl(item), currentUrl, StringComparison.OrdinalIgnoreCase) ||
                                                         (GetAdditionalUrls(item)?.Any(u => string.Equals(u, currentUrl, StringComparison.OrdinalIgnoreCase)) ?? false));
 
-        if (currentItem is not null)
-        {
-            _ = AssignSelectedItem(currentItem);
-        }
+        _ = AssignSelectedItem(currentItem);
     }
 
     private void OnSetParameters()
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.scss b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.scss
index 73f2d2e832..a05c9721f9 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.scss
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/MainLayout.razor.scss
@@ -5,6 +5,7 @@
 
 .site-content {
     width: 100%;
+    height: 100%;
     margin: 0 auto;
     position: relative;
     background-color: $bit-color-background-secondary;

From f50becff2631b2e7c53e9cb0e8085e2ab2b8e798 Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Wed, 1 Jan 2025 10:21:48 +0330
Subject: [PATCH 27/28] feat(prerelease): v-9.2.0-pre-04 #9592 (#9595)

---
 src/Besql/Bit.Besql/wwwroot/bit-besql.js       |  2 +-
 src/Bit.Build.props                            |  2 +-
 src/BlazorUI/Bit.BlazorUI/Scripts/general.ts   |  2 +-
 .../Bit.BlazorUI.Demo.Server.csproj            |  4 ++--
 .../Bit.BlazorUI.Demo.Shared.csproj            |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Core.csproj       |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Maui.csproj       |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Web.csproj        |  6 +++---
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.BlazorUI.Demo.Client.Windows.csproj    |  4 ++--
 src/BlazorUI/Demo/Directory.Build.props        |  2 +-
 .../Bit.Bswup.Demo/wwwroot/service-worker.js   |  2 +-
 .../wwwroot/service-worker.published.js        |  2 +-
 .../wwwroot/service-worker.js                  |  2 +-
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.Bswup/Scripts/bit-bswup.progress.ts    |  2 +-
 src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts    |  2 +-
 src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts       |  2 +-
 .../FullDemo/Client/wwwroot/service-worker.js  |  2 +-
 .../Client/wwwroot/service-worker.published.js |  2 +-
 src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts    |  2 +-
 src/Bup/Bit.Bup/Scripts/bit-bup.ts             |  2 +-
 src/Butil/Bit.Butil/Scripts/butil.ts           |  2 +-
 .../BlazorEmpty.Client.csproj                  |  8 ++++----
 .../BlazorEmpty/BlazorEmpty.csproj             |  8 ++++----
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.Boilerplate/src/Directory.Build.props  |  2 +-
 .../src/Directory.Packages.props               | 18 +++++++++---------
 .../src/Directory.Packages8.props              | 18 +++++++++---------
 .../Bit.Websites.Careers.Client.csproj         | 10 +++++-----
 .../Bit.Websites.Careers.Server.csproj         |  4 ++--
 .../Bit.Websites.Careers.Shared.csproj         |  4 ++--
 src/Websites/Careers/src/Directory.Build.props |  2 +-
 .../Bit.Websites.Platform.Client.csproj        | 12 ++++++------
 .../Templates03GettingStartedPage.razor        |  4 ++--
 .../Templates03GettingStartedPage.razor.cs     |  2 +-
 .../Bit.Websites.Platform.Server.csproj        |  4 ++--
 .../Bit.Websites.Platform.Shared.csproj        |  4 ++--
 .../Platform/src/Directory.Build.props         |  2 +-
 .../Bit.Websites.Sales.Client.csproj           | 10 +++++-----
 .../Bit.Websites.Sales.Server.csproj           |  4 ++--
 .../Bit.Websites.Sales.Shared.csproj           |  4 ++--
 src/Websites/Sales/src/Directory.Build.props   |  2 +-
 43 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/src/Besql/Bit.Besql/wwwroot/bit-besql.js b/src/Besql/Bit.Besql/wwwroot/bit-besql.js
index 58b7040348..deed0d5af3 100644
--- a/src/Besql/Bit.Besql/wwwroot/bit-besql.js
+++ b/src/Besql/Bit.Besql/wwwroot/bit-besql.js
@@ -1,5 +1,5 @@
 var BitBesql = window.BitBesql || {};
-BitBesql.version = window['bit-besql version'] = '9.2.0-pre-03';
+BitBesql.version = window['bit-besql version'] = '9.2.0-pre-04';
 
 BitBesql.init = async function init(fileName) {
     const sqliteFilePath = `/${fileName}`;
diff --git a/src/Bit.Build.props b/src/Bit.Build.props
index 88f4c02e5e..d9a5e4b0b8 100644
--- a/src/Bit.Build.props
+++ b/src/Bit.Build.props
@@ -27,7 +27,7 @@
 		<PackageProjectUrl>https://github.com/bitfoundation/bitplatform</PackageProjectUrl>
 
 		<!-- Version -->
-		<ReleaseVersion>9.2.0-pre-03</ReleaseVersion>
+		<ReleaseVersion>9.2.0-pre-04</ReleaseVersion>
   		<PackageVersion>$(ReleaseVersion)</PackageVersion>
 		<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)</PackageReleaseNotes>
 		<Version Condition=" '$(Configuration)' == 'Release' ">$([System.String]::Copy($(ReleaseVersion)).Replace('-pre-', '.'))</Version>
diff --git a/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts b/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
index f5c004889a..48463a8b46 100644
--- a/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
+++ b/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
@@ -1,4 +1,4 @@
-(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '9.2.0-pre-03';
+(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '9.2.0-pre-04';
 
 interface DotNetObject {
     invokeMethod<T>(methodIdentifier: string, ...args: any[]): T;
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
index 97359183bd..7f36f1448e 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
@@ -5,11 +5,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
index f0b84de414..69150d7198 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
@@ -5,11 +5,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
index 1129d6ba7a..4460252822 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
@@ -16,11 +16,11 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
index 7d7f96eb53..c4329caa59 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
@@ -85,12 +85,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
index 246634b8d5..966c26fba5 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
@@ -24,13 +24,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.Bswup" Version="9.2.0-pre-03" />
+        <PackageReference Include="Bit.Bswup" Version="9.2.0-pre-04" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
index da324306c4..d99e18f30d 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-03
+// bit version: 9.2.0-pre-04
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 self.assetsInclude = [];
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
index 66539efa3a..a664cdddcc 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
@@ -29,11 +29,11 @@
         <Using Include="Bit.BlazorUI.Demo.Client.Core.Services" />
         <Using Include="Bit.BlazorUI.Demo.Shared" />
         <Watch Remove="*.scss" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Directory.Build.props b/src/BlazorUI/Demo/Directory.Build.props
index bdf54f5977..2ba55847df 100644
--- a/src/BlazorUI/Demo/Directory.Build.props
+++ b/src/BlazorUI/Demo/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-bp template v-9.2.0-pre-03 -->
+<!-- Generated by bit-bp template v-9.2.0-pre-04 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
index d672e2bdd9..a23047204f 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-03
+// bit version: 9.2.0-pre-04
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
index 62f841d54c..2921b44098 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-03
+// bit version: 9.2.0-pre-04
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
index 8381231e31..d722fb95d3 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-03
+// bit version: 9.2.0-pre-04
 
 // In development, always fetch from the network and do not enable offline support.
 // This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
index 35f0e21647..79e589ee98 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-03
+// bit version: 9.2.0-pre-04
 
 self.assetsInclude = [];
 self.assetsExclude = [
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
index 7ec450521c..d9418e5b88 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bswup.progress version'] = '9.2.0-pre-03';
+window['bit-bswup.progress version'] = '9.2.0-pre-04';
 
 ; (function () {
     (window as any).startBswupProgress = (autoReload: boolean,
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
index 7c015d0a7b..efa8ea0a58 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
@@ -1,4 +1,4 @@
-self['bit-bswup.sw version'] = '9.2.0-pre-03';
+self['bit-bswup.sw version'] = '9.2.0-pre-04';
 
 interface Window {
     clients: any
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
index b0df6984fe..db17c6ad14 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
@@ -1,5 +1,5 @@
 const BitBswup = {} as any;
-BitBswup.version = window['bit-bswup version'] = '9.2.0-pre-03';
+BitBswup.version = window['bit-bswup version'] = '9.2.0-pre-04';
 
 declare const Blazor: any;
 
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
index 474070205f..8873179ba2 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-03
+// bit version: 9.2.0-pre-04
 
 // In development, always fetch from the network and do not enable offline support.
 // This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
index 4cae8694bf..852979819e 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-03
+// bit version: 9.2.0-pre-04
 
 self.assetsInclude = [];
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
index 13b38094ee..918f706456 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bup.progress version'] = '9.2.0-pre-03';
+window['bit-bup.progress version'] = '9.2.0-pre-04';
 
 ; (function () {
     (window as any).startBupProgress = (showLogs: boolean, showAssets: boolean, appContainerSelector: string, hideApp: boolean, autoHide: boolean) => {
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
index 34884d996a..7dd12c4c34 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
@@ -1,5 +1,5 @@
 var BitBup = BitBup || {};
-BitBup.version = window['bit-bup version'] = '9.2.0-pre-03';
+BitBup.version = window['bit-bup version'] = '9.2.0-pre-04';
 
 declare const Blazor: any;
 
diff --git a/src/Butil/Bit.Butil/Scripts/butil.ts b/src/Butil/Bit.Butil/Scripts/butil.ts
index d9625be30d..3ac5a96688 100644
--- a/src/Butil/Bit.Butil/Scripts/butil.ts
+++ b/src/Butil/Bit.Butil/Scripts/butil.ts
@@ -1,2 +1,2 @@
 var BitButil = BitButil || {};
-BitButil.version = window['bit-butil version'] = '9.2.0-pre-03';
\ No newline at end of file
+BitButil.version = window['bit-butil version'] = '9.2.0-pre-04';
\ No newline at end of file
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
index 2480fa2b2e..dc9eb9cf78 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
@@ -1,4 +1,4 @@
-<!-- Generated by bit-empty template v-9.2.0-pre-03 -->
+<!-- Generated by bit-empty template v-9.2.0-pre-04 -->
 
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
@@ -17,14 +17,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
+    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
 
-    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
index 15b3299339..8363d3c2e9 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
@@ -1,4 +1,4 @@
-<!-- Generated by bit-empty template v-9.2.0-pre-03 -->
+<!-- Generated by bit-empty template v-9.2.0-pre-04 -->
 
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
@@ -19,14 +19,14 @@
   <!--#endif -->
 
   <ItemGroup>
-    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
+    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
 
-    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
index 6d1b3c98a4..ad799098dc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
@@ -1,5 +1,5 @@
 //+:cnd:noEmit
-// bit version: 9.2.0-pre-03
+// bit version: 9.2.0-pre-04
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 //#if (notification == true)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
index baaf09bce2..c1bbebeacc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-bp template v-9.2.0-pre-03 -->
+<!-- Generated by bit-bp template v-9.2.0-pre-04 -->
 <Project>
     <!--/-:msbuild-conditional:noEmit -->
     <PropertyGroup>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
index e50496a461..a9b622de6e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
@@ -1,14 +1,14 @@
 <Project>
     <ItemGroup>
         <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-04" />
         <PackageVersion Include="libphonenumber-csharp" Version="8.13.52" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.0" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
@@ -49,7 +49,7 @@
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.Firebase.Messaging" Version="124.1.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Plugin.LocalNotification" Version="11.1.4" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="AdsPush" Version="2.0.0" />
-        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-03" />
+        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-04" />
         <PackageVersion Condition=" '$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
         <PackageVersion Condition="'$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.Azure.SignalR" Version="1.29.0" />
         <PackageVersion Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
index 7948e91c46..5c8e9e51e6 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
@@ -1,14 +1,14 @@
 <Project>
     <ItemGroup>
         <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03" />
-        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-03" />
+        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-04" />
         <PackageVersion Include="libphonenumber-csharp" Version="8.13.52" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.11" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
@@ -46,7 +46,7 @@
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.Firebase.Messaging" Version="124.1.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Plugin.LocalNotification" Version="11.1.4" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="AdsPush" Version="2.0.0" />
-        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-03" />
+        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-04" />
         <PackageVersion Condition=" '$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.11" />
         <PackageVersion Condition="'$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.Azure.SignalR" Version="1.29.0" />
         <PackageVersion Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
index 15a1a48947..b10b39cbfa 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
@@ -22,15 +22,15 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-03" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-04" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-03" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-04" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
index 47dee4dee4..2c452822a7 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
index f5c683681f..3c647a47a6 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Directory.Build.props b/src/Websites/Careers/src/Directory.Build.props
index a23a66c821..e1c5cdf73e 100644
--- a/src/Websites/Careers/src/Directory.Build.props
+++ b/src/Websites/Careers/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-03 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-04 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
index 68cabffa91..cb05537c43 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
@@ -22,16 +22,16 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.Butil" Version="9.2.0-pre-03" />
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-03" />
+        <PackageReference Include="Bit.Butil" Version="9.2.0-pre-04" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-04" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-03" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-04" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
index ffbcac0d95..da7a501a82 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
@@ -174,8 +174,8 @@ rm $HOME/dotnet.tar.gz</CodeBox>
                             }
                         </li>
                         <li>
-                            <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/9.2.0-pre-03" target="_blank">Bit Boilerplate</a> project template</div>
-                            <CodeBox>dotnet new install Bit.Boilerplate::9.2.0-pre-03</CodeBox>
+                            <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/9.2.0-pre-04" target="_blank">Bit Boilerplate</a> project template</div>
+                            <CodeBox>dotnet new install Bit.Boilerplate::9.2.0-pre-04</CodeBox>
                         </li>
                         @if (showCrossPlatform && devOS is "Windows")
                         {
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
index 16d6ccf4d1..5bf24a43e6 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
@@ -38,7 +38,7 @@ public partial class Templates03GettingStartedPage
             command:"dotnet nuget add source \"https://api.nuget.org/v3/index.json\" --name \"nuget.org\"; dotnet workload install wasm-tools;"),
 
             (text:@"echo 'Install the Bit.Boilerplate project template https://www.nuget.org/packages/Boilerplate.Templates';",
-            command:"dotnet new install Bit.Boilerplate::9.2.0-pre-03;")
+            command:"dotnet new install Bit.Boilerplate::9.2.0-pre-04;")
         ];
 
         if (enableVirtualization)
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
index 13bf02cbd0..c32e687890 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
index f5c683681f..3c647a47a6 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Directory.Build.props b/src/Websites/Platform/src/Directory.Build.props
index 24d6de0d1d..310b7d97bb 100644
--- a/src/Websites/Platform/src/Directory.Build.props
+++ b/src/Websites/Platform/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-03 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-04 -->
 <Project>
     <PropertyGroup>
         <LangVersion>preview</LangVersion>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
index 59a0bd4536..cb800ef71c 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
@@ -22,15 +22,15 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-03" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-03" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-04" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-03" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-04" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
index e3c8f31f15..5bc724255a 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
index f5c683681f..3c647a47a6 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-03">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Directory.Build.props b/src/Websites/Sales/src/Directory.Build.props
index 9ea83a8174..20750a9619 100644
--- a/src/Websites/Sales/src/Directory.Build.props
+++ b/src/Websites/Sales/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-03 -->
+<!-- Generated by bit-dual template v-9.2.0-pre-04 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>

From f1a1650b364ac710ffdeaf246ab1f2c0b6f59e9a Mon Sep 17 00:00:00 2001
From: Saleh Yusefnejad <msynk@outlook.com>
Date: Wed, 1 Jan 2025 11:45:13 +0330
Subject: [PATCH 28/28] feat(release): v-9.2.0 #9593 (#9596)

---
 src/Besql/Bit.Besql/wwwroot/bit-besql.js       |  2 +-
 src/Bit.Build.props                            |  2 +-
 src/BlazorUI/Bit.BlazorUI/Scripts/general.ts   |  2 +-
 .../Bit.BlazorUI.Demo.Server.csproj            |  4 ++--
 .../Bit.BlazorUI.Demo.Shared.csproj            |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Core.csproj       |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Maui.csproj       |  4 ++--
 .../Bit.BlazorUI.Demo.Client.Web.csproj        |  6 +++---
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.BlazorUI.Demo.Client.Windows.csproj    |  4 ++--
 src/BlazorUI/Demo/Directory.Build.props        |  2 +-
 .../Bit.Bswup.Demo/wwwroot/service-worker.js   |  2 +-
 .../wwwroot/service-worker.published.js        |  2 +-
 .../wwwroot/service-worker.js                  |  2 +-
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.Bswup/Scripts/bit-bswup.progress.ts    |  2 +-
 src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts    |  2 +-
 src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts       |  2 +-
 .../FullDemo/Client/wwwroot/service-worker.js  |  2 +-
 .../Client/wwwroot/service-worker.published.js |  2 +-
 src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts    |  2 +-
 src/Bup/Bit.Bup/Scripts/bit-bup.ts             |  2 +-
 src/Butil/Bit.Butil/Scripts/butil.ts           |  2 +-
 .../BlazorEmpty.Client.csproj                  |  8 ++++----
 .../BlazorEmpty/BlazorEmpty.csproj             |  8 ++++----
 .../wwwroot/service-worker.published.js        |  2 +-
 .../Bit.Boilerplate/src/Directory.Build.props  |  2 +-
 .../src/Directory.Packages.props               | 18 +++++++++---------
 .../src/Directory.Packages8.props              | 18 +++++++++---------
 .../Bit.Websites.Careers.Client.csproj         | 10 +++++-----
 .../Bit.Websites.Careers.Server.csproj         |  4 ++--
 .../Bit.Websites.Careers.Shared.csproj         |  4 ++--
 src/Websites/Careers/src/Directory.Build.props |  2 +-
 .../Bit.Websites.Platform.Client.csproj        | 12 ++++++------
 .../Templates03GettingStartedPage.razor        |  4 ++--
 .../Templates03GettingStartedPage.razor.cs     |  2 +-
 .../Bit.Websites.Platform.Server.csproj        |  4 ++--
 .../Bit.Websites.Platform.Shared.csproj        |  4 ++--
 .../Platform/src/Directory.Build.props         |  2 +-
 .../Bit.Websites.Sales.Client.csproj           | 10 +++++-----
 .../Bit.Websites.Sales.Server.csproj           |  4 ++--
 .../Bit.Websites.Sales.Shared.csproj           |  4 ++--
 src/Websites/Sales/src/Directory.Build.props   |  2 +-
 43 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/src/Besql/Bit.Besql/wwwroot/bit-besql.js b/src/Besql/Bit.Besql/wwwroot/bit-besql.js
index deed0d5af3..5ad9782aea 100644
--- a/src/Besql/Bit.Besql/wwwroot/bit-besql.js
+++ b/src/Besql/Bit.Besql/wwwroot/bit-besql.js
@@ -1,5 +1,5 @@
 var BitBesql = window.BitBesql || {};
-BitBesql.version = window['bit-besql version'] = '9.2.0-pre-04';
+BitBesql.version = window['bit-besql version'] = '9.2.0';
 
 BitBesql.init = async function init(fileName) {
     const sqliteFilePath = `/${fileName}`;
diff --git a/src/Bit.Build.props b/src/Bit.Build.props
index d9a5e4b0b8..c690155096 100644
--- a/src/Bit.Build.props
+++ b/src/Bit.Build.props
@@ -27,7 +27,7 @@
 		<PackageProjectUrl>https://github.com/bitfoundation/bitplatform</PackageProjectUrl>
 
 		<!-- Version -->
-		<ReleaseVersion>9.2.0-pre-04</ReleaseVersion>
+		<ReleaseVersion>9.2.0</ReleaseVersion>
   		<PackageVersion>$(ReleaseVersion)</PackageVersion>
 		<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)</PackageReleaseNotes>
 		<Version Condition=" '$(Configuration)' == 'Release' ">$([System.String]::Copy($(ReleaseVersion)).Replace('-pre-', '.'))</Version>
diff --git a/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts b/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
index 48463a8b46..8b3488d591 100644
--- a/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
+++ b/src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
@@ -1,4 +1,4 @@
-(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '9.2.0-pre-04';
+(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '9.2.0';
 
 interface DotNetObject {
     invokeMethod<T>(methodIdentifier: string, ...args: any[]): T;
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
index 7f36f1448e..7a31606a92 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj
@@ -5,11 +5,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
index 69150d7198..918454cdc4 100644
--- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
+++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj
@@ -5,11 +5,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
index 4460252822..dfa709cee2 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj
@@ -16,11 +16,11 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
index c4329caa59..84613c8e9b 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
@@ -85,12 +85,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
index 966c26fba5..22b99f7095 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
@@ -24,13 +24,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.Bswup" Version="9.2.0-pre-04" />
+        <PackageReference Include="Bit.Bswup" Version="9.2.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
index d99e18f30d..81ef753d81 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-04
+// bit version: 9.2.0
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 self.assetsInclude = [];
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
index a664cdddcc..f548ce056b 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
@@ -29,11 +29,11 @@
         <Using Include="Bit.BlazorUI.Demo.Client.Core.Services" />
         <Using Include="Bit.BlazorUI.Demo.Shared" />
         <Watch Remove="*.scss" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/BlazorUI/Demo/Directory.Build.props b/src/BlazorUI/Demo/Directory.Build.props
index 2ba55847df..c8d6effc67 100644
--- a/src/BlazorUI/Demo/Directory.Build.props
+++ b/src/BlazorUI/Demo/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-bp template v-9.2.0-pre-04 -->
+<!-- Generated by bit-bp template v-9.2.0 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
index a23047204f..890ed88fee 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-04
+// bit version: 9.2.0
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
index 2921b44098..25c8f5e457 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-04
+// bit version: 9.2.0
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
index d722fb95d3..b5d48bb083 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-04
+// bit version: 9.2.0
 
 // In development, always fetch from the network and do not enable offline support.
 // This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
index 79e589ee98..3d565b017b 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-04
+// bit version: 9.2.0
 
 self.assetsInclude = [];
 self.assetsExclude = [
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
index d9418e5b88..b440faf5ec 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bswup.progress version'] = '9.2.0-pre-04';
+window['bit-bswup.progress version'] = '9.2.0';
 
 ; (function () {
     (window as any).startBswupProgress = (autoReload: boolean,
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
index efa8ea0a58..69d71fb174 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
@@ -1,4 +1,4 @@
-self['bit-bswup.sw version'] = '9.2.0-pre-04';
+self['bit-bswup.sw version'] = '9.2.0';
 
 interface Window {
     clients: any
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
index db17c6ad14..42942a4e5e 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
@@ -1,5 +1,5 @@
 const BitBswup = {} as any;
-BitBswup.version = window['bit-bswup version'] = '9.2.0-pre-04';
+BitBswup.version = window['bit-bswup version'] = '9.2.0';
 
 declare const Blazor: any;
 
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
index 8873179ba2..9c6ed25336 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-04
+// bit version: 9.2.0
 
 // In development, always fetch from the network and do not enable offline support.
 // This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
index 852979819e..278f5178bb 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 9.2.0-pre-04
+// bit version: 9.2.0
 
 self.assetsInclude = [];
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
index 918f706456..7139438816 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bup.progress version'] = '9.2.0-pre-04';
+window['bit-bup.progress version'] = '9.2.0';
 
 ; (function () {
     (window as any).startBupProgress = (showLogs: boolean, showAssets: boolean, appContainerSelector: string, hideApp: boolean, autoHide: boolean) => {
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
index 7dd12c4c34..b3baa0162f 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
@@ -1,5 +1,5 @@
 var BitBup = BitBup || {};
-BitBup.version = window['bit-bup version'] = '9.2.0-pre-04';
+BitBup.version = window['bit-bup version'] = '9.2.0';
 
 declare const Blazor: any;
 
diff --git a/src/Butil/Bit.Butil/Scripts/butil.ts b/src/Butil/Bit.Butil/Scripts/butil.ts
index 3ac5a96688..b1860b91da 100644
--- a/src/Butil/Bit.Butil/Scripts/butil.ts
+++ b/src/Butil/Bit.Butil/Scripts/butil.ts
@@ -1,2 +1,2 @@
 var BitButil = BitButil || {};
-BitButil.version = window['bit-butil version'] = '9.2.0-pre-04';
\ No newline at end of file
+BitButil.version = window['bit-butil version'] = '9.2.0';
\ No newline at end of file
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
index dc9eb9cf78..4a7014cd4a 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj
@@ -1,4 +1,4 @@
-<!-- Generated by bit-empty template v-9.2.0-pre-04 -->
+<!-- Generated by bit-empty template v-9.2.0 -->
 
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
@@ -17,14 +17,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
+    <PackageReference Include="Bit.BlazorUI" Version="9.2.0" />
 
-    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
index 8363d3c2e9..8f1ac9bc45 100644
--- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
+++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj
@@ -1,4 +1,4 @@
-<!-- Generated by bit-empty template v-9.2.0-pre-04 -->
+<!-- Generated by bit-empty template v-9.2.0 -->
 
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
@@ -19,14 +19,14 @@
   <!--#endif -->
 
   <ItemGroup>
-    <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
+    <PackageReference Include="Bit.BlazorUI" Version="9.2.0" />
 
-    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+    <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+    <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
index ad799098dc..2eae8c98dd 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
@@ -1,5 +1,5 @@
 //+:cnd:noEmit
-// bit version: 9.2.0-pre-04
+// bit version: 9.2.0
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 //#if (notification == true)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
index c1bbebeacc..646c637100 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-bp template v-9.2.0-pre-04 -->
+<!-- Generated by bit-bp template v-9.2.0 -->
 <Project>
     <!--/-:msbuild-conditional:noEmit -->
     <PropertyGroup>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
index a9b622de6e..4433670f7b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
@@ -1,14 +1,14 @@
 <Project>
     <ItemGroup>
         <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.Butil" Version="9.2.0" />
+        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0" />
+        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0" />
+        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0" />
+        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0" />
+        <PackageVersion Include="Bit.Bswup" Version="9.2.0" />
+        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0" />
+        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0" />
         <PackageVersion Include="libphonenumber-csharp" Version="8.13.52" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.0" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
@@ -49,7 +49,7 @@
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.Firebase.Messaging" Version="124.1.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Plugin.LocalNotification" Version="11.1.4" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="AdsPush" Version="2.0.0" />
-        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-04" />
+        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0" />
         <PackageVersion Condition=" '$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
         <PackageVersion Condition="'$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.Azure.SignalR" Version="1.29.0" />
         <PackageVersion Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
index 5c8e9e51e6..e3994a4ec3 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
@@ -1,14 +1,14 @@
 <Project>
     <ItemGroup>
         <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-        <PackageVersion Include="Bit.Butil" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.Bswup" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04" />
-        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0-pre-04" />
+        <PackageVersion Include="Bit.Butil" Version="9.2.0" />
+        <PackageVersion Include="Bit.BlazorUI" Version="9.2.0" />
+        <PackageVersion Include="Bit.BlazorUI.Icons" Version="9.2.0" />
+        <PackageVersion Include="Bit.BlazorUI.Assets" Version="9.2.0" />
+        <PackageVersion Include="Bit.BlazorUI.Extras" Version="9.2.0" />
+        <PackageVersion Include="Bit.Bswup" Version="9.2.0" />
+        <PackageVersion Include="Bit.CodeAnalyzers" Version="9.2.0" />
+        <PackageVersion Include="Bit.SourceGenerators" Version="9.2.0" />
         <PackageVersion Include="libphonenumber-csharp" Version="8.13.52" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.11" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
@@ -46,7 +46,7 @@
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.Firebase.Messaging" Version="124.1.0" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Plugin.LocalNotification" Version="11.1.4" />
         <PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="AdsPush" Version="2.0.0" />
-        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0-pre-04" />
+        <PackageVersion Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="9.2.0" />
         <PackageVersion Condition=" '$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.11" />
         <PackageVersion Condition="'$(signalR)' == 'true' OR '$(signalR)' == ''" Include="Microsoft.Azure.SignalR" Version="1.29.0" />
         <PackageVersion Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
index b10b39cbfa..64c1805528 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
@@ -22,15 +22,15 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-04" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-04" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
index 2c452822a7..ca355227d2 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
index 3c647a47a6..cb97211a2a 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Careers/src/Directory.Build.props b/src/Websites/Careers/src/Directory.Build.props
index e1c5cdf73e..5c137e1ff8 100644
--- a/src/Websites/Careers/src/Directory.Build.props
+++ b/src/Websites/Careers/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-04 -->
+<!-- Generated by bit-dual template v-9.2.0 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
index cb05537c43..442642400d 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
@@ -22,16 +22,16 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.Butil" Version="9.2.0-pre-04" />
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-04" />
+        <PackageReference Include="Bit.Butil" Version="9.2.0" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-04" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
index da7a501a82..d2199db6dc 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
@@ -174,8 +174,8 @@ rm $HOME/dotnet.tar.gz</CodeBox>
                             }
                         </li>
                         <li>
-                            <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/9.2.0-pre-04" target="_blank">Bit Boilerplate</a> project template</div>
-                            <CodeBox>dotnet new install Bit.Boilerplate::9.2.0-pre-04</CodeBox>
+                            <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/9.2.0" target="_blank">Bit Boilerplate</a> project template</div>
+                            <CodeBox>dotnet new install Bit.Boilerplate::9.2.0</CodeBox>
                         </li>
                         @if (showCrossPlatform && devOS is "Windows")
                         {
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
index 5bf24a43e6..d8aaf79593 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
@@ -38,7 +38,7 @@ public partial class Templates03GettingStartedPage
             command:"dotnet nuget add source \"https://api.nuget.org/v3/index.json\" --name \"nuget.org\"; dotnet workload install wasm-tools;"),
 
             (text:@"echo 'Install the Bit.Boilerplate project template https://www.nuget.org/packages/Boilerplate.Templates';",
-            command:"dotnet new install Bit.Boilerplate::9.2.0-pre-04;")
+            command:"dotnet new install Bit.Boilerplate::9.2.0;")
         ];
 
         if (enableVirtualization)
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
index c32e687890..b41138f013 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
index 3c647a47a6..cb97211a2a 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Platform/src/Directory.Build.props b/src/Websites/Platform/src/Directory.Build.props
index 310b7d97bb..896aa49df7 100644
--- a/src/Websites/Platform/src/Directory.Build.props
+++ b/src/Websites/Platform/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-04 -->
+<!-- Generated by bit-dual template v-9.2.0 -->
 <Project>
     <PropertyGroup>
         <LangVersion>preview</LangVersion>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
index cb800ef71c..4edc5892f4 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
@@ -22,15 +22,15 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.BlazorUI" Version="9.2.0-pre-04" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0-pre-04" />
+        <PackageReference Include="Bit.BlazorUI" Version="9.2.0" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="9.2.0" />
         <BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0-pre-04" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="9.2.0" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
index 5bc724255a..230078fd11 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
@@ -10,11 +10,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
index 3c647a47a6..cb97211a2a 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0-pre-04">
+        <PackageReference Include="Bit.SourceGenerators" Version="9.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Websites/Sales/src/Directory.Build.props b/src/Websites/Sales/src/Directory.Build.props
index 20750a9619..a8c72eee81 100644
--- a/src/Websites/Sales/src/Directory.Build.props
+++ b/src/Websites/Sales/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-9.2.0-pre-04 -->
+<!-- Generated by bit-dual template v-9.2.0 -->
 <Project>
     <PropertyGroup>
         <LangVersion>13.0</LangVersion>