Merge branch 'develop'

Merge branch 'main' into develop
Merge tag 'AddCustomBootstrapDialog' into develop
2026-05-05 11:20:58 +02:00 · 2026-05-05 11:20:51 +02:00 · 2026-05-05 11:20:43 +02:00 · 2026-05-05 11:20:29 +02:00 · 2026-05-05 11:19:49 +02:00 · 2026-05-05 11:19:22 +02:00
147 changed files with 11921 additions and 7003 deletions
@@ -7,11 +7,14 @@ namespace EgwCoreLib.BlazorTest.Data
        public static Dictionary<string, string> MenuList { get; set; } = new()
        {
            {"TestPdfViewer", "Test PdfViewer"},
+            {"TestInput", "Test Input Ext"},
            {"TestQrDisplay", "Test QrDisplay"},
            {"TestGraphCompo", "Test Graph Compo"},
            {"TestBarcodeReader", "Test Barcode Read"},
            {"TestCalendario", "Test Calendario"},
            {"TestProgress", "Test Progress"},
+            {"TestParetoProgress", "Test Pareto ProgressBar"},
+            {"TestDialog", "Test Custom Dialog"},
            {"TestLoading", "Test Loading"},
            {"TestComponenti", "Test Componenti"},
            {"TestSvgDraw", "Test SVG draw"},
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
@@ -23,7 +23,8 @@
    <PackageReference Include="DeviceId" Version="6.7.0" />
    <PackageReference Include="DeviceId.Windows" Version="6.6.0" />
    <PackageReference Include="DeviceId.Windows.Wmi" Version="6.6.0" />
-    <PackageReference Include="Radzen.Blazor" Version="5.1.8" />
+    <PackageReference Include="Radzen.Blazor" Version="6.2.6" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
  </ItemGroup>

  <ItemGroup>
@@ -5,31 +5,39 @@
 <div class="card my-2">
    <div class="card-header"><h4>Test Barcode Reader</h4></div>
    <div class="card-body">
-        <BarcodeReader 
-                       @ref="barcodeReaderCustom"
-                       ScanResult="(e) => ScanDoneHandler(e)"
-                       ScanBtnTitle="Scan"
-                       ResetBtnTitle="Reset"
-                       CloseBtnTitle="Close"
-                       UseBuiltinDiv="false"
-                       SelectDeviceBtnTitle="Select Device">
-        </BarcodeReader>
+        @if (ShowScanBarcode)
+        {
+            <BarcodeReader 
+            @ref="barcodeReaderCustom"
+            ScanResult="(e) => ScanDoneHandler(e)"
+            ScanBtnTitle="Scan"
+            ResetBtnTitle="Reset"
+            CloseBtnTitle="Close"
+            UseBuiltinDiv="false"
+            SelectDeviceBtnTitle="Select Device">
+            </BarcodeReader>

-        <div @ref="barcodeReaderCustom.Element" class="d-flex justify-content-center">
-            <div class="col-12 col-md-8 col-lg-6">
-                <button class="btn btn-outline-success p-2 m-1 w-25" data-action="startButton">Scan</button>
-                <button class="btn btn-outline-success p-2 m-1 w-25" data-action="resetButton">Reset</button>
+            <div @ref="barcodeReaderCustom.Element" class="d-flex justify-content-center">
+                <div class="col-12 col-md-8 col-lg-6">
+                    <button class="btn btn-outline-success p-2 m-1 w-25" data-action="startButton">Scan</button>
+                    <button class="btn btn-outline-success p-2 m-1 w-25" data-action="resetButton">Reset</button>
+                    <button class="btn btn-outline-success p-2 m-1 w-25" @onclick="() => ToggleCodeScan()">Close</button>

-                <div data-action="sourceSelectPanel" style="display:none">
-                    <label for="sourceSelect">Source:</label>
-                    <select data-action="sourceSelect" style="max-width:100%" class="form-control">
-                    </select>
-                </div>
-                <div>
-                    <video id="video" playsinline="true" autoplay="true" class="w-100 h-100 border rounded shadow shadow-lg image-mirror" muted="true"></video>
+                    <div data-action="sourceSelectPanel" style="display:none">
+                        <label for="sourceSelect">Source:</label>
+                        <select data-action="sourceSelect" style="max-width:100%" class="form-control">
+                        </select>
+                    </div>
+                    <div>
+                        <video id="video" playsinline="true" autoplay="true" class="w-100 h-100 border rounded shadow shadow-lg image-mirror" muted="true"></video>
+                    </div>
                </div>
            </div>
-        </div>
+        }
+        else
+        {
+            <button class="btn btn-outline-success p-2 m-1 w-25" @onclick="() => ToggleCodeScan()">Open</button>
+        }
    </div>
 </div>

@@ -48,4 +56,10 @@
    }

    protected string qrCodeVal { get; set; } = "https://office.egalware.com/WDC/UI";
+
+    protected void ToggleCodeScan()
+    {
+        ShowScanBarcode = !ShowScanBarcode;
+    }
+    private bool ShowScanBarcode = true;
 }
@@ -6,46 +6,48 @@
    <div class="card-header">
        <h3>Test Calendario + Gauges</h3>
    </div>
-    <div class="card-body py-1">
+    <div class="card-body py-0">

        <div class="row bg-dark py-3">
-            <div class="col">
+            <div class="col-12 col-md-6">
                <CalendarWeek DateList="@ListDate" EventList="@EventListWeek" PercX="150" PercY="0" backToCalendar="ForceReloadWeek" EC_HeadDateSel="SetDayDetail"></CalendarWeek>
            </div>
-        </div>
+            <div class="col-12 col-md-6">
+                <div class="row bg-dark">
+                    <div class="col">
+                        <CircleGauge maxVal="480" currVal="240" Titolo="4:00" Testo="Lavorate"></CircleGauge>
+                    </div>
+                    <div class="col">
+                        <CircleGauge maxVal="480" currVal="360" Titolo="6:00" Testo="Lavorate"></CircleGauge>
+                    </div>
+                    <div class="col">
+                        <CircleGauge maxVal="480" currVal="480" Titolo="8:00" Testo="Lavorate"></CircleGauge>
+                    </div>
+                    <div class="col">
+                        <CircleGauge maxVal="480" currVal="600" Titolo="10:00" Testo="Lavorate"></CircleGauge>
+                    </div>
+                </div>

-        <div class="row bg-dark">
-            <div class="col">
-                <CircleGauge maxVal="480" currVal="240" Titolo="4:00" Testo="Lavorate"></CircleGauge>
-            </div>
-            <div class="col">
-                <CircleGauge maxVal="480" currVal="360" Titolo="6:00" Testo="Lavorate"></CircleGauge>
-            </div>
-            <div class="col">
-                <CircleGauge maxVal="480" currVal="480" Titolo="8:00" Testo="Lavorate"></CircleGauge>
-            </div>
-            <div class="col">
-                <CircleGauge maxVal="480" currVal="600" Titolo="10:00" Testo="Lavorate"></CircleGauge>
+                <div class="row bg-dark py-3">
+                    <div class="col">
+                        <CalendarMonth DtRif="@dtCurr" MainCss="table table-dark table-borderless" DateSelected="DisplayDate" DateCheck="@DateCheck" SingleWeek="@singleWeek"></CalendarMonth>
+                    </div>
+                </div>
+
+                <div class="d-flex justify-content-between">
+                    <div>
+                        <b>@($"{dtCurr:ddd dd.MM.yyyy}")</b>
+                    </div>
+                    <div>
+                        <button class="btn btn-primary" @onclick="() => resetCal()">Reset</button>
+                    </div>
+                    <div>
+                        single: <b>@singleWeek</b>
+                    </div>
+                </div>
            </div>
        </div>

-        <div class="row bg-dark py-3">
-            <div class="col">
-                <CalendarMonth DtRif="@dtCurr" MainCss="table table-dark table-borderless" DateSelected="DisplayDate" DateCheck="@DateCheck" SingleWeek="@singleWeek"></CalendarMonth>
-            </div>
-        </div>
-
-        <div class="d-flex justify-content-between">
-            <div>
-                <b>@($"{dtCurr:ddd dd.MM.yyyy}")</b>
-            </div>
-            <div>
-                <button class="btn btn-primary" @onclick="() => resetCal()">Reset</button>
-            </div>
-            <div>
-                single: <b>@singleWeek</b>
-            </div>
-        </div>
    </div>
 </div>

@@ -25,7 +25,7 @@ namespace EgwCoreLib.BlazorTest.Pages
                DateTime newDate = dtCurr.AddDays(rnd.Next(-5, 10)).Date;
                if (!DateCheck.ContainsKey(newDate))
                {
-                    DateCheck.Add(newDate, "bg-success text-light rounded-circle p-2");
+                    DateCheck.Add(newDate, "bg-danger text-light rounded-circle p-2");
                }
                else
                {
@@ -44,13 +44,13 @@
                </div>
                <div class="col-2 text-center">
                    <div>
-                        <Doughnut Id="00" Type="@Doughnut.ChartType.Doughnut" Data="@SimData()" BackgroundColor="@colors"></Doughnut>
+                        <Doughnut Id="00" Type="@Doughnut.ChartType.Doughnut" Data="@SimData()" BackgroundColor="@colors" BordWidth="1"></Doughnut>
                    </div>
                    <small>display con animazione</small>
                </div>
                <div class="col-2 text-center">
                    <div>
-                        <Doughnut Id="03" Type="@Doughnut.ChartType.Doughnut" Data="@SimData()" BackgroundColor="@colors"></Doughnut>
+                        <Doughnut Id="03" Type="@Doughnut.ChartType.Doughnut" Data="@SimData()" BackgroundColor="@colors" BordWidth="3"></Doughnut>
                    </div>
                    <small>display con animazione</small>
                </div>
@@ -101,15 +101,15 @@ namespace EgwCoreLib.BlazorTest.Pages
                answ.Add(currColor);
                if (currColor > 7)
                {
-                    colors.Add(new DoughnutStyling("#28FF69", "ccc"));
+                    colors.Add(new DoughnutStyling("#28FF69", "#00AA00"));
                }
                else if (currColor > 3)
                {
-                    colors.Add(new DoughnutStyling("orange", "ccc"));
+                    colors.Add(new DoughnutStyling("orange", "#99AA00"));
                }
                else
                {
-                    colors.Add(new DoughnutStyling("red", "ccc"));
+                    colors.Add(new DoughnutStyling("red", "#FF6969"));
                }
            }
            return answ.ToArray();
@@ -1,4 +1,5 @@
@page "/TestComponenti"
+@using static EgwCoreLib.Razor.Sorter

@inject NavigationManager NavMan
@implements IDisposable
@@ -129,27 +130,78 @@
                </div>
            </div>
            <div class="col-3">
-                <div class="card ">
+                <div class="card">
                    <div class="card-header"><h4>Test toggler</h4></div>
                    <div class="card-body">
                        <Toggler SelFilter="@TogFilter"></Toggler>
-                        <br/>
+                        <br />
                        <NumInput Value="@numero"></NumInput>
                    </div>
                </div>
            </div>
            <div class="col-3">
-                <span class="form-check form-switch">
-                    <label class="form-check-label">Small Pager</label>
-                    <input class="form-check-input" type="checkbox" @bind="@ShowSmallPager">
-                </span>
+                <div class="card">
+                    <div class="card-header"><h4>Test switch pager</h4></div>
+                    <div class="card-body">
+                        <span class="form-check form-switch">
+                            <label class="form-check-label">Small Pager</label>
+                            <input class="form-check-input" type="checkbox" @bind="@ShowSmallPager">
+                        </span>
+                    </div>
+                </div>
+            </div>
+            <div class="col-3">
+                <div class="card">
+                    <div class="card-header"><h4>Test Sorter</h4></div>
+                    <div class="card-body">
+                        <table class="table table-sm table-striped table-responsive-lg">
+                            <thead>
+
+                                <tr>
+                                    <th>
+                                        Col A
+                                        <Sorter ParamName="ColA" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter>
+                                    </th>
+                                    <th>
+                                        ColB
+                                        <Sorter ParamName="ColB" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter>
+                                    </th>
+                                    <th>
+                                        Col C
+                                        <Sorter ParamName="ColC" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter>
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr>
+                                    <td>Sort param</td>
+                                    <td>@sortField</td>
+                                    <td>@sortAsc</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+            <div class="col-3">
+                <div class="card">
+                    <div class="card-header"><h4>Test RadioButtons</h4></div>
+                    <div class="card-body">
+                        <div>Multi</div>
+                        <MultiButton ListValues="@ListButtons" EC_ValueChanged="SaveRBLSel"></MultiButton>
+                        <div>Single</div>
+                        <MultiButton ListValues="@ListChecks" ClassSel="btn-warning" ClassDesel="btn-secondary opacity-50" EC_ValueChanged="SaveRBLSel" MultiSel="false"></MultiButton>
+                        <hr />
+                        <p>@valSel</p>
+                    </div>
+                </div>
            </div>
        </div>
    </div>
    <div class="card-footer">
-        @if(ShowSmallPager)
+        @if (ShowSmallPager)
        {
-                <DataPager currPage="1" totalCount="@numero" NumPages="4" DisplSize="DataPager.ObjSize.small"></DataPager>
+            <DataPager currPage="1" totalCount="@numero" NumPages="4" DisplSize="DataPager.ObjSize.small"></DataPager>
        }
        else
        {
@@ -162,6 +214,11 @@

@code {

+    protected void SaveRBLSel(MultiButton.ItemData newVal)
+    {
+        valSel = $"{newVal.Text}: sel: {newVal.Selected}";
+    }
+
    Toggler.SelectGlobalToggle TogFilter { get; set; } = new Toggler.SelectGlobalToggle();
    protected string textToCopy = $"{Guid.NewGuid()}";
    protected decimal valDecimale = 12345;
@@ -170,6 +227,18 @@
    private int qsIntero = -1;
    private int numero = 0;

+    private bool sortAsc = false;
+    private string sortField = "";
+
+    protected void SortRequested(SortCallBack e)
+    {
+        if (sortField == e.ParamName)
+        {
+            sortAsc = e.IsAscending;
+        }
+        sortField = e.ParamName;
+    }
+
    private bool ShowSmallPager { get; set; } = false;

    protected Random rnd = new Random();
@@ -182,14 +251,42 @@
        NavMan.LocationChanged += LocationChanged;
        // toggler!
        TogFilter = new()
-            {
-                isActive = true,
-                leftString = "opzione sx",
-                rightString = "opzione dx"
-            };
+        {
+            isActive = true,
+            leftString = "opzione sx",
+            rightString = "opzione dx"
+        };

        //test input
        numero = rnd.Next(100, 300);
+
+        // preparo buttons
+        ListButtons = new List<MultiButton.ItemData>();
+        for (int i = 1; i <= 4; i++)
+        {
+            ListButtons.Add(new MultiButton.ItemData()
+            {
+                CodItem = $"B{i:00}",
+                Ordinal = i,
+                Selected = false,
+                Text = $"Btn_{i:00}",
+                Tooltip = $"Toggle Button {i:00}"
+            });
+        }
+
+        // preparo checks
+        ListChecks = new List<MultiButton.ItemData>();
+        for (int i = 1; i <= 4; i++)
+        {
+            ListChecks.Add(new MultiButton.ItemData()
+            {
+                CodItem = $"B{i:00}",
+                Ordinal = i,
+                Selected = false,
+                Text = $"Chk_{i:00}",
+                Tooltip = $"Switch {i:00}"
+            });
+        }
    }
    async void LocationChanged(object sender, LocationChangedEventArgs e)
    {
@@ -202,4 +299,10 @@
    {
        NavMan.LocationChanged -= LocationChanged;
    }
+
+
+    private List<MultiButton.ItemData>? ListButtons = null;
+    private string valSel = "";
+    private List<MultiButton.ItemData>? ListChecks = null;
+    private string checkSel = "";
 }
@@ -0,0 +1,72 @@
+@page "/TestDialog"
+
+<div class="card">
+    <div class="card-header">
+        <h3>Pure Blazor Prompt Test</h3>
+    </div>
+    <div class="card-body">
+
+
+        <button class="btn btn-primary" @onclick="ShowMessage">Show Message</button>
+        <button class="btn btn-warning" @onclick="ShowConfirm">Show Confirm</button>
+        <button class="btn btn-success" @onclick="ShowPrompt">Show Prompt</button>
+
+        <hr />
+        <p>@resultMessage</p>
+    </div>
+</div>
+
+<BootstrapModal @ref="modal" Title=@cTitle Message=@cMessage Mode=@cMode Placeholder=@cPlaceholder UserInput=@cUserInput Size="BootstrapModal.ModalSize.Normal" UserOptions=@cOpt BigButtons=@cBigBtn TitleCss="bg-secondary bg-opacity-25 bg-gradient" />
+
+@code {
+    private BootstrapModal? modal;
+    private string resultMessage = "";
+
+    private string cTitle = "";
+    private string cMessage = "";
+    private string cPlaceholder = "";
+    private string cUserInput = "";
+    private bool cBigBtn = false;
+    private Dictionary<bool, string>? cOpt = null;
+    private BootstrapModal.ModalMode cMode = BootstrapModal.ModalMode.ND;
+
+
+    private async Task ShowMessage()
+    {
+        cTitle = "Information";
+        cMessage = "This is a standard message.";
+        cMode = BootstrapModal.ModalMode.Message;
+        cOpt = null;
+        cBigBtn = false;
+
+        await modal!.ShowAsync<bool>();
+        resultMessage = "Message closed.";
+    }
+
+    private async Task ShowConfirm()
+    {
+        cTitle = "Confirm Action";
+        cMessage = "Are you sure you want to continue?";
+        cMode = BootstrapModal.ModalMode.Confirm;
+        cOpt = new();
+        cOpt.Add(true, "Si");
+        cOpt.Add(false, "No");
+        cBigBtn = true;
+
+        bool confirmed = await modal!.ShowAsync<bool>();
+        resultMessage = confirmed ? "User confirmed." : "User cancelled.";
+    }
+    private async Task ShowPrompt()
+    {
+        cTitle = "Enter Name";
+        cMessage = "What is your name?";
+        cPlaceholder = "Type your name...";
+        cUserInput = "";
+        cMode = BootstrapModal.ModalMode.Prompt;
+        cOpt = null;
+        cBigBtn = false;
+
+        string? name = await modal!.ShowAsync<string?>();
+        resultMessage = name is null ? "User cancelled." : $"Hello, {name}!";
+    }
+}
@@ -2,70 +2,154 @@
@using DeviceId
@using EgwCoreLib.Utils

-
-<div class="row small">
-    <div class="col-6">
-        <ul class="list-group">
-            <li class="list-group-item active">
-                Device ID
-            </li>
-            @if (ListDevId != null && ListDevId.Count > 0)
+@if (isLoading)
+{
+    <LoadingData DisplaySize="LoadingData.CtrlSize.Large" DisplayMode="LoadingData.SpinMode.BounceLine"></LoadingData>
+}
+else
+{
+    <div class="row small" style="font-size: 0.8rem;">
+        <div class="col-6">
+            <ul class="list-group">
+                <li class="list-group-item active">
+                    Device ID
+                </li>
+                @if (ListDevId != null && ListDevId.Count > 0)
+                {
+                    @foreach (var item in ListDevId)
+                    {
+                        <li class="list-group-item d-flex justify-content-between">
+                            <div class="px-1">@item.Key</div>
+                            <div class="px-1">@item.Value</div>
+                        </li>
+                    }
+                }
+            </ul>
+        </div>
+        <div class="col-6">
+            <ul class="list-group">
+                <li class="list-group-item active">
+                    Sublicense
+                </li>
+                <li class="list-group-item d-flex justify-content-between">
+                    <div class="px-1">CodImpiego</div>
+                    <div class="px-1">@codImpiego</div>
+                </li>
+                <li class="list-group-item d-flex justify-content-between">
+                    <div class="px-1">Payload</div>
+                    <div class="px-1">@decVal</div>
+                </li>
+                <li class="list-group-item d-flex justify-content-between">
+                    <div class="px-1">AppKey</div>
+                    <div class="px-1">@appKey</div>
+                </li>
+                <li class="list-group-item d-flex justify-content-between">
+                    <button class="btn btn-info btn-sm w-100" @onclick="Regenerate">ReGen</button>
+                </li>
+            </ul>
+        </div>
+        <div class="col-4">
+            <ul class="list-group">
+                <li class="list-group-item active">
+                    Machine Info
+                </li>
+                @if (ListAllMacInfo != null && ListAllMacInfo.Count > 0)
+                {
+                    @foreach (var item in ListAllMacInfo)
+                    {
+                        <li class="list-group-item d-flex justify-content-between">
+                            <div class="px-1">@item.Key</div>
+                            <div class="px-1">@item.Value</div>
+                        </li>
+                    }
+                }
+            </ul>
+        </div>
+        <div class="col-4">
+            @if (ListUserInfo != null && ListUserInfo.Count > 0)
            {
-                @foreach (var item in ListDevId)
+                <ul class="list-group">
+                    <li class="list-group-item active">
+                        UserInfo
+                    </li>
+                    @foreach (var item in ListUserInfo)
+                    {
+                        <li class="list-group-item d-flex justify-content-between">
+                            <div class="px-1">@item.Key</div>
+                            <div class="px-1">@item.Value</div>
+                        </li>
+                    }
+                </ul>
+            }
+            @if (ListNetInfo != null && ListNetInfo.Count > 0)
+            {
+                <br />
+                <ul class="list-group">
+                    <li class="list-group-item active">
+                        NetInfo
+                    </li>
+                    @foreach (var item in ListNetInfo)
+                    {
+                        <li class="list-group-item d-flex justify-content-between">
+                            <div class="px-1">@item.Key</div>
+                            <div class="px-1">@item.Value</div>
+                        </li>
+                    }
+                </ul>
+            }
+        </div>
+        <div class="col-4">
+            <ul class="list-group">
+                <li class="list-group-item active">
+                    CpuInfo
+                </li>
+                @foreach (var item in ListOsInfo)
                {
                    <li class="list-group-item d-flex justify-content-between">
                        <div class="px-1">@item.Key</div>
                        <div class="px-1">@item.Value</div>
                    </li>
                }
-            }
-        </ul>
-        <hr />
-
-        <ul class="list-group">
-            <li class="list-group-item active">
-                Sublicense
-            </li>
-            <li class="list-group-item d-flex justify-content-between">
-                <div class="px-1">CodImpiego</div>
-                <div class="px-1">@codImpiego</div>
-            </li>
-            <li class="list-group-item d-flex justify-content-between">
-                <div class="px-1">Payload</div>
-                <div class="px-1">@decVal</div>
-            </li>
-            <li class="list-group-item d-flex justify-content-between">
-                <div class="px-1">AppKey</div>
-                <div class="px-1">@appKey</div>
-            </li>
-            <li>
-                <button class="btn btn-primary" @onclick="Regenerate">ReGen</button>
-            </li>
-        </ul>
-    </div>
-    <div class="col-6">
-        <ul class="list-group">
-            <li class="list-group-item active">
-                Machine Info
-            </li>
-            @if (ListMachineInfo != null && ListMachineInfo.Count > 0)
-            {
-                @foreach (var item in ListMachineInfo)
+            </ul>
+            <br />
+            <ul class="list-group">
+                <li class="list-group-item active">
+                    OsInfo
+                </li>
+                @foreach (var item in ListOsInfo)
                {
                    <li class="list-group-item d-flex justify-content-between">
                        <div class="px-1">@item.Key</div>
                        <div class="px-1">@item.Value</div>
                    </li>
                }
-            }
-        </ul>
+            </ul>
+            <br />
+            <ul class="list-group">
+                <li class="list-group-item active">
+                    VolInfo
+                </li>
+                @foreach (var item in ListVolInfo)
+                {
+                    <li class="list-group-item d-flex justify-content-between">
+                        <div class="px-1">@item.Key</div>
+                        <div class="px-1">@item.Value</div>
+                    </li>
+                }
+            </ul>
+        </div>
    </div>
-</div>

+}

@code {
+    protected Dictionary<string, string> ListAllMacInfo { get; set; } = new Dictionary<string, string>();
+    protected Dictionary<string, string> ListCpuInfo { get; set; } = new Dictionary<string, string>();
    protected Dictionary<string, string> ListDevId { get; set; } = new Dictionary<string, string>();
-    protected Dictionary<string, string> ListMachineInfo { get; set; } = new Dictionary<string, string>();
+    protected Dictionary<string, string> ListNetInfo { get; set; } = new Dictionary<string, string>();
+    protected Dictionary<string, string> ListOsInfo { get; set; } = new Dictionary<string, string>();
+    protected Dictionary<string, string> ListUserInfo { get; set; } = new Dictionary<string, string>();
+    protected Dictionary<string, string> ListVolInfo { get; set; } = new Dictionary<string, string>();

    protected MachineDataValidator MDValidator { get; set; } = new MachineDataValidator();

@@ -75,7 +159,22 @@
    protected string appKey = "";
    protected string decVal = "";

-    protected override void OnInitialized()
+    private bool isLoading { get; set; } = true;
+
+    protected override async Task OnInitializedAsync()
+    {
+        isLoading = true;
+        await InvokeAsync(StateHasChanged);
+        await Task.Run(() =>
+        {
+            GetInfo();
+        });
+        Regenerate();
+        isLoading = false;
+        await InvokeAsync(StateHasChanged);
+    }
+
+    protected void GetInfo()
    {
        string deviceId = "";
        deviceId = new DeviceIdBuilder()
@@ -99,26 +198,39 @@
                            .AddProcessorId()
                            .AddMotherboardSerialNumber()
                            .AddSystemDriveSerialNumber())
+                        // .OnLinux(linux => linux
+                        //     .AddMotherboardSerialNumber()
+                        //     .AddSystemDriveSerialNumber())
+                        // .OnMac(mac => mac
+                        //     .AddSystemDriveSerialNumber()
+                        //     .AddPlatformSerialNumber())
                        .ToString();
        ListDevId.Add("DevId_03", deviceId);

-        ListMachineInfo = MachineDataValidator.userInfo;
+        ListNetInfo = new Dictionary<string, string>(MachineDataValidator.netInfo);
+        ListOsInfo = new Dictionary<string, string>(MachineDataValidator.osInfo);
+        ListUserInfo = new Dictionary<string, string>(MachineDataValidator.userInfo);
+        ListCpuInfo = new Dictionary<string, string>(MachineDataValidator.cpuInfo);
+        ListVolInfo = new Dictionary<string, string>(MachineDataValidator.volInfo);
+
+        ListAllMacInfo = new Dictionary<string, string>(MachineDataValidator.userInfo);
        foreach (var item in MachineDataValidator.netInfo)
        {
-            if (!ListMachineInfo.ContainsKey(item.Key))
+            if (!ListAllMacInfo.ContainsKey(item.Key))
            {
-                ListMachineInfo.Add(item.Key, item.Value);
+                ListAllMacInfo.Add(item.Key, item.Value);
            }
        }

-        Regenerate();
    }

    protected void Regenerate()
    {
+        isLoading = true;
        codImpiego = SubLicManager.CodImpiego();
        appKey = SubLicManager.GenKey(passphrase, false);
        decVal = SteamCrypto.DecryptString(appKey, passphrase);
+        isLoading = false;
    }

    private string passphrase = "SaltPass";
@@ -0,0 +1,50 @@
+@page "/TestInput"
+
+<PageTitle>TestInput</PageTitle>
+
+
+<div class="card">
+    <div class="card-header">
+        <h3>Test Input Specializzati</h3>
+    </div>
+    <div class="card-body py-1">
+        <div class="row">
+             <div class="col-4">
+                 <div class="fs-4">
+                     Decimal
+                </div>
+                <div class="input-group">
+                    <InputDecimal Decimals="0" Step="0.001M" CssClass="form-control form-control-lg text-end w-auto" @bind-Value="@DecimalValue"></InputDecimal>
+                    <span class="input-group-text">Decimal 0</span>
+                </div>
+                <div class="input-group">
+                    <InputDecimal Decimals="3" Step="0.001M" CssClass="form-control form-control-lg text-end w-auto" @bind-Value="@DecimalValue"></InputDecimal>
+                    <span class="input-group-text">Decimal 3</span>
+                </div>
+            </div>
+            <div class="col-4">
+                <div class="fs-4">
+                    Percentage
+                </div>
+                <div class="input-group">
+                    <InputPercent CssClass="form-control form-control-lg text-end w-auto" @bind-Value="@PercValue" Decimals="0"></InputPercent>
+                    <span class="input-group-text">Percent P0</span>
+                </div>
+                <div class="input-group">
+                    <InputPercent CssClass="form-control form-control-lg text-end w-auto" @bind-Value="@PercValue" Decimals="2"></InputPercent>
+                    <span class="input-group-text">Percent P2</span>
+                </div>
+                <div class="input-group">
+                    <InputPercent CssClass="form-control form-control-lg text-end w-auto" @bind-Value="@PercValue" Decimals="2" ForceInvariantParsing="true"></InputPercent>
+                    <span class="input-group-text">Percent P2 Invariant</span>
+                </div>
+            </div>
+            <div class="col-4"></div>
+        </div>
+    </div>
+</div>
+
+@code {
+    private decimal DecimalValue = 0;
+    private decimal PercValue = 0.123M;
+}
@@ -0,0 +1,40 @@
+@page "/TestParetoProgress"
+
+
+<div class="card">
+    <div class="card-header">
+        <h3>Test Pareto ProgressBar</h3>
+    </div>
+    <div class="card-body py-1">
+        <div class="row">
+            @foreach (var dataSet in ListParetoTime)
+            {
+                <div class="col-4">
+                    <ParetoProgress ParetoData="@dataSet" Title="Demo Progress" />
+                </div>
+            }
+        </div>
+    </div>
+</div>
+
+
+@code {
+    private List<Dictionary<string, int>> ListParetoTime = new();
+
+
+    private Random rnd = new();
+    protected override void OnInitialized()
+    {
+        base.OnInitialized();
+        ListParetoTime = new();
+        // simulazione...
+        for (int i = 0; i < 9; i++)
+        {
+            Dictionary<string, int> currSet = new();
+            currSet.Add("success", rnd.Next(2, 10));
+            currSet.Add("warning", rnd.Next(0, 10));
+            currSet.Add("danger", rnd.Next(1, 10));
+            ListParetoTime.Add(currSet);
+        }
+    }
+}
@@ -9,7 +9,7 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <base href="~/" />
-    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.css" />
+    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
    <link rel="stylesheet" href="lib/font-awesome/css/all.min.css" />
    <link rel="stylesheet" href="css/site.css" />
    <link rel="stylesheet" href="EgwCoreLib.BlazorTest.styles.css" />
@@ -31,6 +31,7 @@
    </div>

    <script src="lib/bootstrap/js/bootstrap.bundle.js"></script>
+    <script src="lib/bootstrapModalHelper.js"></script>
    @* <script src="https://cdn.jsdelivr.net/npm/chart.js"></script> *@
    <script src="~/lib/Chart.js/chart.umd.js"></script>

@@ -1,6 +1,7 @@
 using EgwCoreLib.BlazorTest;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Radzen;

 var builder = WebApplication.CreateBuilder(args);
@@ -28,6 +29,9 @@ if (!app.Environment.IsDevelopment())
    app.UseHsts();
 }

+
+app.UsePathBase("/BlazorTest/");
+
 // disabilita risposta compressa in debug
 if (!app.Environment.IsDevelopment())
 {
@@ -18,5 +18,9 @@
  {
    "outputFile": "Pages/TestBarcodeReader.razor.css",
    "inputFile": "Pages/TestBarcodeReader.razor.less"
+  },
+  {
+    "outputFile": "Pages/BootstrapModal.razor.css",
+    "inputFile": "Pages/BootstrapModal.razor.less"
  }
 ]
@@ -3,7 +3,7 @@
  "defaultProvider": "cdnjs",
  "libraries": [
    {
-      "library": "bootstrap@5.2.3",
+      "library": "bootstrap@5.3.8",
      "destination": "wwwroot/lib/bootstrap/"
    },
    {
@@ -11,7 +11,6 @@
      "destination": "wwwroot/lib/font-awesome/"
    },
    {
-      "provider": "cdnjs",
      "library": "Chart.js@4.4.1",
      "destination": "wwwroot/lib/Chart.js/"
    }
@@ -1,78 +1,8 @@
 /*!
- * Bootstrap Grid v5.2.3 (https://getbootstrap.com/)
- * Copyright 2011-2022 The Bootstrap Authors
- * Copyright 2011-2022 Twitter, Inc.
+ * Bootstrap Grid v5.3.8 (https://getbootstrap.com/)
+ * Copyright 2011-2025 The Bootstrap Authors
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
 */
-:root {
-  --bs-blue: #0d6efd;
-  --bs-indigo: #6610f2;
-  --bs-purple: #6f42c1;
-  --bs-pink: #d63384;
-  --bs-red: #dc3545;
-  --bs-orange: #fd7e14;
-  --bs-yellow: #ffc107;
-  --bs-green: #198754;
-  --bs-teal: #20c997;
-  --bs-cyan: #0dcaf0;
-  --bs-black: #000;
-  --bs-white: #fff;
-  --bs-gray: #6c757d;
-  --bs-gray-dark: #343a40;
-  --bs-gray-100: #f8f9fa;
-  --bs-gray-200: #e9ecef;
-  --bs-gray-300: #dee2e6;
-  --bs-gray-400: #ced4da;
-  --bs-gray-500: #adb5bd;
-  --bs-gray-600: #6c757d;
-  --bs-gray-700: #495057;
-  --bs-gray-800: #343a40;
-  --bs-gray-900: #212529;
-  --bs-primary: #0d6efd;
-  --bs-secondary: #6c757d;
-  --bs-success: #198754;
-  --bs-info: #0dcaf0;
-  --bs-warning: #ffc107;
-  --bs-danger: #dc3545;
-  --bs-light: #f8f9fa;
-  --bs-dark: #212529;
-  --bs-primary-rgb: 13, 110, 253;
-  --bs-secondary-rgb: 108, 117, 125;
-  --bs-success-rgb: 25, 135, 84;
-  --bs-info-rgb: 13, 202, 240;
-  --bs-warning-rgb: 255, 193, 7;
-  --bs-danger-rgb: 220, 53, 69;
-  --bs-light-rgb: 248, 249, 250;
-  --bs-dark-rgb: 33, 37, 41;
-  --bs-white-rgb: 255, 255, 255;
-  --bs-black-rgb: 0, 0, 0;
-  --bs-body-color-rgb: 33, 37, 41;
-  --bs-body-bg-rgb: 255, 255, 255;
-  --bs-font-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-  --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-  --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
-  --bs-body-font-family: var(--bs-font-sans-serif);
-  --bs-body-font-size: 1rem;
-  --bs-body-font-weight: 400;
-  --bs-body-line-height: 1.5;
-  --bs-body-color: #212529;
-  --bs-body-bg: #fff;
-  --bs-border-width: 1px;
-  --bs-border-style: solid;
-  --bs-border-color: #dee2e6;
-  --bs-border-color-translucent: rgba(0, 0, 0, 0.175);
-  --bs-border-radius: 0.375rem;
-  --bs-border-radius-sm: 0.25rem;
-  --bs-border-radius-lg: 0.5rem;
-  --bs-border-radius-xl: 1rem;
-  --bs-border-radius-2xl: 2rem;
-  --bs-border-radius-pill: 50rem;
-  --bs-link-color: #0d6efd;
-  --bs-link-hover-color: #0a58ca;
-  --bs-code-color: #d63384;
-  --bs-highlight-bg: #fff3cd;
-}
-
 .container,
 .container-fluid,
 .container-xxl,
@@ -114,6 +44,15 @@
    max-width: 1320px;
  }
 }
+:root {
+  --bs-breakpoint-xs: 0;
+  --bs-breakpoint-sm: 576px;
+  --bs-breakpoint-md: 768px;
+  --bs-breakpoint-lg: 992px;
+  --bs-breakpoint-xl: 1200px;
+  --bs-breakpoint-xxl: 1400px;
+}
+
 .row {
  --bs-gutter-x: 1.5rem;
  --bs-gutter-y: 0;
@@ -134,7 +73,7 @@
 }

 .col {
-  flex: 1 0 0%;
+  flex: 1 0 0;
 }

 .row-cols-auto > * {
@@ -154,7 +93,7 @@

 .row-cols-3 > * {
  flex: 0 0 auto;
-  width: 33.3333333333%;
+  width: 33.33333333%;
 }

 .row-cols-4 > * {
@@ -169,7 +108,7 @@

 .row-cols-6 > * {
  flex: 0 0 auto;
-  width: 16.6666666667%;
+  width: 16.66666667%;
 }

 .col-auto {
@@ -343,7 +282,7 @@

@media (min-width: 576px) {
  .col-sm {
-    flex: 1 0 0%;
+    flex: 1 0 0;
  }
  .row-cols-sm-auto > * {
    flex: 0 0 auto;
@@ -359,7 +298,7 @@
  }
  .row-cols-sm-3 > * {
    flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
  }
  .row-cols-sm-4 > * {
    flex: 0 0 auto;
@@ -371,7 +310,7 @@
  }
  .row-cols-sm-6 > * {
    flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
  }
  .col-sm-auto {
    flex: 0 0 auto;
@@ -462,57 +401,57 @@
    margin-left: 91.66666667%;
  }
  .g-sm-0,
-.gx-sm-0 {
+  .gx-sm-0 {
    --bs-gutter-x: 0;
  }
  .g-sm-0,
-.gy-sm-0 {
+  .gy-sm-0 {
    --bs-gutter-y: 0;
  }
  .g-sm-1,
-.gx-sm-1 {
+  .gx-sm-1 {
    --bs-gutter-x: 0.25rem;
  }
  .g-sm-1,
-.gy-sm-1 {
+  .gy-sm-1 {
    --bs-gutter-y: 0.25rem;
  }
  .g-sm-2,
-.gx-sm-2 {
+  .gx-sm-2 {
    --bs-gutter-x: 0.5rem;
  }
  .g-sm-2,
-.gy-sm-2 {
+  .gy-sm-2 {
    --bs-gutter-y: 0.5rem;
  }
  .g-sm-3,
-.gx-sm-3 {
+  .gx-sm-3 {
    --bs-gutter-x: 1rem;
  }
  .g-sm-3,
-.gy-sm-3 {
+  .gy-sm-3 {
    --bs-gutter-y: 1rem;
  }
  .g-sm-4,
-.gx-sm-4 {
+  .gx-sm-4 {
    --bs-gutter-x: 1.5rem;
  }
  .g-sm-4,
-.gy-sm-4 {
+  .gy-sm-4 {
    --bs-gutter-y: 1.5rem;
  }
  .g-sm-5,
-.gx-sm-5 {
+  .gx-sm-5 {
    --bs-gutter-x: 3rem;
  }
  .g-sm-5,
-.gy-sm-5 {
+  .gy-sm-5 {
    --bs-gutter-y: 3rem;
  }
 }
@media (min-width: 768px) {
  .col-md {
-    flex: 1 0 0%;
+    flex: 1 0 0;
  }
  .row-cols-md-auto > * {
    flex: 0 0 auto;
@@ -528,7 +467,7 @@
  }
  .row-cols-md-3 > * {
    flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
  }
  .row-cols-md-4 > * {
    flex: 0 0 auto;
@@ -540,7 +479,7 @@
  }
  .row-cols-md-6 > * {
    flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
  }
  .col-md-auto {
    flex: 0 0 auto;
@@ -631,57 +570,57 @@
    margin-left: 91.66666667%;
  }
  .g-md-0,
-.gx-md-0 {
+  .gx-md-0 {
    --bs-gutter-x: 0;
  }
  .g-md-0,
-.gy-md-0 {
+  .gy-md-0 {
    --bs-gutter-y: 0;
  }
  .g-md-1,
-.gx-md-1 {
+  .gx-md-1 {
    --bs-gutter-x: 0.25rem;
  }
  .g-md-1,
-.gy-md-1 {
+  .gy-md-1 {
    --bs-gutter-y: 0.25rem;
  }
  .g-md-2,
-.gx-md-2 {
+  .gx-md-2 {
    --bs-gutter-x: 0.5rem;
  }
  .g-md-2,
-.gy-md-2 {
+  .gy-md-2 {
    --bs-gutter-y: 0.5rem;
  }
  .g-md-3,
-.gx-md-3 {
+  .gx-md-3 {
    --bs-gutter-x: 1rem;
  }
  .g-md-3,
-.gy-md-3 {
+  .gy-md-3 {
    --bs-gutter-y: 1rem;
  }
  .g-md-4,
-.gx-md-4 {
+  .gx-md-4 {
    --bs-gutter-x: 1.5rem;
  }
  .g-md-4,
-.gy-md-4 {
+  .gy-md-4 {
    --bs-gutter-y: 1.5rem;
  }
  .g-md-5,
-.gx-md-5 {
+  .gx-md-5 {
    --bs-gutter-x: 3rem;
  }
  .g-md-5,
-.gy-md-5 {
+  .gy-md-5 {
    --bs-gutter-y: 3rem;
  }
 }
@media (min-width: 992px) {
  .col-lg {
-    flex: 1 0 0%;
+    flex: 1 0 0;
  }
  .row-cols-lg-auto > * {
    flex: 0 0 auto;
@@ -697,7 +636,7 @@
  }
  .row-cols-lg-3 > * {
    flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
  }
  .row-cols-lg-4 > * {
    flex: 0 0 auto;
@@ -709,7 +648,7 @@
  }
  .row-cols-lg-6 > * {
    flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
  }
  .col-lg-auto {
    flex: 0 0 auto;
@@ -800,57 +739,57 @@
    margin-left: 91.66666667%;
  }
  .g-lg-0,
-.gx-lg-0 {
+  .gx-lg-0 {
    --bs-gutter-x: 0;
  }
  .g-lg-0,
-.gy-lg-0 {
+  .gy-lg-0 {
    --bs-gutter-y: 0;
  }
  .g-lg-1,
-.gx-lg-1 {
+  .gx-lg-1 {
    --bs-gutter-x: 0.25rem;
  }
  .g-lg-1,
-.gy-lg-1 {
+  .gy-lg-1 {
    --bs-gutter-y: 0.25rem;
  }
  .g-lg-2,
-.gx-lg-2 {
+  .gx-lg-2 {
    --bs-gutter-x: 0.5rem;
  }
  .g-lg-2,
-.gy-lg-2 {
+  .gy-lg-2 {
    --bs-gutter-y: 0.5rem;
  }
  .g-lg-3,
-.gx-lg-3 {
+  .gx-lg-3 {
    --bs-gutter-x: 1rem;
  }
  .g-lg-3,
-.gy-lg-3 {
+  .gy-lg-3 {
    --bs-gutter-y: 1rem;
  }
  .g-lg-4,
-.gx-lg-4 {
+  .gx-lg-4 {
    --bs-gutter-x: 1.5rem;
  }
  .g-lg-4,
-.gy-lg-4 {
+  .gy-lg-4 {
    --bs-gutter-y: 1.5rem;
  }
  .g-lg-5,
-.gx-lg-5 {
+  .gx-lg-5 {
    --bs-gutter-x: 3rem;
  }
  .g-lg-5,
-.gy-lg-5 {
+  .gy-lg-5 {
    --bs-gutter-y: 3rem;
  }
 }
@media (min-width: 1200px) {
  .col-xl {
-    flex: 1 0 0%;
+    flex: 1 0 0;
  }
  .row-cols-xl-auto > * {
    flex: 0 0 auto;
@@ -866,7 +805,7 @@
  }
  .row-cols-xl-3 > * {
    flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
  }
  .row-cols-xl-4 > * {
    flex: 0 0 auto;
@@ -878,7 +817,7 @@
  }
  .row-cols-xl-6 > * {
    flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
  }
  .col-xl-auto {
    flex: 0 0 auto;
@@ -969,57 +908,57 @@
    margin-left: 91.66666667%;
  }
  .g-xl-0,
-.gx-xl-0 {
+  .gx-xl-0 {
    --bs-gutter-x: 0;
  }
  .g-xl-0,
-.gy-xl-0 {
+  .gy-xl-0 {
    --bs-gutter-y: 0;
  }
  .g-xl-1,
-.gx-xl-1 {
+  .gx-xl-1 {
    --bs-gutter-x: 0.25rem;
  }
  .g-xl-1,
-.gy-xl-1 {
+  .gy-xl-1 {
    --bs-gutter-y: 0.25rem;
  }
  .g-xl-2,
-.gx-xl-2 {
+  .gx-xl-2 {
    --bs-gutter-x: 0.5rem;
  }
  .g-xl-2,
-.gy-xl-2 {
+  .gy-xl-2 {
    --bs-gutter-y: 0.5rem;
  }
  .g-xl-3,
-.gx-xl-3 {
+  .gx-xl-3 {
    --bs-gutter-x: 1rem;
  }
  .g-xl-3,
-.gy-xl-3 {
+  .gy-xl-3 {
    --bs-gutter-y: 1rem;
  }
  .g-xl-4,
-.gx-xl-4 {
+  .gx-xl-4 {
    --bs-gutter-x: 1.5rem;
  }
  .g-xl-4,
-.gy-xl-4 {
+  .gy-xl-4 {
    --bs-gutter-y: 1.5rem;
  }
  .g-xl-5,
-.gx-xl-5 {
+  .gx-xl-5 {
    --bs-gutter-x: 3rem;
  }
  .g-xl-5,
-.gy-xl-5 {
+  .gy-xl-5 {
    --bs-gutter-y: 3rem;
  }
 }
@media (min-width: 1400px) {
  .col-xxl {
-    flex: 1 0 0%;
+    flex: 1 0 0;
  }
  .row-cols-xxl-auto > * {
    flex: 0 0 auto;
@@ -1035,7 +974,7 @@
  }
  .row-cols-xxl-3 > * {
    flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
  }
  .row-cols-xxl-4 > * {
    flex: 0 0 auto;
@@ -1047,7 +986,7 @@
  }
  .row-cols-xxl-6 > * {
    flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
  }
  .col-xxl-auto {
    flex: 0 0 auto;
@@ -1138,51 +1077,51 @@
    margin-left: 91.66666667%;
  }
  .g-xxl-0,
-.gx-xxl-0 {
+  .gx-xxl-0 {
    --bs-gutter-x: 0;
  }
  .g-xxl-0,
-.gy-xxl-0 {
+  .gy-xxl-0 {
    --bs-gutter-y: 0;
  }
  .g-xxl-1,
-.gx-xxl-1 {
+  .gx-xxl-1 {
    --bs-gutter-x: 0.25rem;
  }
  .g-xxl-1,
-.gy-xxl-1 {
+  .gy-xxl-1 {
    --bs-gutter-y: 0.25rem;
  }
  .g-xxl-2,
-.gx-xxl-2 {
+  .gx-xxl-2 {
    --bs-gutter-x: 0.5rem;
  }
  .g-xxl-2,
-.gy-xxl-2 {
+  .gy-xxl-2 {
    --bs-gutter-y: 0.5rem;
  }
  .g-xxl-3,
-.gx-xxl-3 {
+  .gx-xxl-3 {
    --bs-gutter-x: 1rem;
  }
  .g-xxl-3,
-.gy-xxl-3 {
+  .gy-xxl-3 {
    --bs-gutter-y: 1rem;
  }
  .g-xxl-4,
-.gx-xxl-4 {
+  .gx-xxl-4 {
    --bs-gutter-x: 1.5rem;
  }
  .g-xxl-4,
-.gy-xxl-4 {
+  .gy-xxl-4 {
    --bs-gutter-y: 1.5rem;
  }
  .g-xxl-5,
-.gx-xxl-5 {
+  .gx-xxl-5 {
    --bs-gutter-x: 3rem;
  }
  .g-xxl-5,
-.gy-xxl-5 {
+  .gy-xxl-5 {
    --bs-gutter-y: 3rem;
  }
 }
@@ -1202,6 +1141,10 @@
  display: grid !important;
 }

+.d-inline-grid {
+  display: inline-grid !important;
+}
+
 .d-table {
  display: table !important;
 }
@@ -1801,6 +1744,9 @@
  .d-sm-grid {
    display: grid !important;
  }
+  .d-sm-inline-grid {
+    display: inline-grid !important;
+  }
  .d-sm-table {
    display: table !important;
  }
@@ -2261,6 +2207,9 @@
  .d-md-grid {
    display: grid !important;
  }
+  .d-md-inline-grid {
+    display: inline-grid !important;
+  }
  .d-md-table {
    display: table !important;
  }
@@ -2721,6 +2670,9 @@
  .d-lg-grid {
    display: grid !important;
  }
+  .d-lg-inline-grid {
+    display: inline-grid !important;
+  }
  .d-lg-table {
    display: table !important;
  }
@@ -3181,6 +3133,9 @@
  .d-xl-grid {
    display: grid !important;
  }
+  .d-xl-inline-grid {
+    display: inline-grid !important;
+  }
  .d-xl-table {
    display: table !important;
  }
@@ -3641,6 +3596,9 @@
  .d-xxl-grid {
    display: grid !important;
  }
+  .d-xxl-inline-grid {
+    display: inline-grid !important;
+  }
  .d-xxl-table {
    display: table !important;
  }
@@ -4101,6 +4059,9 @@
  .d-print-grid {
    display: grid !important;
  }
+  .d-print-inline-grid {
+    display: inline-grid !important;
+  }
  .d-print-table {
    display: table !important;
  }
@@ -1,78 +1,8 @@
 /*!
- * Bootstrap Grid v5.2.3 (https://getbootstrap.com/)
- * Copyright 2011-2022 The Bootstrap Authors
- * Copyright 2011-2022 Twitter, Inc.
+ * Bootstrap Grid v5.3.8 (https://getbootstrap.com/)
+ * Copyright 2011-2025 The Bootstrap Authors
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
 */
-:root {
-  --bs-blue: #0d6efd;
-  --bs-indigo: #6610f2;
-  --bs-purple: #6f42c1;
-  --bs-pink: #d63384;
-  --bs-red: #dc3545;
-  --bs-orange: #fd7e14;
-  --bs-yellow: #ffc107;
-  --bs-green: #198754;
-  --bs-teal: #20c997;
-  --bs-cyan: #0dcaf0;
-  --bs-black: #000;
-  --bs-white: #fff;
-  --bs-gray: #6c757d;
-  --bs-gray-dark: #343a40;
-  --bs-gray-100: #f8f9fa;
-  --bs-gray-200: #e9ecef;
-  --bs-gray-300: #dee2e6;
-  --bs-gray-400: #ced4da;
-  --bs-gray-500: #adb5bd;
-  --bs-gray-600: #6c757d;
-  --bs-gray-700: #495057;
-  --bs-gray-800: #343a40;
-  --bs-gray-900: #212529;
-  --bs-primary: #0d6efd;
-  --bs-secondary: #6c757d;
-  --bs-success: #198754;
-  --bs-info: #0dcaf0;
-  --bs-warning: #ffc107;
-  --bs-danger: #dc3545;
-  --bs-light: #f8f9fa;
-  --bs-dark: #212529;
-  --bs-primary-rgb: 13, 110, 253;
-  --bs-secondary-rgb: 108, 117, 125;
-  --bs-success-rgb: 25, 135, 84;
-  --bs-info-rgb: 13, 202, 240;
-  --bs-warning-rgb: 255, 193, 7;
-  --bs-danger-rgb: 220, 53, 69;
-  --bs-light-rgb: 248, 249, 250;
-  --bs-dark-rgb: 33, 37, 41;
-  --bs-white-rgb: 255, 255, 255;
-  --bs-black-rgb: 0, 0, 0;
-  --bs-body-color-rgb: 33, 37, 41;
-  --bs-body-bg-rgb: 255, 255, 255;
-  --bs-font-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-  --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-  --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
-  --bs-body-font-family: var(--bs-font-sans-serif);
-  --bs-body-font-size: 1rem;
-  --bs-body-font-weight: 400;
-  --bs-body-line-height: 1.5;
-  --bs-body-color: #212529;
-  --bs-body-bg: #fff;
-  --bs-border-width: 1px;
-  --bs-border-style: solid;
-  --bs-border-color: #dee2e6;
-  --bs-border-color-translucent: rgba(0, 0, 0, 0.175);
-  --bs-border-radius: 0.375rem;
-  --bs-border-radius-sm: 0.25rem;
-  --bs-border-radius-lg: 0.5rem;
-  --bs-border-radius-xl: 1rem;
-  --bs-border-radius-2xl: 2rem;
-  --bs-border-radius-pill: 50rem;
-  --bs-link-color: #0d6efd;
-  --bs-link-hover-color: #0a58ca;
-  --bs-code-color: #d63384;
-  --bs-highlight-bg: #fff3cd;
-}
-
 .container,
 .container-fluid,
 .container-xxl,
@@ -114,6 +44,15 @@
    max-width: 1320px;
  }
 }
+:root {
+  --bs-breakpoint-xs: 0;
+  --bs-breakpoint-sm: 576px;
+  --bs-breakpoint-md: 768px;
+  --bs-breakpoint-lg: 992px;
+  --bs-breakpoint-xl: 1200px;
+  --bs-breakpoint-xxl: 1400px;
+}
+
 .row {
  --bs-gutter-x: 1.5rem;
  --bs-gutter-y: 0;
@@ -134,7 +73,7 @@
 }

 .col {
-  flex: 1 0 0%;
+  flex: 1 0 0;
 }

 .row-cols-auto > * {
@@ -154,7 +93,7 @@

 .row-cols-3 > * {
  flex: 0 0 auto;
-  width: 33.3333333333%;
+  width: 33.33333333%;
 }

 .row-cols-4 > * {
@@ -169,7 +108,7 @@

 .row-cols-6 > * {
  flex: 0 0 auto;
-  width: 16.6666666667%;
+  width: 16.66666667%;
 }

 .col-auto {
@@ -343,7 +282,7 @@

@media (min-width: 576px) {
  .col-sm {
-    flex: 1 0 0%;
+    flex: 1 0 0;
  }
  .row-cols-sm-auto > * {
    flex: 0 0 auto;
@@ -359,7 +298,7 @@
  }
  .row-cols-sm-3 > * {
    flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
  }
  .row-cols-sm-4 > * {
    flex: 0 0 auto;
@@ -371,7 +310,7 @@
  }
  .row-cols-sm-6 > * {
    flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
  }
  .col-sm-auto {
    flex: 0 0 auto;
@@ -462,57 +401,57 @@
    margin-right: 91.66666667%;
  }
  .g-sm-0,
-.gx-sm-0 {
+  .gx-sm-0 {
    --bs-gutter-x: 0;
  }
  .g-sm-0,
-.gy-sm-0 {
+  .gy-sm-0 {
    --bs-gutter-y: 0;
  }
  .g-sm-1,
-.gx-sm-1 {
+  .gx-sm-1 {
    --bs-gutter-x: 0.25rem;
  }
  .g-sm-1,
-.gy-sm-1 {
+  .gy-sm-1 {
    --bs-gutter-y: 0.25rem;
  }
  .g-sm-2,
-.gx-sm-2 {
+  .gx-sm-2 {
    --bs-gutter-x: 0.5rem;
  }
  .g-sm-2,
-.gy-sm-2 {
+  .gy-sm-2 {
    --bs-gutter-y: 0.5rem;
  }
  .g-sm-3,
-.gx-sm-3 {
+  .gx-sm-3 {
    --bs-gutter-x: 1rem;
  }
  .g-sm-3,
-.gy-sm-3 {
+  .gy-sm-3 {
    --bs-gutter-y: 1rem;
  }
  .g-sm-4,
-.gx-sm-4 {
+  .gx-sm-4 {
    --bs-gutter-x: 1.5rem;
  }
  .g-sm-4,
-.gy-sm-4 {
+  .gy-sm-4 {
    --bs-gutter-y: 1.5rem;
  }
  .g-sm-5,
-.gx-sm-5 {
+  .gx-sm-5 {
    --bs-gutter-x: 3rem;
  }
  .g-sm-5,
-.gy-sm-5 {
+  .gy-sm-5 {
    --bs-gutter-y: 3rem;
  }
 }
@media (min-width: 768px) {
  .col-md {
-    flex: 1 0 0%;
+    flex: 1 0 0;
  }
  .row-cols-md-auto > * {
    flex: 0 0 auto;
@@ -528,7 +467,7 @@
  }
  .row-cols-md-3 > * {
    flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
  }
  .row-cols-md-4 > * {
    flex: 0 0 auto;
@@ -540,7 +479,7 @@
  }
  .row-cols-md-6 > * {
    flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
  }
  .col-md-auto {
    flex: 0 0 auto;
@@ -631,57 +570,57 @@
    margin-right: 91.66666667%;
  }
  .g-md-0,
-.gx-md-0 {
+  .gx-md-0 {
    --bs-gutter-x: 0;
  }
  .g-md-0,
-.gy-md-0 {
+  .gy-md-0 {
    --bs-gutter-y: 0;
  }
  .g-md-1,
-.gx-md-1 {
+  .gx-md-1 {
    --bs-gutter-x: 0.25rem;
  }
  .g-md-1,
-.gy-md-1 {
+  .gy-md-1 {
    --bs-gutter-y: 0.25rem;
  }
  .g-md-2,
-.gx-md-2 {
+  .gx-md-2 {
    --bs-gutter-x: 0.5rem;
  }
  .g-md-2,
-.gy-md-2 {
+  .gy-md-2 {
    --bs-gutter-y: 0.5rem;
  }
  .g-md-3,
-.gx-md-3 {
+  .gx-md-3 {
    --bs-gutter-x: 1rem;
  }
  .g-md-3,
-.gy-md-3 {
+  .gy-md-3 {
    --bs-gutter-y: 1rem;
  }
  .g-md-4,
-.gx-md-4 {
+  .gx-md-4 {
    --bs-gutter-x: 1.5rem;
  }
  .g-md-4,
-.gy-md-4 {
+  .gy-md-4 {
    --bs-gutter-y: 1.5rem;
  }
  .g-md-5,
-.gx-md-5 {
+  .gx-md-5 {
    --bs-gutter-x: 3rem;
  }
  .g-md-5,
-.gy-md-5 {
+  .gy-md-5 {
    --bs-gutter-y: 3rem;
  }
 }
@media (min-width: 992px) {
  .col-lg {
-    flex: 1 0 0%;
+    flex: 1 0 0;
  }
  .row-cols-lg-auto > * {
    flex: 0 0 auto;
@@ -697,7 +636,7 @@
  }
  .row-cols-lg-3 > * {
    flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
  }
  .row-cols-lg-4 > * {
    flex: 0 0 auto;
@@ -709,7 +648,7 @@
  }
  .row-cols-lg-6 > * {
    flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
  }
  .col-lg-auto {
    flex: 0 0 auto;
@@ -800,57 +739,57 @@
    margin-right: 91.66666667%;
  }
  .g-lg-0,
-.gx-lg-0 {
+  .gx-lg-0 {
    --bs-gutter-x: 0;
  }
  .g-lg-0,
-.gy-lg-0 {
+  .gy-lg-0 {
    --bs-gutter-y: 0;
  }
  .g-lg-1,
-.gx-lg-1 {
+  .gx-lg-1 {
    --bs-gutter-x: 0.25rem;
  }
  .g-lg-1,
-.gy-lg-1 {
+  .gy-lg-1 {
    --bs-gutter-y: 0.25rem;
  }
  .g-lg-2,
-.gx-lg-2 {
+  .gx-lg-2 {
    --bs-gutter-x: 0.5rem;
  }
  .g-lg-2,
-.gy-lg-2 {
+  .gy-lg-2 {
    --bs-gutter-y: 0.5rem;
  }
  .g-lg-3,
-.gx-lg-3 {
+  .gx-lg-3 {
    --bs-gutter-x: 1rem;
  }
  .g-lg-3,
-.gy-lg-3 {
+  .gy-lg-3 {
    --bs-gutter-y: 1rem;
  }
  .g-lg-4,
-.gx-lg-4 {
+  .gx-lg-4 {
    --bs-gutter-x: 1.5rem;
  }
  .g-lg-4,
-.gy-lg-4 {
+  .gy-lg-4 {
    --bs-gutter-y: 1.5rem;
  }
  .g-lg-5,
-.gx-lg-5 {
+  .gx-lg-5 {
    --bs-gutter-x: 3rem;
  }
  .g-lg-5,
-.gy-lg-5 {
+  .gy-lg-5 {
    --bs-gutter-y: 3rem;
  }
 }
@media (min-width: 1200px) {
  .col-xl {
-    flex: 1 0 0%;
+    flex: 1 0 0;
  }
  .row-cols-xl-auto > * {
    flex: 0 0 auto;
@@ -866,7 +805,7 @@
  }
  .row-cols-xl-3 > * {
    flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
  }
  .row-cols-xl-4 > * {
    flex: 0 0 auto;
@@ -878,7 +817,7 @@
  }
  .row-cols-xl-6 > * {
    flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
  }
  .col-xl-auto {
    flex: 0 0 auto;
@@ -969,57 +908,57 @@
    margin-right: 91.66666667%;
  }
  .g-xl-0,
-.gx-xl-0 {
+  .gx-xl-0 {
    --bs-gutter-x: 0;
  }
  .g-xl-0,
-.gy-xl-0 {
+  .gy-xl-0 {
    --bs-gutter-y: 0;
  }
  .g-xl-1,
-.gx-xl-1 {
+  .gx-xl-1 {
    --bs-gutter-x: 0.25rem;
  }
  .g-xl-1,
-.gy-xl-1 {
+  .gy-xl-1 {
    --bs-gutter-y: 0.25rem;
  }
  .g-xl-2,
-.gx-xl-2 {
+  .gx-xl-2 {
    --bs-gutter-x: 0.5rem;
  }
  .g-xl-2,
-.gy-xl-2 {
+  .gy-xl-2 {
    --bs-gutter-y: 0.5rem;
  }
  .g-xl-3,
-.gx-xl-3 {
+  .gx-xl-3 {
    --bs-gutter-x: 1rem;
  }
  .g-xl-3,
-.gy-xl-3 {
+  .gy-xl-3 {
    --bs-gutter-y: 1rem;
  }
  .g-xl-4,
-.gx-xl-4 {
+  .gx-xl-4 {
    --bs-gutter-x: 1.5rem;
  }
  .g-xl-4,
-.gy-xl-4 {
+  .gy-xl-4 {
    --bs-gutter-y: 1.5rem;
  }
  .g-xl-5,
-.gx-xl-5 {
+  .gx-xl-5 {
    --bs-gutter-x: 3rem;
  }
  .g-xl-5,
-.gy-xl-5 {
+  .gy-xl-5 {
    --bs-gutter-y: 3rem;
  }
 }
@media (min-width: 1400px) {
  .col-xxl {
-    flex: 1 0 0%;
+    flex: 1 0 0;
  }
  .row-cols-xxl-auto > * {
    flex: 0 0 auto;
@@ -1035,7 +974,7 @@
  }
  .row-cols-xxl-3 > * {
    flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
  }
  .row-cols-xxl-4 > * {
    flex: 0 0 auto;
@@ -1047,7 +986,7 @@
  }
  .row-cols-xxl-6 > * {
    flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
  }
  .col-xxl-auto {
    flex: 0 0 auto;
@@ -1138,51 +1077,51 @@
    margin-right: 91.66666667%;
  }
  .g-xxl-0,
-.gx-xxl-0 {
+  .gx-xxl-0 {
    --bs-gutter-x: 0;
  }
  .g-xxl-0,
-.gy-xxl-0 {
+  .gy-xxl-0 {
    --bs-gutter-y: 0;
  }
  .g-xxl-1,
-.gx-xxl-1 {
+  .gx-xxl-1 {
    --bs-gutter-x: 0.25rem;
  }
  .g-xxl-1,
-.gy-xxl-1 {
+  .gy-xxl-1 {
    --bs-gutter-y: 0.25rem;
  }
  .g-xxl-2,
-.gx-xxl-2 {
+  .gx-xxl-2 {
    --bs-gutter-x: 0.5rem;
  }
  .g-xxl-2,
-.gy-xxl-2 {
+  .gy-xxl-2 {
    --bs-gutter-y: 0.5rem;
  }
  .g-xxl-3,
-.gx-xxl-3 {
+  .gx-xxl-3 {
    --bs-gutter-x: 1rem;
  }
  .g-xxl-3,
-.gy-xxl-3 {
+  .gy-xxl-3 {
    --bs-gutter-y: 1rem;
  }
  .g-xxl-4,
-.gx-xxl-4 {
+  .gx-xxl-4 {
    --bs-gutter-x: 1.5rem;
  }
  .g-xxl-4,
-.gy-xxl-4 {
+  .gy-xxl-4 {
    --bs-gutter-y: 1.5rem;
  }
  .g-xxl-5,
-.gx-xxl-5 {
+  .gx-xxl-5 {
    --bs-gutter-x: 3rem;
  }
  .g-xxl-5,
-.gy-xxl-5 {
+  .gy-xxl-5 {
    --bs-gutter-y: 3rem;
  }
 }
@@ -1202,6 +1141,10 @@
  display: grid !important;
 }

+.d-inline-grid {
+  display: inline-grid !important;
+}
+
 .d-table {
  display: table !important;
 }
@@ -1801,6 +1744,9 @@
  .d-sm-grid {
    display: grid !important;
  }
+  .d-sm-inline-grid {
+    display: inline-grid !important;
+  }
  .d-sm-table {
    display: table !important;
  }
@@ -2261,6 +2207,9 @@
  .d-md-grid {
    display: grid !important;
  }
+  .d-md-inline-grid {
+    display: inline-grid !important;
+  }
  .d-md-table {
    display: table !important;
  }
@@ -2721,6 +2670,9 @@
  .d-lg-grid {
    display: grid !important;
  }
+  .d-lg-inline-grid {
+    display: inline-grid !important;
+  }
  .d-lg-table {
    display: table !important;
  }
@@ -3181,6 +3133,9 @@
  .d-xl-grid {
    display: grid !important;
  }
+  .d-xl-inline-grid {
+    display: inline-grid !important;
+  }
  .d-xl-table {
    display: table !important;
  }
@@ -3641,6 +3596,9 @@
  .d-xxl-grid {
    display: grid !important;
  }
+  .d-xxl-inline-grid {
+    display: inline-grid !important;
+  }
  .d-xxl-table {
    display: table !important;
  }
@@ -4101,6 +4059,9 @@
  .d-print-grid {
    display: grid !important;
  }
+  .d-print-inline-grid {
+    display: inline-grid !important;
+  }
  .d-print-table {
    display: table !important;
  }
@@ -1,10 +1,10 @@
 /*!
- * Bootstrap Reboot v5.2.3 (https://getbootstrap.com/)
- * Copyright 2011-2022 The Bootstrap Authors
- * Copyright 2011-2022 Twitter, Inc.
+ * Bootstrap Reboot v5.3.8 (https://getbootstrap.com/)
+ * Copyright 2011-2025 The Bootstrap Authors
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
 */
-:root {
+:root,
+[data-bs-theme=light] {
  --bs-blue: #0d6efd;
  --bs-indigo: #6610f2;
  --bs-purple: #6f42c1;
@@ -44,10 +44,32 @@
  --bs-danger-rgb: 220, 53, 69;
  --bs-light-rgb: 248, 249, 250;
  --bs-dark-rgb: 33, 37, 41;
+  --bs-primary-text-emphasis: #052c65;
+  --bs-secondary-text-emphasis: #2b2f32;
+  --bs-success-text-emphasis: #0a3622;
+  --bs-info-text-emphasis: #055160;
+  --bs-warning-text-emphasis: #664d03;
+  --bs-danger-text-emphasis: #58151c;
+  --bs-light-text-emphasis: #495057;
+  --bs-dark-text-emphasis: #495057;
+  --bs-primary-bg-subtle: #cfe2ff;
+  --bs-secondary-bg-subtle: #e2e3e5;
+  --bs-success-bg-subtle: #d1e7dd;
+  --bs-info-bg-subtle: #cff4fc;
+  --bs-warning-bg-subtle: #fff3cd;
+  --bs-danger-bg-subtle: #f8d7da;
+  --bs-light-bg-subtle: #fcfcfd;
+  --bs-dark-bg-subtle: #ced4da;
+  --bs-primary-border-subtle: #9ec5fe;
+  --bs-secondary-border-subtle: #c4c8cb;
+  --bs-success-border-subtle: #a3cfbb;
+  --bs-info-border-subtle: #9eeaf9;
+  --bs-warning-border-subtle: #ffe69c;
+  --bs-danger-border-subtle: #f1aeb5;
+  --bs-light-border-subtle: #e9ecef;
+  --bs-dark-border-subtle: #adb5bd;
  --bs-white-rgb: 255, 255, 255;
  --bs-black-rgb: 0, 0, 0;
-  --bs-body-color-rgb: 33, 37, 41;
-  --bs-body-bg-rgb: 255, 255, 255;
  --bs-font-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
  --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
  --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
@@ -56,7 +78,28 @@
  --bs-body-font-weight: 400;
  --bs-body-line-height: 1.5;
  --bs-body-color: #212529;
+  --bs-body-color-rgb: 33, 37, 41;
  --bs-body-bg: #fff;
+  --bs-body-bg-rgb: 255, 255, 255;
+  --bs-emphasis-color: #000;
+  --bs-emphasis-color-rgb: 0, 0, 0;
+  --bs-secondary-color: rgba(33, 37, 41, 0.75);
+  --bs-secondary-color-rgb: 33, 37, 41;
+  --bs-secondary-bg: #e9ecef;
+  --bs-secondary-bg-rgb: 233, 236, 239;
+  --bs-tertiary-color: rgba(33, 37, 41, 0.5);
+  --bs-tertiary-color-rgb: 33, 37, 41;
+  --bs-tertiary-bg: #f8f9fa;
+  --bs-tertiary-bg-rgb: 248, 249, 250;
+  --bs-heading-color: inherit;
+  --bs-link-color: #0d6efd;
+  --bs-link-color-rgb: 13, 110, 253;
+  --bs-link-decoration: underline;
+  --bs-link-hover-color: #0a58ca;
+  --bs-link-hover-color-rgb: 10, 88, 202;
+  --bs-code-color: #d63384;
+  --bs-highlight-color: #212529;
+  --bs-highlight-bg: #fff3cd;
  --bs-border-width: 1px;
  --bs-border-style: solid;
  --bs-border-color: #dee2e6;
@@ -65,12 +108,76 @@
  --bs-border-radius-sm: 0.25rem;
  --bs-border-radius-lg: 0.5rem;
  --bs-border-radius-xl: 1rem;
-  --bs-border-radius-2xl: 2rem;
+  --bs-border-radius-xxl: 2rem;
+  --bs-border-radius-2xl: var(--bs-border-radius-xxl);
  --bs-border-radius-pill: 50rem;
-  --bs-link-color: #0d6efd;
-  --bs-link-hover-color: #0a58ca;
-  --bs-code-color: #d63384;
-  --bs-highlight-bg: #fff3cd;
+  --bs-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+  --bs-box-shadow-sm: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+  --bs-box-shadow-lg: 0 1rem 3rem rgba(0, 0, 0, 0.175);
+  --bs-box-shadow-inset: inset 0 1px 2px rgba(0, 0, 0, 0.075);
+  --bs-focus-ring-width: 0.25rem;
+  --bs-focus-ring-opacity: 0.25;
+  --bs-focus-ring-color: rgba(13, 110, 253, 0.25);
+  --bs-form-valid-color: #198754;
+  --bs-form-valid-border-color: #198754;
+  --bs-form-invalid-color: #dc3545;
+  --bs-form-invalid-border-color: #dc3545;
+}
+
+[data-bs-theme=dark] {
+  color-scheme: dark;
+  --bs-body-color: #dee2e6;
+  --bs-body-color-rgb: 222, 226, 230;
+  --bs-body-bg: #212529;
+  --bs-body-bg-rgb: 33, 37, 41;
+  --bs-emphasis-color: #fff;
+  --bs-emphasis-color-rgb: 255, 255, 255;
+  --bs-secondary-color: rgba(222, 226, 230, 0.75);
+  --bs-secondary-color-rgb: 222, 226, 230;
+  --bs-secondary-bg: #343a40;
+  --bs-secondary-bg-rgb: 52, 58, 64;
+  --bs-tertiary-color: rgba(222, 226, 230, 0.5);
+  --bs-tertiary-color-rgb: 222, 226, 230;
+  --bs-tertiary-bg: #2b3035;
+  --bs-tertiary-bg-rgb: 43, 48, 53;
+  --bs-primary-text-emphasis: #6ea8fe;
+  --bs-secondary-text-emphasis: #a7acb1;
+  --bs-success-text-emphasis: #75b798;
+  --bs-info-text-emphasis: #6edff6;
+  --bs-warning-text-emphasis: #ffda6a;
+  --bs-danger-text-emphasis: #ea868f;
+  --bs-light-text-emphasis: #f8f9fa;
+  --bs-dark-text-emphasis: #dee2e6;
+  --bs-primary-bg-subtle: #031633;
+  --bs-secondary-bg-subtle: #161719;
+  --bs-success-bg-subtle: #051b11;
+  --bs-info-bg-subtle: #032830;
+  --bs-warning-bg-subtle: #332701;
+  --bs-danger-bg-subtle: #2c0b0e;
+  --bs-light-bg-subtle: #343a40;
+  --bs-dark-bg-subtle: #1a1d20;
+  --bs-primary-border-subtle: #084298;
+  --bs-secondary-border-subtle: #41464b;
+  --bs-success-border-subtle: #0f5132;
+  --bs-info-border-subtle: #087990;
+  --bs-warning-border-subtle: #997404;
+  --bs-danger-border-subtle: #842029;
+  --bs-light-border-subtle: #495057;
+  --bs-dark-border-subtle: #343a40;
+  --bs-heading-color: inherit;
+  --bs-link-color: #6ea8fe;
+  --bs-link-hover-color: #8bb9fe;
+  --bs-link-color-rgb: 110, 168, 254;
+  --bs-link-hover-color-rgb: 139, 185, 254;
+  --bs-code-color: #e685b5;
+  --bs-highlight-color: #dee2e6;
+  --bs-highlight-bg: #664d03;
+  --bs-border-color: #495057;
+  --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
+  --bs-form-valid-color: #75b798;
+  --bs-form-valid-border-color: #75b798;
+  --bs-form-invalid-color: #ea868f;
+  --bs-form-invalid-border-color: #ea868f;
 }

 *,
@@ -102,7 +209,7 @@ hr {
  margin: 1rem 0;
  color: inherit;
  border: 0;
-  border-top: 1px solid;
+  border-top: var(--bs-border-width) solid;
  opacity: 0.25;
 }

@@ -111,6 +218,7 @@ h6, h5, h4, h3, h2, h1 {
  margin-bottom: 0.5rem;
  font-weight: 500;
  line-height: 1.2;
+  color: var(--bs-heading-color);
 }

 h1 {
@@ -219,6 +327,7 @@ small {

 mark {
  padding: 0.1875em;
+  color: var(--bs-highlight-color);
  background-color: var(--bs-highlight-bg);
 }

@@ -239,11 +348,11 @@ sup {
 }

 a {
-  color: var(--bs-link-color);
+  color: rgba(var(--bs-link-color-rgb), var(--bs-link-opacity, 1));
  text-decoration: underline;
 }
 a:hover {
-  color: var(--bs-link-hover-color);
+  --bs-link-color-rgb: var(--bs-link-hover-color-rgb);
 }

 a:not([href]):not([class]), a:not([href]):not([class]):hover {
@@ -310,7 +419,7 @@ table {
 caption {
  padding-top: 0.5rem;
  padding-bottom: 0.5rem;
-  color: #6c757d;
+  color: var(--bs-secondary-color);
  text-align: left;
 }

@@ -407,8 +516,8 @@ legend {
  width: 100%;
  padding: 0;
  margin-bottom: 0.5rem;
-  font-size: calc(1.275rem + 0.3vw);
  line-height: inherit;
+  font-size: calc(1.275rem + 0.3vw);
 }
@media (min-width: 1200px) {
  legend {
@@ -434,8 +543,12 @@ legend + * {
 }

 [type=search] {
-  outline-offset: -2px;
  -webkit-appearance: textfield;
+  outline-offset: -2px;
+}
+[type=search]::-webkit-search-cancel-button {
+  cursor: pointer;
+  filter: grayscale(1);
 }

 /* rtl:raw:
@@ -1,10 +1,10 @@
 /*!
- * Bootstrap Reboot v5.2.3 (https://getbootstrap.com/)
- * Copyright 2011-2022 The Bootstrap Authors
- * Copyright 2011-2022 Twitter, Inc.
+ * Bootstrap Reboot v5.3.8 (https://getbootstrap.com/)
+ * Copyright 2011-2025 The Bootstrap Authors
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
 */
-:root {
+:root,
+[data-bs-theme=light] {
  --bs-blue: #0d6efd;
  --bs-indigo: #6610f2;
  --bs-purple: #6f42c1;
@@ -44,10 +44,32 @@
  --bs-danger-rgb: 220, 53, 69;
  --bs-light-rgb: 248, 249, 250;
  --bs-dark-rgb: 33, 37, 41;
+  --bs-primary-text-emphasis: #052c65;
+  --bs-secondary-text-emphasis: #2b2f32;
+  --bs-success-text-emphasis: #0a3622;
+  --bs-info-text-emphasis: #055160;
+  --bs-warning-text-emphasis: #664d03;
+  --bs-danger-text-emphasis: #58151c;
+  --bs-light-text-emphasis: #495057;
+  --bs-dark-text-emphasis: #495057;
+  --bs-primary-bg-subtle: #cfe2ff;
+  --bs-secondary-bg-subtle: #e2e3e5;
+  --bs-success-bg-subtle: #d1e7dd;
+  --bs-info-bg-subtle: #cff4fc;
+  --bs-warning-bg-subtle: #fff3cd;
+  --bs-danger-bg-subtle: #f8d7da;
+  --bs-light-bg-subtle: #fcfcfd;
+  --bs-dark-bg-subtle: #ced4da;
+  --bs-primary-border-subtle: #9ec5fe;
+  --bs-secondary-border-subtle: #c4c8cb;
+  --bs-success-border-subtle: #a3cfbb;
+  --bs-info-border-subtle: #9eeaf9;
+  --bs-warning-border-subtle: #ffe69c;
+  --bs-danger-border-subtle: #f1aeb5;
+  --bs-light-border-subtle: #e9ecef;
+  --bs-dark-border-subtle: #adb5bd;
  --bs-white-rgb: 255, 255, 255;
  --bs-black-rgb: 0, 0, 0;
-  --bs-body-color-rgb: 33, 37, 41;
-  --bs-body-bg-rgb: 255, 255, 255;
  --bs-font-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
  --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
  --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
@@ -56,7 +78,28 @@
  --bs-body-font-weight: 400;
  --bs-body-line-height: 1.5;
  --bs-body-color: #212529;
+  --bs-body-color-rgb: 33, 37, 41;
  --bs-body-bg: #fff;
+  --bs-body-bg-rgb: 255, 255, 255;
+  --bs-emphasis-color: #000;
+  --bs-emphasis-color-rgb: 0, 0, 0;
+  --bs-secondary-color: rgba(33, 37, 41, 0.75);
+  --bs-secondary-color-rgb: 33, 37, 41;
+  --bs-secondary-bg: #e9ecef;
+  --bs-secondary-bg-rgb: 233, 236, 239;
+  --bs-tertiary-color: rgba(33, 37, 41, 0.5);
+  --bs-tertiary-color-rgb: 33, 37, 41;
+  --bs-tertiary-bg: #f8f9fa;
+  --bs-tertiary-bg-rgb: 248, 249, 250;
+  --bs-heading-color: inherit;
+  --bs-link-color: #0d6efd;
+  --bs-link-color-rgb: 13, 110, 253;
+  --bs-link-decoration: underline;
+  --bs-link-hover-color: #0a58ca;
+  --bs-link-hover-color-rgb: 10, 88, 202;
+  --bs-code-color: #d63384;
+  --bs-highlight-color: #212529;
+  --bs-highlight-bg: #fff3cd;
  --bs-border-width: 1px;
  --bs-border-style: solid;
  --bs-border-color: #dee2e6;
@@ -65,12 +108,76 @@
  --bs-border-radius-sm: 0.25rem;
  --bs-border-radius-lg: 0.5rem;
  --bs-border-radius-xl: 1rem;
-  --bs-border-radius-2xl: 2rem;
+  --bs-border-radius-xxl: 2rem;
+  --bs-border-radius-2xl: var(--bs-border-radius-xxl);
  --bs-border-radius-pill: 50rem;
-  --bs-link-color: #0d6efd;
-  --bs-link-hover-color: #0a58ca;
-  --bs-code-color: #d63384;
-  --bs-highlight-bg: #fff3cd;
+  --bs-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+  --bs-box-shadow-sm: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+  --bs-box-shadow-lg: 0 1rem 3rem rgba(0, 0, 0, 0.175);
+  --bs-box-shadow-inset: inset 0 1px 2px rgba(0, 0, 0, 0.075);
+  --bs-focus-ring-width: 0.25rem;
+  --bs-focus-ring-opacity: 0.25;
+  --bs-focus-ring-color: rgba(13, 110, 253, 0.25);
+  --bs-form-valid-color: #198754;
+  --bs-form-valid-border-color: #198754;
+  --bs-form-invalid-color: #dc3545;
+  --bs-form-invalid-border-color: #dc3545;
+}
+
+[data-bs-theme=dark] {
+  color-scheme: dark;
+  --bs-body-color: #dee2e6;
+  --bs-body-color-rgb: 222, 226, 230;
+  --bs-body-bg: #212529;
+  --bs-body-bg-rgb: 33, 37, 41;
+  --bs-emphasis-color: #fff;
+  --bs-emphasis-color-rgb: 255, 255, 255;
+  --bs-secondary-color: rgba(222, 226, 230, 0.75);
+  --bs-secondary-color-rgb: 222, 226, 230;
+  --bs-secondary-bg: #343a40;
+  --bs-secondary-bg-rgb: 52, 58, 64;
+  --bs-tertiary-color: rgba(222, 226, 230, 0.5);
+  --bs-tertiary-color-rgb: 222, 226, 230;
+  --bs-tertiary-bg: #2b3035;
+  --bs-tertiary-bg-rgb: 43, 48, 53;
+  --bs-primary-text-emphasis: #6ea8fe;
+  --bs-secondary-text-emphasis: #a7acb1;
+  --bs-success-text-emphasis: #75b798;
+  --bs-info-text-emphasis: #6edff6;
+  --bs-warning-text-emphasis: #ffda6a;
+  --bs-danger-text-emphasis: #ea868f;
+  --bs-light-text-emphasis: #f8f9fa;
+  --bs-dark-text-emphasis: #dee2e6;
+  --bs-primary-bg-subtle: #031633;
+  --bs-secondary-bg-subtle: #161719;
+  --bs-success-bg-subtle: #051b11;
+  --bs-info-bg-subtle: #032830;
+  --bs-warning-bg-subtle: #332701;
+  --bs-danger-bg-subtle: #2c0b0e;
+  --bs-light-bg-subtle: #343a40;
+  --bs-dark-bg-subtle: #1a1d20;
+  --bs-primary-border-subtle: #084298;
+  --bs-secondary-border-subtle: #41464b;
+  --bs-success-border-subtle: #0f5132;
+  --bs-info-border-subtle: #087990;
+  --bs-warning-border-subtle: #997404;
+  --bs-danger-border-subtle: #842029;
+  --bs-light-border-subtle: #495057;
+  --bs-dark-border-subtle: #343a40;
+  --bs-heading-color: inherit;
+  --bs-link-color: #6ea8fe;
+  --bs-link-hover-color: #8bb9fe;
+  --bs-link-color-rgb: 110, 168, 254;
+  --bs-link-hover-color-rgb: 139, 185, 254;
+  --bs-code-color: #e685b5;
+  --bs-highlight-color: #dee2e6;
+  --bs-highlight-bg: #664d03;
+  --bs-border-color: #495057;
+  --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
+  --bs-form-valid-color: #75b798;
+  --bs-form-valid-border-color: #75b798;
+  --bs-form-invalid-color: #ea868f;
+  --bs-form-invalid-border-color: #ea868f;
 }

 *,
@@ -102,7 +209,7 @@ hr {
  margin: 1rem 0;
  color: inherit;
  border: 0;
-  border-top: 1px solid;
+  border-top: var(--bs-border-width) solid;
  opacity: 0.25;
 }

@@ -111,6 +218,7 @@ h6, h5, h4, h3, h2, h1 {
  margin-bottom: 0.5rem;
  font-weight: 500;
  line-height: 1.2;
+  color: var(--bs-heading-color);
 }

 h1 {
@@ -219,6 +327,7 @@ small {

 mark {
  padding: 0.1875em;
+  color: var(--bs-highlight-color);
  background-color: var(--bs-highlight-bg);
 }

@@ -239,11 +348,11 @@ sup {
 }

 a {
-  color: var(--bs-link-color);
+  color: rgba(var(--bs-link-color-rgb), var(--bs-link-opacity, 1));
  text-decoration: underline;
 }
 a:hover {
-  color: var(--bs-link-hover-color);
+  --bs-link-color-rgb: var(--bs-link-hover-color-rgb);
 }

 a:not([href]):not([class]), a:not([href]):not([class]):hover {
@@ -310,7 +419,7 @@ table {
 caption {
  padding-top: 0.5rem;
  padding-bottom: 0.5rem;
-  color: #6c757d;
+  color: var(--bs-secondary-color);
  text-align: right;
 }

@@ -407,8 +516,8 @@ legend {
  width: 100%;
  padding: 0;
  margin-bottom: 0.5rem;
-  font-size: calc(1.275rem + 0.3vw);
  line-height: inherit;
+  font-size: calc(1.275rem + 0.3vw);
 }
@media (min-width: 1200px) {
  legend {
@@ -434,8 +543,12 @@ legend + * {
 }

 [type=search] {
-  outline-offset: -2px;
  -webkit-appearance: textfield;
+  outline-offset: -2px;
+}
+[type=search]::-webkit-search-cancel-button {
+  cursor: pointer;
+  filter: grayscale(1);
 }

 [type="tel"],
@@ -20,7 +20,6 @@
  --#{$prefix}accordion-btn-icon-transform: #{$accordion-icon-transform};
  --#{$prefix}accordion-btn-icon-transition: #{$accordion-icon-transition};
  --#{$prefix}accordion-btn-active-icon: #{escape-svg($accordion-button-active-icon)};
-  --#{$prefix}accordion-btn-focus-border-color: #{$accordion-button-focus-border-color};
  --#{$prefix}accordion-btn-focus-box-shadow: #{$accordion-button-focus-box-shadow};
  --#{$prefix}accordion-body-padding-x: #{$accordion-body-padding-x};
  --#{$prefix}accordion-body-padding-y: #{$accordion-body-padding-y};
@@ -74,7 +73,6 @@

  &:focus {
    z-index: 3;
-    border-color: var(--#{$prefix}accordion-btn-focus-border-color);
    outline: 0;
    box-shadow: var(--#{$prefix}accordion-btn-focus-box-shadow);
  }
@@ -92,7 +90,7 @@
  &:first-of-type {
    @include border-top-radius(var(--#{$prefix}accordion-border-radius));

-    .accordion-button {
+    > .accordion-header .accordion-button {
      @include border-top-radius(var(--#{$prefix}accordion-inner-border-radius));
    }
  }
@@ -105,13 +103,13 @@
  &:last-of-type {
    @include border-bottom-radius(var(--#{$prefix}accordion-border-radius));

-    .accordion-button {
+    > .accordion-header .accordion-button {
      &.collapsed {
        @include border-bottom-radius(var(--#{$prefix}accordion-inner-border-radius));
      }
    }

-    .accordion-collapse {
+    > .accordion-collapse {
      @include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
    }
  }
@@ -127,11 +125,7 @@
 // Remove borders and border-radius to keep accordion items edge-to-edge.

 .accordion-flush {
-  .accordion-collapse {
-    border-width: 0;
-  }
-
-  .accordion-item {
+  > .accordion-item {
    border-right: 0;
    border-left: 0;
    @include border-radius(0);
@@ -139,11 +133,21 @@
    &:first-child { border-top: 0; }
    &:last-child { border-bottom: 0; }

-    .accordion-button {
-      &,
-      &.collapsed {
-        @include border-radius(0);
-      }
+    // stylelint-disable selector-max-class
+    > .accordion-collapse,
+    > .accordion-header .accordion-button,
+    > .accordion-header .accordion-button.collapsed {
+      @include border-radius(0);
+    }
+    // stylelint-enable selector-max-class
+  }
+}
+
+@if $enable-dark-mode {
+  @include color-mode(dark) {
+    .accordion-button::after {
+      --#{$prefix}accordion-btn-icon: #{escape-svg($accordion-button-icon-dark)};
+      --#{$prefix}accordion-btn-active-icon: #{escape-svg($accordion-button-active-icon-dark)};
    }
  }
 }
@@ -12,6 +12,7 @@
  --#{$prefix}alert-border-color: transparent;
  --#{$prefix}alert-border: #{$alert-border-width} solid var(--#{$prefix}alert-border-color);
  --#{$prefix}alert-border-radius: #{$alert-border-radius};
+  --#{$prefix}alert-link-color: inherit;
  // scss-docs-end alert-css-vars

  position: relative;
@@ -32,6 +33,7 @@
 // Provide class for links that match alerts
 .alert-link {
  font-weight: $alert-link-font-weight;
+  color: var(--#{$prefix}alert-link-color);
 }


@@ -54,18 +56,13 @@


 // scss-docs-start alert-modifiers
-// Generate contextual modifier classes for colorizing the alert.
-
-@each $state, $value in $theme-colors {
-  $alert-background: shift-color($value, $alert-bg-scale);
-  $alert-border: shift-color($value, $alert-border-scale);
-  $alert-color: shift-color($value, $alert-color-scale);
-
-  @if (contrast-ratio($alert-background, $alert-color) < $min-contrast-ratio) {
-    $alert-color: mix($value, color-contrast($alert-background), abs($alert-color-scale));
-  }
+// Generate contextual modifier classes for colorizing the alert
+@each $state in map-keys($theme-colors) {
  .alert-#{$state} {
-    @include alert-variant($alert-background, $alert-border, $alert-color);
+    --#{$prefix}alert-color: var(--#{$prefix}#{$state}-text-emphasis);
+    --#{$prefix}alert-bg: var(--#{$prefix}#{$state}-bg-subtle);
+    --#{$prefix}alert-border-color: var(--#{$prefix}#{$state}-border-subtle);
+    --#{$prefix}alert-link-color: var(--#{$prefix}#{$state}-text-emphasis);
  }
 }
 // scss-docs-end alert-modifiers
@@ -39,7 +39,7 @@
  // Prevent double borders when buttons are next to each other
  > :not(.btn-check:first-child) + .btn,
  > .btn-group:not(:first-child) {
-    margin-left: -$btn-border-width;
+    margin-left: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list
  }

  // Reset rounded corners
@@ -126,7 +126,7 @@

  > .btn:not(:first-child),
  > .btn-group:not(:first-child) {
-    margin-top: -$btn-border-width;
+    margin-top: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list
  }

  // Reset rounded corners
@@ -135,7 +135,12 @@
    @include border-bottom-radius(0);
  }

-  > .btn ~ .btn,
+  // The top radius should be 0 if the button is:
+  // - the "third or more" child
+  // - the second child and the previous element isn't `.btn-check` (making it the first child visually)
+  // - part of a btn-group which isn't the first child
+  > .btn:nth-child(n + 3),
+  > :not(.btn-check) + .btn,
  > .btn-group:not(:first-child) > .btn {
    @include border-top-radius(0);
  }
@@ -10,7 +10,7 @@
  @include rfs($btn-font-size, --#{$prefix}btn-font-size);
  --#{$prefix}btn-font-weight: #{$btn-font-weight};
  --#{$prefix}btn-line-height: #{$btn-line-height};
-  --#{$prefix}btn-color: #{$body-color};
+  --#{$prefix}btn-color: #{$btn-color};
  --#{$prefix}btn-bg: transparent;
  --#{$prefix}btn-border-width: #{$btn-border-width};
  --#{$prefix}btn-border-color: transparent;
@@ -100,6 +100,15 @@
    }
  }

+  .btn-check:checked:focus-visible + & {
+    // Avoid using mixin so we can pass custom focus shadow properly
+    @if $enable-shadows {
+      box-shadow: var(--#{$prefix}btn-active-shadow), var(--#{$prefix}btn-focus-box-shadow);
+    } @else {
+      box-shadow: var(--#{$prefix}btn-focus-box-shadow);
+    }
+  }
+
  &:disabled,
  &.disabled,
  fieldset:disabled & {
@@ -169,8 +178,8 @@
  --#{$prefix}btn-active-border-color: transparent;
  --#{$prefix}btn-disabled-color: #{$btn-link-disabled-color};
  --#{$prefix}btn-disabled-border-color: transparent;
-  --#{$prefix}btn-box-shadow: none;
-  --#{$prefix}btn-focus-shadow-rgb: #{to-rgb(mix(color-contrast($primary), $primary, 15%))};
+  --#{$prefix}btn-box-shadow: 0 0 0 #000; // Can't use `none` as keyword negates all values when used with multiple shadows
+  --#{$prefix}btn-focus-shadow-rgb: #{$btn-link-focus-shadow-rgb};

  text-decoration: $link-decoration;
  @if $enable-gradients {
@@ -7,6 +7,8 @@
  --#{$prefix}card-spacer-y: #{$card-spacer-y};
  --#{$prefix}card-spacer-x: #{$card-spacer-x};
  --#{$prefix}card-title-spacer-y: #{$card-title-spacer-y};
+  --#{$prefix}card-title-color: #{$card-title-color};
+  --#{$prefix}card-subtitle-color: #{$card-subtitle-color};
  --#{$prefix}card-border-width: #{$card-border-width};
  --#{$prefix}card-border-color: #{$card-border-color};
  --#{$prefix}card-border-radius: #{$card-border-radius};
@@ -28,6 +30,7 @@
  flex-direction: column;
  min-width: 0; // See https://github.com/twbs/bootstrap/pull/22740#issuecomment-305868106
  height: var(--#{$prefix}card-height);
+  color: var(--#{$prefix}body-color);
  word-wrap: break-word;
  background-color: var(--#{$prefix}card-bg);
  background-clip: border-box;
@@ -73,11 +76,13 @@

 .card-title {
  margin-bottom: var(--#{$prefix}card-title-spacer-y);
+  color: var(--#{$prefix}card-title-color);
 }

 .card-subtitle {
  margin-top: calc(-.5 * var(--#{$prefix}card-title-spacer-y)); // stylelint-disable-line function-disallowed-list
  margin-bottom: 0;
+  color: var(--#{$prefix}card-subtitle-color);
 }

 .card-text:last-child {
@@ -188,8 +193,7 @@
    // The child selector allows nested `.card` within `.card-group`
    // to display properly.
    > .card {
-      // Flexbugs #4: https://github.com/philipwalton/flexbugs#flexbug-4
-      flex: 1 0 0%;
+      flex: 1 0 0;
      margin-bottom: 0;

      + .card {
@@ -202,13 +206,13 @@
        &:not(:last-child) {
          @include border-end-radius(0);

-          .card-img-top,
-          .card-header {
+          > .card-img-top,
+          > .card-header {
            // stylelint-disable-next-line property-disallowed-list
            border-top-right-radius: 0;
          }
-          .card-img-bottom,
-          .card-footer {
+          > .card-img-bottom,
+          > .card-footer {
            // stylelint-disable-next-line property-disallowed-list
            border-bottom-right-radius: 0;
          }
@@ -217,13 +221,13 @@
        &:not(:first-child) {
          @include border-start-radius(0);

-          .card-img-top,
-          .card-header {
+          > .card-img-top,
+          > .card-header {
            // stylelint-disable-next-line property-disallowed-list
            border-top-left-radius: 0;
          }
-          .card-img-bottom,
-          .card-footer {
+          > .card-img-bottom,
+          > .card-footer {
            // stylelint-disable-next-line property-disallowed-list
            border-bottom-left-radius: 0;
          }
@@ -99,6 +99,7 @@
  color: $carousel-control-color;
  text-align: center;
  background: none;
+  filter: var(--#{$prefix}carousel-control-icon-filter);
  border: 0;
  opacity: $carousel-control-opacity;
  @include transition($carousel-control-transition);
@@ -132,19 +133,11 @@
  background-size: 100% 100%;
 }

-/* rtl:options: {
-  "autoRename": true,
-  "stringMap":[ {
-    "name"    : "prev-next",
-    "search"  : "prev",
-    "replace" : "next"
-  } ]
-} */
 .carousel-control-prev-icon {
-  background-image: escape-svg($carousel-control-prev-icon-bg);
+  background-image: escape-svg($carousel-control-prev-icon-bg) #{"/*rtl:" + escape-svg($carousel-control-next-icon-bg) + "*/"};
 }
 .carousel-control-next-icon {
-  background-image: escape-svg($carousel-control-next-icon-bg);
+  background-image: escape-svg($carousel-control-next-icon-bg) #{"/*rtl:" + escape-svg($carousel-control-prev-icon-bg) + "*/"};
 }

 // Optional indicator pips/controls
@@ -165,7 +158,6 @@
  margin-right: $carousel-control-width;
  margin-bottom: 1rem;
  margin-left: $carousel-control-width;
-  list-style: none;

  [data-bs-target] {
    box-sizing: content-box;
@@ -177,7 +169,7 @@
    margin-left: $carousel-indicator-spacer;
    text-indent: -999px;
    cursor: pointer;
-    background-color: $carousel-indicator-active-bg;
+    background-color: var(--#{$prefix}carousel-indicator-active-bg);
    background-clip: padding-box;
    border: 0;
    // Use transparent borders to increase the hit area by 10px on top and bottom.
@@ -204,23 +196,31 @@
  left: (100% - $carousel-caption-width) * .5;
  padding-top: $carousel-caption-padding-y;
  padding-bottom: $carousel-caption-padding-y;
-  color: $carousel-caption-color;
+  color: var(--#{$prefix}carousel-caption-color);
  text-align: center;
 }

 // Dark mode carousel

+@mixin carousel-dark() {
+  --#{$prefix}carousel-indicator-active-bg: #{$carousel-indicator-active-bg-dark};
+  --#{$prefix}carousel-caption-color: #{$carousel-caption-color-dark};
+  --#{$prefix}carousel-control-icon-filter: #{$carousel-control-icon-filter-dark};
+}
+
 .carousel-dark {
-  .carousel-control-prev-icon,
-  .carousel-control-next-icon {
-    filter: $carousel-dark-control-icon-filter;
-  }
+  @include carousel-dark();
+}

-  .carousel-indicators [data-bs-target] {
-    background-color: $carousel-dark-indicator-active-bg;
-  }
+:root,
+[data-bs-theme="light"] {
+  --#{$prefix}carousel-indicator-active-bg: #{$carousel-indicator-active-bg};
+  --#{$prefix}carousel-caption-color: #{$carousel-caption-color};
+  --#{$prefix}carousel-control-icon-filter: #{$carousel-control-icon-filter};
+}

-  .carousel-caption {
-    color: $carousel-dark-caption-color;
+@if $enable-dark-mode {
+  @include color-mode(dark, true) {
+    @include carousel-dark();
  }
 }
@@ -4,37 +4,63 @@
 // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile

 .btn-close {
+  // scss-docs-start close-css-vars
+  --#{$prefix}btn-close-color: #{$btn-close-color};
+  --#{$prefix}btn-close-bg: #{ escape-svg($btn-close-bg) };
+  --#{$prefix}btn-close-opacity: #{$btn-close-opacity};
+  --#{$prefix}btn-close-hover-opacity: #{$btn-close-hover-opacity};
+  --#{$prefix}btn-close-focus-shadow: #{$btn-close-focus-shadow};
+  --#{$prefix}btn-close-focus-opacity: #{$btn-close-focus-opacity};
+  --#{$prefix}btn-close-disabled-opacity: #{$btn-close-disabled-opacity};
+  // scss-docs-end close-css-vars
+
  box-sizing: content-box;
  width: $btn-close-width;
  height: $btn-close-height;
  padding: $btn-close-padding-y $btn-close-padding-x;
-  color: $btn-close-color;
-  background: transparent escape-svg($btn-close-bg) center / $btn-close-width auto no-repeat; // include transparent for button elements
+  color: var(--#{$prefix}btn-close-color);
+  background: transparent var(--#{$prefix}btn-close-bg) center / $btn-close-width auto no-repeat; // include transparent for button elements
+  filter: var(--#{$prefix}btn-close-filter);
  border: 0; // for button elements
  @include border-radius();
-  opacity: $btn-close-opacity;
+  opacity: var(--#{$prefix}btn-close-opacity);

  // Override <a>'s hover style
  &:hover {
-    color: $btn-close-color;
+    color: var(--#{$prefix}btn-close-color);
    text-decoration: none;
-    opacity: $btn-close-hover-opacity;
+    opacity: var(--#{$prefix}btn-close-hover-opacity);
  }

  &:focus {
    outline: 0;
-    box-shadow: $btn-close-focus-shadow;
-    opacity: $btn-close-focus-opacity;
+    box-shadow: var(--#{$prefix}btn-close-focus-shadow);
+    opacity: var(--#{$prefix}btn-close-focus-opacity);
  }

  &:disabled,
  &.disabled {
    pointer-events: none;
    user-select: none;
-    opacity: $btn-close-disabled-opacity;
+    opacity: var(--#{$prefix}btn-close-disabled-opacity);
  }
 }

-.btn-close-white {
-  filter: $btn-close-white-filter;
+@mixin btn-close-white() {
+  --#{$prefix}btn-close-filter: #{$btn-close-filter-dark};
+}
+
+.btn-close-white {
+  @include btn-close-white();
+}
+
+:root,
+[data-bs-theme="light"] {
+  --#{$prefix}btn-close-filter: #{$btn-close-filter};
+}
+
+@if $enable-dark-mode {
+  @include color-mode(dark, true) {
+    @include btn-close-white();
+  }
 }
@@ -184,6 +184,7 @@
  white-space: nowrap; // prevent links from randomly breaking onto new lines
  background-color: transparent; // For `<button>`s
  border: 0; // For `<button>`s
+  @include border-radius(var(--#{$prefix}dropdown-item-border-radius, 0));

  &:hover,
  &:focus {
@@ -157,7 +157,7 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003

  @each $color in $foregrounds {
    $contrast-ratio: contrast-ratio($background, $color);
-    @if $contrast-ratio > $min-contrast-ratio {
+    @if $contrast-ratio >= $min-contrast-ratio {
      @return $color;
    } @else if $contrast-ratio > $max-ratio {
      $max-ratio: $contrast-ratio;
@@ -177,7 +177,7 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
  @return if($l1 > $l2, divide($l1 + .05, $l2 + .05), divide($l2 + .05, $l1 + .05));
 }

-// Return WCAG2.1 relative luminance
+// Return WCAG2.2 relative luminance
 // See https://www.w3.org/TR/WCAG/#dfn-relative-luminance
 // See https://www.w3.org/TR/WCAG/#dfn-contrast-ratio
@function luminance($color) {
@@ -188,7 +188,7 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
  );

  @each $name, $value in $rgb {
-    $value: if(divide($value, 255) < .03928, divide(divide($value, 255), 12.92), nth($_luminance-list, $value + 1));
+    $value: if(divide($value, 255) < .04045, divide(divide($value, 255), 12.92), nth($_luminance-list, $value + 1));
    $rgb: map-merge($rgb, ($name: $value));
  }

@@ -2,6 +2,12 @@
 //
 // Rows contain your columns.

+:root {
+  @each $name, $value in $grid-breakpoints {
+    --#{$prefix}breakpoint-#{$name}: #{$value};
+  }
+}
+
@if $enable-grid-classes {
  .row {
    @include make-row();
@@ -1,6 +1,8 @@
@import "helpers/clearfix";
@import "helpers/color-bg";
@import "helpers/colored-links";
+@import "helpers/focus-ring";
+@import "helpers/icon-link";
@import "helpers/ratio";
@import "helpers/position";
@import "helpers/stacks";
@@ -43,31 +43,6 @@
  }
 }

-// Interactive list items
-//
-// Use anchor or button elements instead of `li`s or `div`s to create interactive
-// list items. Includes an extra `.active` modifier class for selected items.
-
-.list-group-item-action {
-  width: 100%; // For `<button>`s (anchors become 100% by default though)
-  color: var(--#{$prefix}list-group-action-color);
-  text-align: inherit; // For `<button>`s (anchors inherit)
-
-  // Hover state
-  &:hover,
-  &:focus {
-    z-index: 1; // Place hover/focus items above their siblings for proper border styling
-    color: var(--#{$prefix}list-group-action-hover-color);
-    text-decoration: none;
-    background-color: var(--#{$prefix}list-group-action-hover-bg);
-  }
-
-  &:active {
-    color: var(--#{$prefix}list-group-action-active-color);
-    background-color: var(--#{$prefix}list-group-action-active-bg);
-  }
-}
-
 // Individual list items
 //
 // Use on `li`s or `div`s within the `.list-group` parent.
@@ -115,6 +90,33 @@
  }
 }

+// Interactive list items
+//
+// Use anchor or button elements instead of `li`s or `div`s to create interactive
+// list items. Includes an extra `.active` modifier class for selected items.
+
+.list-group-item-action {
+  width: 100%; // For `<button>`s (anchors become 100% by default though)
+  color: var(--#{$prefix}list-group-action-color);
+  text-align: inherit; // For `<button>`s (anchors inherit)
+
+  &:not(.active) {
+    // Hover state
+    &:hover,
+    &:focus {
+      z-index: 1; // Place hover/focus items above their siblings for proper border styling
+      color: var(--#{$prefix}list-group-action-hover-color);
+      text-decoration: none;
+      background-color: var(--#{$prefix}list-group-action-hover-bg);
+    }
+
+    &:active {
+      color: var(--#{$prefix}list-group-action-active-color);
+      background-color: var(--#{$prefix}list-group-action-active-bg);
+    }
+  }
+}
+
 // Horizontal
 //
 // Change the layout of list group items from vertical (default) to horizontal.
@@ -180,13 +182,18 @@
 // Add modifier classes to change text and background color on individual items.
 // Organizationally, this must come after the `:hover` states.

-@each $state, $value in $theme-colors {
-  $list-group-variant-bg: shift-color($value, $list-group-item-bg-scale);
-  $list-group-variant-color: shift-color($value, $list-group-item-color-scale);
-  @if (contrast-ratio($list-group-variant-bg, $list-group-variant-color) < $min-contrast-ratio) {
-    $list-group-variant-color: mix($value, color-contrast($list-group-variant-bg), abs($list-group-item-color-scale));
+@each $state in map-keys($theme-colors) {
+  .list-group-item-#{$state} {
+    --#{$prefix}list-group-color: var(--#{$prefix}#{$state}-text-emphasis);
+    --#{$prefix}list-group-bg: var(--#{$prefix}#{$state}-bg-subtle);
+    --#{$prefix}list-group-border-color: var(--#{$prefix}#{$state}-border-subtle);
+    --#{$prefix}list-group-action-hover-color: var(--#{$prefix}emphasis-color);
+    --#{$prefix}list-group-action-hover-bg: var(--#{$prefix}#{$state}-border-subtle);
+    --#{$prefix}list-group-action-active-color: var(--#{$prefix}emphasis-color);
+    --#{$prefix}list-group-action-active-bg: var(--#{$prefix}#{$state}-border-subtle);
+    --#{$prefix}list-group-active-color: var(--#{$prefix}#{$state}-bg-subtle);
+    --#{$prefix}list-group-active-bg: var(--#{$prefix}#{$state}-text-emphasis);
+    --#{$prefix}list-group-active-border-color: var(--#{$prefix}#{$state}-text-emphasis);
  }
-
-  @include list-group-item-variant($state, $list-group-variant-bg, $list-group-variant-color);
 }
 // scss-docs-end list-group-modifiers
@@ -6,6 +6,90 @@
 $theme-colors-rgb: map-loop($theme-colors, to-rgb, "$value") !default;
 // scss-docs-end theme-colors-rgb

+// scss-docs-start theme-text-map
+$theme-colors-text: (
+  "primary": $primary-text-emphasis,
+  "secondary": $secondary-text-emphasis,
+  "success": $success-text-emphasis,
+  "info": $info-text-emphasis,
+  "warning": $warning-text-emphasis,
+  "danger": $danger-text-emphasis,
+  "light": $light-text-emphasis,
+  "dark": $dark-text-emphasis,
+) !default;
+// scss-docs-end theme-text-map
+
+// scss-docs-start theme-bg-subtle-map
+$theme-colors-bg-subtle: (
+  "primary": $primary-bg-subtle,
+  "secondary": $secondary-bg-subtle,
+  "success": $success-bg-subtle,
+  "info": $info-bg-subtle,
+  "warning": $warning-bg-subtle,
+  "danger": $danger-bg-subtle,
+  "light": $light-bg-subtle,
+  "dark": $dark-bg-subtle,
+) !default;
+// scss-docs-end theme-bg-subtle-map
+
+// scss-docs-start theme-border-subtle-map
+$theme-colors-border-subtle: (
+  "primary": $primary-border-subtle,
+  "secondary": $secondary-border-subtle,
+  "success": $success-border-subtle,
+  "info": $info-border-subtle,
+  "warning": $warning-border-subtle,
+  "danger": $danger-border-subtle,
+  "light": $light-border-subtle,
+  "dark": $dark-border-subtle,
+) !default;
+// scss-docs-end theme-border-subtle-map
+
+$theme-colors-text-dark: null !default;
+$theme-colors-bg-subtle-dark: null !default;
+$theme-colors-border-subtle-dark: null !default;
+
+@if $enable-dark-mode {
+  // scss-docs-start theme-text-dark-map
+  $theme-colors-text-dark: (
+    "primary": $primary-text-emphasis-dark,
+    "secondary": $secondary-text-emphasis-dark,
+    "success": $success-text-emphasis-dark,
+    "info": $info-text-emphasis-dark,
+    "warning": $warning-text-emphasis-dark,
+    "danger": $danger-text-emphasis-dark,
+    "light": $light-text-emphasis-dark,
+    "dark": $dark-text-emphasis-dark,
+  ) !default;
+  // scss-docs-end theme-text-dark-map
+
+  // scss-docs-start theme-bg-subtle-dark-map
+  $theme-colors-bg-subtle-dark: (
+    "primary": $primary-bg-subtle-dark,
+    "secondary": $secondary-bg-subtle-dark,
+    "success": $success-bg-subtle-dark,
+    "info": $info-bg-subtle-dark,
+    "warning": $warning-bg-subtle-dark,
+    "danger": $danger-bg-subtle-dark,
+    "light": $light-bg-subtle-dark,
+    "dark": $dark-bg-subtle-dark,
+  ) !default;
+  // scss-docs-end theme-bg-subtle-dark-map
+
+  // scss-docs-start theme-border-subtle-dark-map
+  $theme-colors-border-subtle-dark: (
+    "primary": $primary-border-subtle-dark,
+    "secondary": $secondary-border-subtle-dark,
+    "success": $success-border-subtle-dark,
+    "info": $info-border-subtle-dark,
+    "warning": $warning-border-subtle-dark,
+    "danger": $danger-border-subtle-dark,
+    "light": $light-border-subtle-dark,
+    "dark": $dark-border-subtle-dark,
+  ) !default;
+  // scss-docs-end theme-border-subtle-dark-map
+}
+
 // Utilities maps
 //
 // Extends the default `$theme-colors` maps to help create our utilities.
@@ -25,6 +109,17 @@ $utilities-text: map-merge(
  )
 ) !default;
 $utilities-text-colors: map-loop($utilities-text, rgba-css-var, "$key", "text") !default;
+
+$utilities-text-emphasis-colors: (
+  "primary-emphasis": var(--#{$prefix}primary-text-emphasis),
+  "secondary-emphasis": var(--#{$prefix}secondary-text-emphasis),
+  "success-emphasis": var(--#{$prefix}success-text-emphasis),
+  "info-emphasis": var(--#{$prefix}info-text-emphasis),
+  "warning-emphasis": var(--#{$prefix}warning-text-emphasis),
+  "danger-emphasis": var(--#{$prefix}danger-text-emphasis),
+  "light-emphasis": var(--#{$prefix}light-text-emphasis),
+  "dark-emphasis": var(--#{$prefix}dark-text-emphasis)
+) !default;
 // scss-docs-end utilities-text-colors

 // scss-docs-start utilities-bg-colors
@@ -37,18 +132,43 @@ $utilities-bg: map-merge(
  )
 ) !default;
 $utilities-bg-colors: map-loop($utilities-bg, rgba-css-var, "$key", "bg") !default;
+
+$utilities-bg-subtle: (
+  "primary-subtle": var(--#{$prefix}primary-bg-subtle),
+  "secondary-subtle": var(--#{$prefix}secondary-bg-subtle),
+  "success-subtle": var(--#{$prefix}success-bg-subtle),
+  "info-subtle": var(--#{$prefix}info-bg-subtle),
+  "warning-subtle": var(--#{$prefix}warning-bg-subtle),
+  "danger-subtle": var(--#{$prefix}danger-bg-subtle),
+  "light-subtle": var(--#{$prefix}light-bg-subtle),
+  "dark-subtle": var(--#{$prefix}dark-bg-subtle)
+) !default;
 // scss-docs-end utilities-bg-colors

 // scss-docs-start utilities-border-colors
 $utilities-border: map-merge(
  $utilities-colors,
  (
+    "black": to-rgb($black),
    "white": to-rgb($white)
  )
 ) !default;
 $utilities-border-colors: map-loop($utilities-border, rgba-css-var, "$key", "border") !default;
+
+$utilities-border-subtle: (
+  "primary-subtle": var(--#{$prefix}primary-border-subtle),
+  "secondary-subtle": var(--#{$prefix}secondary-border-subtle),
+  "success-subtle": var(--#{$prefix}success-border-subtle),
+  "info-subtle": var(--#{$prefix}info-border-subtle),
+  "warning-subtle": var(--#{$prefix}warning-border-subtle),
+  "danger-subtle": var(--#{$prefix}danger-border-subtle),
+  "light-subtle": var(--#{$prefix}light-border-subtle),
+  "dark-subtle": var(--#{$prefix}dark-border-subtle)
+) !default;
 // scss-docs-end utilities-border-colors

+$utilities-links-underline: map-loop($utilities-colors, rgba-css-var, "$key", "link-underline") !default;
+
 $negative-spacers: if($enable-negative-margins, negativify-map($spacers), null) !default;

 $gutters: $spacers !default;
@@ -10,6 +10,7 @@

 // Helpers
@import "mixins/breakpoints";
+@import "mixins/color-mode";
@import "mixins/color-scheme";
@import "mixins/image";
@import "mixins/resize";
@@ -21,13 +22,11 @@
@import "mixins/utilities";

 // Components
-@import "mixins/alert";
@import "mixins/backdrop";
@import "mixins/buttons";
@import "mixins/caret";
@import "mixins/pagination";
@import "mixins/lists";
-@import "mixins/list-group";
@import "mixins/forms";
@import "mixins/table-variants";

@@ -59,8 +59,8 @@

  // When fading in the modal, animate it to slide down
  .modal.fade & {
-    @include transition($modal-transition);
    transform: $modal-fade-transform;
+    @include transition($modal-transition);
  }
  .modal.show & {
    transform: $modal-show-transform;
@@ -126,14 +126,17 @@
  display: flex;
  flex-shrink: 0;
  align-items: center;
-  justify-content: space-between; // Put modal header elements (title and dismiss) on opposite ends
  padding: var(--#{$prefix}modal-header-padding);
  border-bottom: var(--#{$prefix}modal-header-border-width) solid var(--#{$prefix}modal-header-border-color);
  @include border-top-radius(var(--#{$prefix}modal-inner-border-radius));

  .btn-close {
    padding: calc(var(--#{$prefix}modal-header-padding-y) * .5) calc(var(--#{$prefix}modal-header-padding-x) * .5);
-    margin: calc(-.5 * var(--#{$prefix}modal-header-padding-y)) calc(-.5 * var(--#{$prefix}modal-header-padding-x)) calc(-.5 * var(--#{$prefix}modal-header-padding-y)) auto;
+    // Split properties to avoid invalid calc() function if value is 0
+    margin-top: calc(-.5 * var(--#{$prefix}modal-header-padding-y));
+    margin-right: calc(-.5 * var(--#{$prefix}modal-header-padding-x));
+    margin-bottom: calc(-.5 * var(--#{$prefix}modal-header-padding-y));
+    margin-left: auto;
  }
 }

@@ -28,6 +28,8 @@
  font-weight: var(--#{$prefix}nav-link-font-weight);
  color: var(--#{$prefix}nav-link-color);
  text-decoration: if($link-decoration == none, null, none);
+  background: none;
+  border: 0;
  @include transition($nav-link-transition);

  &:hover,
@@ -36,8 +38,14 @@
    text-decoration: if($link-hover-decoration == underline, none, null);
  }

+  &:focus-visible {
+    outline: 0;
+    box-shadow: $nav-link-focus-box-shadow;
+  }
+
  // Disabled state lightens text
-  &.disabled {
+  &.disabled,
+  &:disabled {
    color: var(--#{$prefix}nav-link-disabled-color);
    pointer-events: none;
    cursor: default;
@@ -63,7 +71,6 @@

  .nav-link {
    margin-bottom: calc(-1 * var(--#{$prefix}nav-tabs-border-width)); // stylelint-disable-line function-disallowed-list
-    background: none;
    border: var(--#{$prefix}nav-tabs-border-width) solid transparent;
    @include border-top-radius(var(--#{$prefix}nav-tabs-border-radius));

@@ -73,13 +80,6 @@
      isolation: isolate;
      border-color: var(--#{$prefix}nav-tabs-link-hover-border-color);
    }
-
-    &.disabled,
-    &:disabled {
-      color: var(--#{$prefix}nav-link-disabled-color);
-      background-color: transparent;
-      border-color: transparent;
-    }
  }

  .nav-link.active,
@@ -110,15 +110,7 @@
  // scss-docs-end nav-pills-css-vars

  .nav-link {
-    background: none;
-    border: 0;
    @include border-radius(var(--#{$prefix}nav-pills-border-radius));
-
-    &:disabled {
-      color: var(--#{$prefix}nav-link-disabled-color);
-      background-color: transparent;
-      border-color: transparent;
-    }
  }

  .nav-link.active,
@@ -129,6 +121,39 @@
 }


+//
+// Underline
+//
+
+.nav-underline {
+  // scss-docs-start nav-underline-css-vars
+  --#{$prefix}nav-underline-gap: #{$nav-underline-gap};
+  --#{$prefix}nav-underline-border-width: #{$nav-underline-border-width};
+  --#{$prefix}nav-underline-link-active-color: #{$nav-underline-link-active-color};
+  // scss-docs-end nav-underline-css-vars
+
+  gap: var(--#{$prefix}nav-underline-gap);
+
+  .nav-link {
+    padding-right: 0;
+    padding-left: 0;
+    border-bottom: var(--#{$prefix}nav-underline-border-width) solid transparent;
+
+    &:hover,
+    &:focus {
+      border-bottom-color: currentcolor;
+    }
+  }
+
+  .nav-link.active,
+  .show > .nav-link {
+    font-weight: $font-weight-bold;
+    color: var(--#{$prefix}nav-underline-link-active-color);
+    border-bottom-color: currentcolor;
+  }
+}
+
+
 //
 // Justified variants
 //
@@ -144,8 +169,8 @@
 .nav-justified {
  > .nav-link,
  .nav-item {
-    flex-basis: 0;
    flex-grow: 1;
+    flex-basis: 0;
    text-align: center;
  }
 }
@@ -100,9 +100,11 @@
  margin-bottom: 0;
  list-style: none;

-  .show > .nav-link,
-  .nav-link.active {
-    color: var(--#{$prefix}navbar-active-color);
+  .nav-link {
+    &.active,
+    &.show {
+      color: var(--#{$prefix}navbar-active-color);
+    }
  }

  .dropdown-menu {
@@ -137,8 +139,8 @@
 // the default flexbox row orientation. Requires the use of `flex-wrap: wrap`
 // on the `.navbar` parent.
 .navbar-collapse {
-  flex-basis: 100%;
  flex-grow: 1;
+  flex-basis: 100%;
  // For always expanded or extra full navbars, ensure content aligns itself
  // properly vertically. Can be easily overridden with flex utilities.
  align-items: center;
@@ -264,7 +266,8 @@
  @include deprecate("`.navbar-light`", "v5.2.0", "v6.0.0", true);
 }

-.navbar-dark {
+.navbar-dark,
+.navbar[data-bs-theme="dark"] {
  // scss-docs-start navbar-dark-css-vars
  --#{$prefix}navbar-color: #{$navbar-dark-color};
  --#{$prefix}navbar-hover-color: #{$navbar-dark-hover-color};
@@ -276,3 +279,11 @@
  --#{$prefix}navbar-toggler-icon-bg: #{escape-svg($navbar-dark-toggler-icon-bg)};
  // scss-docs-end navbar-dark-css-vars
 }
+
+@if $enable-dark-mode {
+  @include color-mode(dark) {
+    .navbar-toggler-icon {
+      --#{$prefix}navbar-toggler-icon-bg: #{escape-svg($navbar-dark-toggler-icon-bg)};
+    }
+  }
+}
@@ -12,6 +12,8 @@
  --#{$prefix}offcanvas-border-width: #{$offcanvas-border-width};
  --#{$prefix}offcanvas-border-color: #{$offcanvas-border-color};
  --#{$prefix}offcanvas-box-shadow: #{$offcanvas-box-shadow};
+  --#{$prefix}offcanvas-transition: #{transform $offcanvas-transition-duration ease-in-out};
+  --#{$prefix}offcanvas-title-line-height: #{$offcanvas-title-line-height};
  // scss-docs-end offcanvas-css-vars
 }

@@ -42,7 +44,7 @@
      background-clip: padding-box;
      outline: 0;
      @include box-shadow(var(--#{$prefix}offcanvas-box-shadow));
-      @include transition(transform $offcanvas-transition-duration ease-in-out);
+      @include transition(var(--#{$prefix}offcanvas-transition));

      &.offcanvas-start {
        top: 0;
@@ -121,20 +123,21 @@
 .offcanvas-header {
  display: flex;
  align-items: center;
-  justify-content: space-between;
  padding: var(--#{$prefix}offcanvas-padding-y) var(--#{$prefix}offcanvas-padding-x);

  .btn-close {
    padding: calc(var(--#{$prefix}offcanvas-padding-y) * .5) calc(var(--#{$prefix}offcanvas-padding-x) * .5);
+    // Split properties to avoid invalid calc() function if value is 0
    margin-top: calc(-.5 * var(--#{$prefix}offcanvas-padding-y));
    margin-right: calc(-.5 * var(--#{$prefix}offcanvas-padding-x));
    margin-bottom: calc(-.5 * var(--#{$prefix}offcanvas-padding-y));
+    margin-left: auto;
  }
 }

 .offcanvas-title {
  margin-bottom: 0;
-  line-height: $offcanvas-title-line-height;
+  line-height: var(--#{$prefix}offcanvas-title-line-height);
 }

 .offcanvas-body {
@@ -75,7 +75,7 @@
    margin-left: $pagination-margin-start;
  }

-  @if $pagination-margin-start == ($pagination-border-width * -1) {
+  @if $pagination-margin-start == calc(-1 * #{$pagination-border-width}) {
    &:first-child {
      .page-link {
        @include border-start-radius(var(--#{$prefix}pagination-border-radius));
@@ -3,12 +3,13 @@
 // scss-docs-start progress-keyframes
@if $enable-transitions {
  @keyframes progress-bar-stripes {
-    0% { background-position-x: $progress-height; }
+    0% { background-position-x: var(--#{$prefix}progress-height); }
  }
 }
 // scss-docs-end progress-keyframes

-.progress {
+.progress,
+.progress-stacked {
  // scss-docs-start progress-css-vars
  --#{$prefix}progress-height: #{$progress-height};
  @include rfs($progress-font-size, --#{$prefix}progress-font-size);
@@ -46,6 +47,14 @@
  background-size: var(--#{$prefix}progress-height) var(--#{$prefix}progress-height);
 }

+.progress-stacked > .progress {
+  overflow: visible;
+}
+
+.progress-stacked > .progress > .progress-bar {
+  width: 100%;
+}
+
@if $enable-transitions {
  .progress-bar-animated {
    animation: $progress-bar-animation-timing progress-bar-stripes;
@@ -87,7 +87,7 @@ hr {
  font-style: $headings-font-style;
  font-weight: $headings-font-weight;
  line-height: $headings-line-height;
-  color: $headings-color;
+  color: var(--#{$prefix}heading-color);
 }

 h1 {
@@ -217,6 +217,7 @@ small {

 mark {
  padding: $mark-padding;
+  color: var(--#{$prefix}highlight-color);
  background-color: var(--#{$prefix}highlight-bg);
 }

@@ -241,11 +242,11 @@ sup { top: -.5em; }
 // Links

 a {
-  color: var(--#{$prefix}link-color);
+  color: rgba(var(--#{$prefix}link-color-rgb), var(--#{$prefix}link-opacity, 1));
  text-decoration: $link-decoration;

  &:hover {
-    color: var(--#{$prefix}link-hover-color);
+    --#{$prefix}link-color-rgb: var(--#{$prefix}link-hover-color-rgb);
    text-decoration: $link-hover-decoration;
  }
 }
@@ -498,9 +499,9 @@ legend {
  width: 100%;
  padding: 0;
  margin-bottom: $legend-margin-bottom;
-  @include font-size($legend-font-size);
  font-weight: $legend-font-weight;
  line-height: inherit;
+  @include font-size($legend-font-size);

  + * {
    clear: left; // 2
@@ -524,15 +525,21 @@ legend {
  height: auto;
 }

-// 1. Correct the outline style in Safari.
-// 2. This overrides the extra rounded corners on search inputs in iOS so that our
+// 1. This overrides the extra rounded corners on search inputs in iOS so that our
 //    `.form-control` class can properly style them. Note that this cannot simply
 //    be added to `.form-control` as it's not specific enough. For details, see
 //    https://github.com/twbs/bootstrap/issues/11586.
+// 2. Correct the outline style in Safari.

 [type="search"] {
-  outline-offset: -2px; // 1
-  -webkit-appearance: textfield; // 2
+  -webkit-appearance: textfield; // 1
+  outline-offset: -2px; // 2
+
+  // 3. Better affordance and consistent appearance for search cancel button
+  &::-webkit-search-cancel-button {
+    cursor: pointer;
+    filter: grayscale(1);
+  }
 }

 // 1. A few input types should stay LTR
@@ -1,4 +1,5 @@
-:root {
+:root,
+[data-bs-theme="light"] {
  // Note: Custom variable values only support SassScript inside `#{}`.

  // Colors
@@ -21,10 +22,20 @@
    --#{$prefix}#{$color}-rgb: #{$value};
  }

+  @each $color, $value in $theme-colors-text {
+    --#{$prefix}#{$color}-text-emphasis: #{$value};
+  }
+
+  @each $color, $value in $theme-colors-bg-subtle {
+    --#{$prefix}#{$color}-bg-subtle: #{$value};
+  }
+
+  @each $color, $value in $theme-colors-border-subtle {
+    --#{$prefix}#{$color}-border-subtle: #{$value};
+  }
+
  --#{$prefix}white-rgb: #{to-rgb($white)};
  --#{$prefix}black-rgb: #{to-rgb($black)};
-  --#{$prefix}body-color-rgb: #{to-rgb($body-color)};
-  --#{$prefix}body-bg-rgb: #{to-rgb($body-bg)};

  // Fonts

@@ -39,17 +50,50 @@
  @if $font-size-root != null {
    --#{$prefix}root-font-size: #{$font-size-root};
  }
-  --#{$prefix}body-font-family: #{$font-family-base};
+  --#{$prefix}body-font-family: #{inspect($font-family-base)};
  @include rfs($font-size-base, --#{$prefix}body-font-size);
  --#{$prefix}body-font-weight: #{$font-weight-base};
  --#{$prefix}body-line-height: #{$line-height-base};
-  --#{$prefix}body-color: #{$body-color};
  @if $body-text-align != null {
    --#{$prefix}body-text-align: #{$body-text-align};
  }
+
+  --#{$prefix}body-color: #{$body-color};
+  --#{$prefix}body-color-rgb: #{to-rgb($body-color)};
  --#{$prefix}body-bg: #{$body-bg};
+  --#{$prefix}body-bg-rgb: #{to-rgb($body-bg)};
+
+  --#{$prefix}emphasis-color: #{$body-emphasis-color};
+  --#{$prefix}emphasis-color-rgb: #{to-rgb($body-emphasis-color)};
+
+  --#{$prefix}secondary-color: #{$body-secondary-color};
+  --#{$prefix}secondary-color-rgb: #{to-rgb($body-secondary-color)};
+  --#{$prefix}secondary-bg: #{$body-secondary-bg};
+  --#{$prefix}secondary-bg-rgb: #{to-rgb($body-secondary-bg)};
+
+  --#{$prefix}tertiary-color: #{$body-tertiary-color};
+  --#{$prefix}tertiary-color-rgb: #{to-rgb($body-tertiary-color)};
+  --#{$prefix}tertiary-bg: #{$body-tertiary-bg};
+  --#{$prefix}tertiary-bg-rgb: #{to-rgb($body-tertiary-bg)};
  // scss-docs-end root-body-variables

+  --#{$prefix}heading-color: #{$headings-color};
+
+  --#{$prefix}link-color: #{$link-color};
+  --#{$prefix}link-color-rgb: #{to-rgb($link-color)};
+  --#{$prefix}link-decoration: #{$link-decoration};
+
+  --#{$prefix}link-hover-color: #{$link-hover-color};
+  --#{$prefix}link-hover-color-rgb: #{to-rgb($link-hover-color)};
+
+  @if $link-hover-decoration != null {
+    --#{$prefix}link-hover-decoration: #{$link-hover-decoration};
+  }
+
+  --#{$prefix}code-color: #{$code-color};
+  --#{$prefix}highlight-color: #{$mark-color};
+  --#{$prefix}highlight-bg: #{$mark-bg};
+
  // scss-docs-start root-border-var
  --#{$prefix}border-width: #{$border-width};
  --#{$prefix}border-style: #{$border-style};
@@ -60,14 +104,84 @@
  --#{$prefix}border-radius-sm: #{$border-radius-sm};
  --#{$prefix}border-radius-lg: #{$border-radius-lg};
  --#{$prefix}border-radius-xl: #{$border-radius-xl};
-  --#{$prefix}border-radius-2xl: #{$border-radius-2xl};
+  --#{$prefix}border-radius-xxl: #{$border-radius-xxl};
+  --#{$prefix}border-radius-2xl: var(--#{$prefix}border-radius-xxl); // Deprecated in v5.3.0 for consistency
  --#{$prefix}border-radius-pill: #{$border-radius-pill};
  // scss-docs-end root-border-var

-  --#{$prefix}link-color: #{$link-color};
-  --#{$prefix}link-hover-color: #{$link-hover-color};
+  --#{$prefix}box-shadow: #{$box-shadow};
+  --#{$prefix}box-shadow-sm: #{$box-shadow-sm};
+  --#{$prefix}box-shadow-lg: #{$box-shadow-lg};
+  --#{$prefix}box-shadow-inset: #{$box-shadow-inset};

-  --#{$prefix}code-color: #{$code-color};
+  // Focus styles
+  // scss-docs-start root-focus-variables
+  --#{$prefix}focus-ring-width: #{$focus-ring-width};
+  --#{$prefix}focus-ring-opacity: #{$focus-ring-opacity};
+  --#{$prefix}focus-ring-color: #{$focus-ring-color};
+  // scss-docs-end root-focus-variables

-  --#{$prefix}highlight-bg: #{$mark-bg};
+  // scss-docs-start root-form-validation-variables
+  --#{$prefix}form-valid-color: #{$form-valid-color};
+  --#{$prefix}form-valid-border-color: #{$form-valid-border-color};
+  --#{$prefix}form-invalid-color: #{$form-invalid-color};
+  --#{$prefix}form-invalid-border-color: #{$form-invalid-border-color};
+  // scss-docs-end root-form-validation-variables
+}
+
+@if $enable-dark-mode {
+  @include color-mode(dark, true) {
+    color-scheme: dark;
+
+    // scss-docs-start root-dark-mode-vars
+    --#{$prefix}body-color: #{$body-color-dark};
+    --#{$prefix}body-color-rgb: #{to-rgb($body-color-dark)};
+    --#{$prefix}body-bg: #{$body-bg-dark};
+    --#{$prefix}body-bg-rgb: #{to-rgb($body-bg-dark)};
+
+    --#{$prefix}emphasis-color: #{$body-emphasis-color-dark};
+    --#{$prefix}emphasis-color-rgb: #{to-rgb($body-emphasis-color-dark)};
+
+    --#{$prefix}secondary-color: #{$body-secondary-color-dark};
+    --#{$prefix}secondary-color-rgb: #{to-rgb($body-secondary-color-dark)};
+    --#{$prefix}secondary-bg: #{$body-secondary-bg-dark};
+    --#{$prefix}secondary-bg-rgb: #{to-rgb($body-secondary-bg-dark)};
+
+    --#{$prefix}tertiary-color: #{$body-tertiary-color-dark};
+    --#{$prefix}tertiary-color-rgb: #{to-rgb($body-tertiary-color-dark)};
+    --#{$prefix}tertiary-bg: #{$body-tertiary-bg-dark};
+    --#{$prefix}tertiary-bg-rgb: #{to-rgb($body-tertiary-bg-dark)};
+
+    @each $color, $value in $theme-colors-text-dark {
+      --#{$prefix}#{$color}-text-emphasis: #{$value};
+    }
+
+    @each $color, $value in $theme-colors-bg-subtle-dark {
+      --#{$prefix}#{$color}-bg-subtle: #{$value};
+    }
+
+    @each $color, $value in $theme-colors-border-subtle-dark {
+      --#{$prefix}#{$color}-border-subtle: #{$value};
+    }
+
+    --#{$prefix}heading-color: #{$headings-color-dark};
+
+    --#{$prefix}link-color: #{$link-color-dark};
+    --#{$prefix}link-hover-color: #{$link-hover-color-dark};
+    --#{$prefix}link-color-rgb: #{to-rgb($link-color-dark)};
+    --#{$prefix}link-hover-color-rgb: #{to-rgb($link-hover-color-dark)};
+
+    --#{$prefix}code-color: #{$code-color-dark};
+    --#{$prefix}highlight-color: #{$mark-color-dark};
+    --#{$prefix}highlight-bg: #{$mark-bg-dark};
+
+    --#{$prefix}border-color: #{$border-color-dark};
+    --#{$prefix}border-color-translucent: #{$border-color-translucent-dark};
+
+    --#{$prefix}form-valid-color: #{$form-valid-color-dark};
+    --#{$prefix}form-valid-border-color: #{$form-valid-border-color-dark};
+    --#{$prefix}form-invalid-color: #{$form-invalid-color-dark};
+    --#{$prefix}form-invalid-border-color: #{$form-invalid-border-color-dark};
+    // scss-docs-end root-dark-mode-vars
+  }
 }
@@ -5,6 +5,7 @@
 .spinner-grow,
 .spinner-border {
  display: inline-block;
+  flex-shrink: 0;
  width: var(--#{$prefix}spinner-width);
  height: var(--#{$prefix}spinner-height);
  vertical-align: var(--#{$prefix}spinner-vertical-align);
@@ -3,6 +3,12 @@
 //

 .table {
+  // Reset needed for nesting tables
+  --#{$prefix}table-color-type: initial;
+  --#{$prefix}table-bg-type: initial;
+  --#{$prefix}table-color-state: initial;
+  --#{$prefix}table-bg-state: initial;
+  // End of reset
  --#{$prefix}table-color: #{$table-color};
  --#{$prefix}table-bg: #{$table-bg};
  --#{$prefix}table-border-color: #{$table-border-color};
@@ -16,7 +22,6 @@

  width: 100%;
  margin-bottom: $spacer;
-  color: var(--#{$prefix}table-color);
  vertical-align: $table-cell-vertical-align;
  border-color: var(--#{$prefix}table-border-color);

@@ -27,9 +32,11 @@
  // stylelint-disable-next-line selector-max-universal
  > :not(caption) > * > * {
    padding: $table-cell-padding-y $table-cell-padding-x;
+    // Following the precept of cascades: https://codepen.io/miriamsuzanne/full/vYNgodb
+    color: var(--#{$prefix}table-color-state, var(--#{$prefix}table-color-type, var(--#{$prefix}table-color)));
    background-color: var(--#{$prefix}table-bg);
    border-bottom-width: $table-border-width;
-    box-shadow: inset 0 0 0 9999px var(--#{$prefix}table-accent-bg);
+    box-shadow: inset 0 0 0 9999px var(--#{$prefix}table-bg-state, var(--#{$prefix}table-bg-type, var(--#{$prefix}table-accent-bg)));
  }

  > tbody {
@@ -42,7 +49,7 @@
 }

 .table-group-divider {
-  border-top: ($table-border-width * 2) solid $table-group-separator-color;
+  border-top: calc(#{$table-border-width} * 2) solid $table-group-separator-color; // stylelint-disable-line function-disallowed-list
 }

 //
@@ -72,7 +79,7 @@
 //
 // When borders are added on all sides of the cells, the corners can render odd when
 // these borders do not have the same color or if they are semi-transparent.
-// Therefor we add top and border bottoms to the `tr`s and left and right borders
+// Therefore we add top and border bottoms to the `tr`s and left and right borders
 // to the `td`s or `th`s

 .table-bordered {
@@ -104,16 +111,16 @@
 // For rows
 .table-striped {
  > tbody > tr:nth-of-type(#{$table-striped-order}) > * {
-    --#{$prefix}table-accent-bg: var(--#{$prefix}table-striped-bg);
-    color: var(--#{$prefix}table-striped-color);
+    --#{$prefix}table-color-type: var(--#{$prefix}table-striped-color);
+    --#{$prefix}table-bg-type: var(--#{$prefix}table-striped-bg);
  }
 }

 // For columns
 .table-striped-columns {
  > :not(caption) > tr > :nth-child(#{$table-striped-columns-order}) {
-    --#{$prefix}table-accent-bg: var(--#{$prefix}table-striped-bg);
-    color: var(--#{$prefix}table-striped-color);
+    --#{$prefix}table-color-type: var(--#{$prefix}table-striped-color);
+    --#{$prefix}table-bg-type: var(--#{$prefix}table-striped-bg);
  }
 }

@@ -122,8 +129,8 @@
 // The `.table-active` class can be added to highlight rows or cells

 .table-active {
-  --#{$prefix}table-accent-bg: var(--#{$prefix}table-active-bg);
-  color: var(--#{$prefix}table-active-color);
+  --#{$prefix}table-color-state: var(--#{$prefix}table-active-color);
+  --#{$prefix}table-bg-state: var(--#{$prefix}table-active-bg);
 }

 // Hover effect
@@ -132,8 +139,8 @@

 .table-hover {
  > tbody > tr:hover > * {
-    --#{$prefix}table-accent-bg: var(--#{$prefix}table-hover-bg);
-    color: var(--#{$prefix}table-hover-color);
+    --#{$prefix}table-color-state: var(--#{$prefix}table-hover-color);
+    --#{$prefix}table-bg-state: var(--#{$prefix}table-hover-bg);
  }
 }

@@ -17,7 +17,6 @@

  z-index: var(--#{$prefix}tooltip-zindex);
  display: block;
-  padding: var(--#{$prefix}tooltip-arrow-height);
  margin: var(--#{$prefix}tooltip-margin);
  @include deprecate("`$tooltip-margin`", "v5", "v5.x", true);
  // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
@@ -45,7 +44,7 @@
 }

 .bs-tooltip-top .tooltip-arrow {
-  bottom: 0;
+  bottom: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); // stylelint-disable-line function-disallowed-list

  &::before {
    top: -1px;
@@ -56,7 +55,7 @@

 /* rtl:begin:ignore */
 .bs-tooltip-end .tooltip-arrow {
-  left: 0;
+  left: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); // stylelint-disable-line function-disallowed-list
  width: var(--#{$prefix}tooltip-arrow-height);
  height: var(--#{$prefix}tooltip-arrow-width);

@@ -70,7 +69,7 @@
 /* rtl:end:ignore */

 .bs-tooltip-bottom .tooltip-arrow {
-  top: 0;
+  top: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); // stylelint-disable-line function-disallowed-list

  &::before {
    bottom: -1px;
@@ -81,7 +80,7 @@

 /* rtl:begin:ignore */
 .bs-tooltip-start .tooltip-arrow {
-  right: 0;
+  right: calc(-1 * var(--#{$prefix}tooltip-arrow-height)); // stylelint-disable-line function-disallowed-list
  width: var(--#{$prefix}tooltip-arrow-height);
  height: var(--#{$prefix}tooltip-arrow-width);

@@ -34,11 +34,11 @@
 // Type display classes
@each $display, $font-size in $display-font-sizes {
  .display-#{$display} {
-    @include font-size($font-size);
    font-family: $display-font-family;
    font-style: $display-font-style;
    font-weight: $display-font-weight;
    line-height: $display-line-height;
+    @include font-size($font-size);
  }
 }

@@ -22,6 +22,20 @@ $utilities: map-merge(
      )
    ),
    // scss-docs-end utils-float
+    // Object Fit utilities
+    // scss-docs-start utils-object-fit
+    "object-fit": (
+      responsive: true,
+      property: object-fit,
+      values: (
+        contain: contain,
+        cover: cover,
+        fill: fill,
+        scale: scale-down,
+        none: none,
+      )
+    ),
+    // scss-docs-end utils-object-fit
    // Opacity utilities
    // scss-docs-start utils-opacity
    "opacity": (
@@ -40,6 +54,14 @@ $utilities: map-merge(
      property: overflow,
      values: auto hidden visible scroll,
    ),
+    "overflow-x": (
+      property: overflow-x,
+      values: auto hidden visible scroll,
+    ),
+    "overflow-y": (
+      property: overflow-y,
+      values: auto hidden visible scroll,
+    ),
    // scss-docs-end utils-overflow
    // scss-docs-start utils-display
    "display": (
@@ -47,7 +69,7 @@ $utilities: map-merge(
      print: true,
      property: display,
      class: d,
-      values: inline inline-block block grid table table-row table-cell flex inline-flex none
+      values: inline inline-block block grid inline-grid table table-row table-cell flex inline-flex none
    ),
    // scss-docs-end utils-display
    // scss-docs-start utils-shadow
@@ -55,13 +77,21 @@ $utilities: map-merge(
      property: box-shadow,
      class: shadow,
      values: (
-        null: $box-shadow,
-        sm: $box-shadow-sm,
-        lg: $box-shadow-lg,
+        null: var(--#{$prefix}box-shadow),
+        sm: var(--#{$prefix}box-shadow-sm),
+        lg: var(--#{$prefix}box-shadow-lg),
        none: none,
      )
    ),
    // scss-docs-end utils-shadow
+    // scss-docs-start utils-focus-ring
+    "focus-ring": (
+      css-var: true,
+      css-variable-name: focus-ring-color,
+      class: focus-ring,
+      values: map-loop($theme-colors-rgb, rgba-css-var, "$key", "focus-ring")
+    ),
+    // scss-docs-end utils-focus-ring
    // scss-docs-start utils-position
    "position": (
      property: position,
@@ -141,9 +171,13 @@ $utilities: map-merge(
      ),
      values: $utilities-border-colors
    ),
+    "subtle-border-color": (
+      property: border-color,
+      class: border,
+      values: $utilities-border-subtle
+    ),
    "border-width": (
-      css-var: true,
-      css-variable-name: border-width,
+      property: border-width,
      class: border,
      values: $border-widths
    ),
@@ -450,6 +484,18 @@ $utilities: map-merge(
      class: gap,
      values: $spacers
    ),
+    "row-gap": (
+      responsive: true,
+      property: row-gap,
+      class: row-gap,
+      values: $spacers
+    ),
+    "column-gap": (
+      responsive: true,
+      property: column-gap,
+      class: column-gap,
+      values: $spacers
+    ),
    // scss-docs-end utils-spacing
    // Text
    // scss-docs-start utils-text
@@ -473,11 +519,12 @@ $utilities: map-merge(
      property: font-weight,
      class: fw,
      values: (
-        light: $font-weight-light,
        lighter: $font-weight-lighter,
+        light: $font-weight-light,
        normal: $font-weight-normal,
-        bold: $font-weight-bold,
+        medium: $font-weight-medium,
        semibold: $font-weight-semibold,
+        bold: $font-weight-bold,
        bolder: $font-weight-bolder
      )
    ),
@@ -535,9 +582,12 @@ $utilities: map-merge(
      values: map-merge(
        $utilities-text-colors,
        (
-          "muted": $text-muted,
+          "muted": var(--#{$prefix}secondary-color), // deprecated
          "black-50": rgba($black, .5), // deprecated
          "white-50": rgba($white, .5), // deprecated
+          "body-secondary": var(--#{$prefix}secondary-color),
+          "body-tertiary": var(--#{$prefix}tertiary-color),
+          "body-emphasis": var(--#{$prefix}emphasis-color),
          "reset": inherit,
        )
      )
@@ -552,7 +602,62 @@ $utilities: map-merge(
        100: 1
      )
    ),
+    "text-color": (
+      property: color,
+      class: text,
+      values: $utilities-text-emphasis-colors
+    ),
    // scss-docs-end utils-color
+    // scss-docs-start utils-links
+    "link-opacity": (
+      css-var: true,
+      class: link-opacity,
+      state: hover,
+      values: (
+        10: .1,
+        25: .25,
+        50: .5,
+        75: .75,
+        100: 1
+      )
+    ),
+    "link-offset": (
+      property: text-underline-offset,
+      class: link-offset,
+      state: hover,
+      values: (
+        1: .125em,
+        2: .25em,
+        3: .375em,
+      )
+    ),
+    "link-underline": (
+      property: text-decoration-color,
+      class: link-underline,
+      local-vars: (
+        "link-underline-opacity": 1
+      ),
+      values: map-merge(
+        $utilities-links-underline,
+        (
+          null: rgba(var(--#{$prefix}link-color-rgb), var(--#{$prefix}link-underline-opacity, 1)),
+        )
+      )
+    ),
+    "link-underline-opacity": (
+      css-var: true,
+      class: link-underline-opacity,
+      state: hover,
+      values: (
+        0: 0,
+        10: .1,
+        25: .25,
+        50: .5,
+        75: .75,
+        100: 1
+      ),
+    ),
+    // scss-docs-end utils-links
    // scss-docs-start utils-bg-color
    "background-color": (
      property: background-color,
@@ -563,7 +668,9 @@ $utilities: map-merge(
      values: map-merge(
        $utilities-bg-colors,
        (
-          "transparent": transparent
+          "transparent": transparent,
+          "body-secondary": rgba(var(--#{$prefix}secondary-bg-rgb), var(--#{$prefix}bg-opacity)),
+          "body-tertiary": rgba(var(--#{$prefix}tertiary-bg-rgb), var(--#{$prefix}bg-opacity)),
        )
      )
    ),
@@ -578,6 +685,11 @@ $utilities: map-merge(
        100: 1
      )
    ),
+    "subtle-background-color": (
+      property: background-color,
+      class: bg,
+      values: $utilities-bg-subtle
+    ),
    // scss-docs-end utils-bg-color
    "gradient": (
      property: background-image,
@@ -606,7 +718,7 @@ $utilities: map-merge(
        2: var(--#{$prefix}border-radius),
        3: var(--#{$prefix}border-radius-lg),
        4: var(--#{$prefix}border-radius-xl),
-        5: var(--#{$prefix}border-radius-2xl),
+        5: var(--#{$prefix}border-radius-xxl),
        circle: 50%,
        pill: var(--#{$prefix}border-radius-pill)
      )
@@ -614,22 +726,62 @@ $utilities: map-merge(
    "rounded-top": (
      property: border-top-left-radius border-top-right-radius,
      class: rounded-top,
-      values: (null: var(--#{$prefix}border-radius))
+      values: (
+        null: var(--#{$prefix}border-radius),
+        0: 0,
+        1: var(--#{$prefix}border-radius-sm),
+        2: var(--#{$prefix}border-radius),
+        3: var(--#{$prefix}border-radius-lg),
+        4: var(--#{$prefix}border-radius-xl),
+        5: var(--#{$prefix}border-radius-xxl),
+        circle: 50%,
+        pill: var(--#{$prefix}border-radius-pill)
+      )
    ),
    "rounded-end": (
      property: border-top-right-radius border-bottom-right-radius,
      class: rounded-end,
-      values: (null: var(--#{$prefix}border-radius))
+      values: (
+        null: var(--#{$prefix}border-radius),
+        0: 0,
+        1: var(--#{$prefix}border-radius-sm),
+        2: var(--#{$prefix}border-radius),
+        3: var(--#{$prefix}border-radius-lg),
+        4: var(--#{$prefix}border-radius-xl),
+        5: var(--#{$prefix}border-radius-xxl),
+        circle: 50%,
+        pill: var(--#{$prefix}border-radius-pill)
+      )
    ),
    "rounded-bottom": (
      property: border-bottom-right-radius border-bottom-left-radius,
      class: rounded-bottom,
-      values: (null: var(--#{$prefix}border-radius))
+      values: (
+        null: var(--#{$prefix}border-radius),
+        0: 0,
+        1: var(--#{$prefix}border-radius-sm),
+        2: var(--#{$prefix}border-radius),
+        3: var(--#{$prefix}border-radius-lg),
+        4: var(--#{$prefix}border-radius-xl),
+        5: var(--#{$prefix}border-radius-xxl),
+        circle: 50%,
+        pill: var(--#{$prefix}border-radius-pill)
+      )
    ),
    "rounded-start": (
      property: border-bottom-left-radius border-top-left-radius,
      class: rounded-start,
-      values: (null: var(--#{$prefix}border-radius))
+      values: (
+        null: var(--#{$prefix}border-radius),
+        0: 0,
+        1: var(--#{$prefix}border-radius-sm),
+        2: var(--#{$prefix}border-radius),
+        3: var(--#{$prefix}border-radius-lg),
+        4: var(--#{$prefix}border-radius-xl),
+        5: var(--#{$prefix}border-radius-xxl),
+        circle: 50%,
+        pill: var(--#{$prefix}border-radius-pill)
+      )
    ),
    // scss-docs-end utils-border-radius
    // scss-docs-start utils-visibility
@@ -640,8 +792,15 @@ $utilities: map-merge(
        visible: visible,
        invisible: hidden,
      )
-    )
+    ),
    // scss-docs-end utils-visibility
+    // scss-docs-start utils-zindex
+    "z-index": (
+      property: z-index,
+      class: z,
+      values: $zindex-levels,
+    )
+    // scss-docs-end utils-zindex
  ),
  $utilities
 );
@@ -0,0 +1,102 @@
+// Dark color mode variables
+//
+// Custom variables for the `[data-bs-theme="dark"]` theme. Use this as a starting point for your own custom color modes by creating a new theme-specific file like `_variables-dark.scss` and adding the variables you need.
+
+//
+// Global colors
+//
+
+// scss-docs-start sass-dark-mode-vars
+// scss-docs-start theme-text-dark-variables
+$primary-text-emphasis-dark:        tint-color($primary, 40%) !default;
+$secondary-text-emphasis-dark:      tint-color($secondary, 40%) !default;
+$success-text-emphasis-dark:        tint-color($success, 40%) !default;
+$info-text-emphasis-dark:           tint-color($info, 40%) !default;
+$warning-text-emphasis-dark:        tint-color($warning, 40%) !default;
+$danger-text-emphasis-dark:         tint-color($danger, 40%) !default;
+$light-text-emphasis-dark:          $gray-100 !default;
+$dark-text-emphasis-dark:           $gray-300 !default;
+// scss-docs-end theme-text-dark-variables
+
+// scss-docs-start theme-bg-subtle-dark-variables
+$primary-bg-subtle-dark:            shade-color($primary, 80%) !default;
+$secondary-bg-subtle-dark:          shade-color($secondary, 80%) !default;
+$success-bg-subtle-dark:            shade-color($success, 80%) !default;
+$info-bg-subtle-dark:               shade-color($info, 80%) !default;
+$warning-bg-subtle-dark:            shade-color($warning, 80%) !default;
+$danger-bg-subtle-dark:             shade-color($danger, 80%) !default;
+$light-bg-subtle-dark:              $gray-800 !default;
+$dark-bg-subtle-dark:               mix($gray-800, $black) !default;
+// scss-docs-end theme-bg-subtle-dark-variables
+
+// scss-docs-start theme-border-subtle-dark-variables
+$primary-border-subtle-dark:        shade-color($primary, 40%) !default;
+$secondary-border-subtle-dark:      shade-color($secondary, 40%) !default;
+$success-border-subtle-dark:        shade-color($success, 40%) !default;
+$info-border-subtle-dark:           shade-color($info, 40%) !default;
+$warning-border-subtle-dark:        shade-color($warning, 40%) !default;
+$danger-border-subtle-dark:         shade-color($danger, 40%) !default;
+$light-border-subtle-dark:          $gray-700 !default;
+$dark-border-subtle-dark:           $gray-800 !default;
+// scss-docs-end theme-border-subtle-dark-variables
+
+$body-color-dark:                   $gray-300 !default;
+$body-bg-dark:                      $gray-900 !default;
+$body-secondary-color-dark:         rgba($body-color-dark, .75) !default;
+$body-secondary-bg-dark:            $gray-800 !default;
+$body-tertiary-color-dark:          rgba($body-color-dark, .5) !default;
+$body-tertiary-bg-dark:             mix($gray-800, $gray-900, 50%) !default;
+$body-emphasis-color-dark:          $white !default;
+$border-color-dark:                 $gray-700 !default;
+$border-color-translucent-dark:     rgba($white, .15) !default;
+$headings-color-dark:               inherit !default;
+$link-color-dark:                   tint-color($primary, 40%) !default;
+$link-hover-color-dark:             shift-color($link-color-dark, -$link-shade-percentage) !default;
+$code-color-dark:                   tint-color($code-color, 40%) !default;
+$mark-color-dark:                   $body-color-dark !default;
+$mark-bg-dark:                      $yellow-800 !default;
+
+
+//
+// Forms
+//
+
+$form-select-indicator-color-dark:  $body-color-dark !default;
+$form-select-indicator-dark:        url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'><path fill='none' stroke='#{$form-select-indicator-color-dark}' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/></svg>") !default;
+
+$form-switch-color-dark:            rgba($white, .25) !default;
+$form-switch-bg-image-dark:         url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='3' fill='#{$form-switch-color-dark}'/></svg>") !default;
+
+// scss-docs-start form-validation-colors-dark
+$form-valid-color-dark:             $green-300 !default;
+$form-valid-border-color-dark:      $green-300 !default;
+$form-invalid-color-dark:           $red-300 !default;
+$form-invalid-border-color-dark:    $red-300 !default;
+// scss-docs-end form-validation-colors-dark
+
+
+//
+// Accordion
+//
+
+$accordion-icon-color-dark:         $primary-text-emphasis-dark !default;
+$accordion-icon-active-color-dark:  $primary-text-emphasis-dark !default;
+
+$accordion-button-icon-dark:         url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-color-dark}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708'/></svg>") !default;
+$accordion-button-active-icon-dark:  url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-active-color-dark}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708'/></svg>") !default;
+// scss-docs-end sass-dark-mode-vars
+
+
+//
+// Carousel
+//
+
+$carousel-indicator-active-bg-dark:   $carousel-dark-indicator-active-bg !default;
+$carousel-caption-color-dark:         $carousel-dark-caption-color !default;
+$carousel-control-icon-filter-dark:   $carousel-dark-control-icon-filter !default;
+
+//
+// Close button
+//
+
+$btn-close-filter-dark:             $btn-close-white-filter !default;
@@ -67,8 +67,8 @@ $colors: (
 ) !default;
 // scss-docs-end colors-map

-// The contrast ratio to reach against white, to determine if color changes from "light" to "dark". Acceptable values for WCAG 2.0 are 3, 4.5 and 7.
-// See https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast
+// The contrast ratio to reach against white, to determine if color changes from "light" to "dark". Acceptable values for WCAG 2.2 are 3, 4.5 and 7.
+// See https://www.w3.org/TR/WCAG/#contrast-minimum
 $min-contrast-ratio:   4.5 !default;

 // Customize the light and dark text colors for use in our color contrast function.
@@ -321,6 +321,39 @@ $theme-colors: (
 ) !default;
 // scss-docs-end theme-colors-map

+// scss-docs-start theme-text-variables
+$primary-text-emphasis:   shade-color($primary, 60%) !default;
+$secondary-text-emphasis: shade-color($secondary, 60%) !default;
+$success-text-emphasis:   shade-color($success, 60%) !default;
+$info-text-emphasis:      shade-color($info, 60%) !default;
+$warning-text-emphasis:   shade-color($warning, 60%) !default;
+$danger-text-emphasis:    shade-color($danger, 60%) !default;
+$light-text-emphasis:     $gray-700 !default;
+$dark-text-emphasis:      $gray-700 !default;
+// scss-docs-end theme-text-variables
+
+// scss-docs-start theme-bg-subtle-variables
+$primary-bg-subtle:       tint-color($primary, 80%) !default;
+$secondary-bg-subtle:     tint-color($secondary, 80%) !default;
+$success-bg-subtle:       tint-color($success, 80%) !default;
+$info-bg-subtle:          tint-color($info, 80%) !default;
+$warning-bg-subtle:       tint-color($warning, 80%) !default;
+$danger-bg-subtle:        tint-color($danger, 80%) !default;
+$light-bg-subtle:         mix($gray-100, $white) !default;
+$dark-bg-subtle:          $gray-400 !default;
+// scss-docs-end theme-bg-subtle-variables
+
+// scss-docs-start theme-border-subtle-variables
+$primary-border-subtle:   tint-color($primary, 60%) !default;
+$secondary-border-subtle: tint-color($secondary, 60%) !default;
+$success-border-subtle:   tint-color($success, 60%) !default;
+$info-border-subtle:      tint-color($info, 60%) !default;
+$warning-border-subtle:   tint-color($warning, 60%) !default;
+$danger-border-subtle:    tint-color($danger, 60%) !default;
+$light-border-subtle:     $gray-200 !default;
+$dark-border-subtle:      $gray-500 !default;
+// scss-docs-end theme-border-subtle-variables
+
 // Characters which are escaped by the escape-svg function
 $escaped-characters: (
  ("<", "%3c"),
@@ -351,6 +384,9 @@ $enable-negative-margins:     false !default;
 $enable-deprecation-messages: true !default;
 $enable-important-utilities:  true !default;

+$enable-dark-mode:            true !default;
+$color-mode-type:             data !default; // `data` or `media-query`
+
 // Prefix for :root CSS variables

 $variable-prefix:             bs- !default; // Deprecated in v5.2.0 for the shorter `$prefix`
@@ -398,9 +434,17 @@ $position-values: (
 //
 // Settings for the `<body>` element.

-$body-bg:                   $white !default;
-$body-color:                $gray-900 !default;
 $body-text-align:           null !default;
+$body-color:                $gray-900 !default;
+$body-bg:                   $white !default;
+
+$body-secondary-color:      rgba($body-color, .75) !default;
+$body-secondary-bg:         $gray-200 !default;
+
+$body-tertiary-color:       rgba($body-color, .5) !default;
+$body-tertiary-bg:          $gray-100 !default;
+
+$body-emphasis-color:       $black !default;

 // Links
 //
@@ -415,6 +459,15 @@ $link-hover-decoration:                   null !default;
 $stretched-link-pseudo-element:           after !default;
 $stretched-link-z-index:                  1 !default;

+// Icon links
+// scss-docs-start icon-link-variables
+$icon-link-gap:               .375rem !default;
+$icon-link-underline-offset:  .25em !default;
+$icon-link-icon-size:         1em !default;
+$icon-link-icon-transition:   .2s ease-in-out transform !default;
+$icon-link-icon-transform:    translate3d(.25em, 0, 0) !default;
+// scss-docs-end icon-link-variables
+
 // Paragraphs
 //
 // Style p element.
@@ -485,7 +538,6 @@ $border-widths: (
  4: 4px,
  5: 5px
 ) !default;
-
 $border-style:                solid !default;
 $border-color:                $gray-300 !default;
 $border-color-translucent:    rgba($black, .175) !default;
@@ -496,9 +548,12 @@ $border-radius:               .375rem !default;
 $border-radius-sm:            .25rem !default;
 $border-radius-lg:            .5rem !default;
 $border-radius-xl:            1rem !default;
-$border-radius-2xl:           2rem !default;
+$border-radius-xxl:           2rem !default;
 $border-radius-pill:          50rem !default;
 // scss-docs-end border-radius-variables
+// fusv-disable
+$border-radius-2xl:           $border-radius-xxl !default; // Deprecated in v5.3.0
+// fusv-enable

 // scss-docs-start box-shadow-variables
 $box-shadow:                  0 .5rem 1rem rgba($black, .15) !default;
@@ -510,6 +565,14 @@ $box-shadow-inset:            inset 0 1px 2px rgba($black, .075) !default;
 $component-active-color:      $white !default;
 $component-active-bg:         $primary !default;

+// scss-docs-start focus-ring-variables
+$focus-ring-width:      .25rem !default;
+$focus-ring-opacity:    .25 !default;
+$focus-ring-color:      rgba($primary, $focus-ring-opacity) !default;
+$focus-ring-blur:       0 !default;
+$focus-ring-box-shadow: 0 0 $focus-ring-blur $focus-ring-width $focus-ring-color !default;
+// scss-docs-end focus-ring-variables
+
 // scss-docs-start caret-variables
 $caret-width:                 .3em !default;
 $caret-vertical-align:        $caret-width * .85 !default;
@@ -556,6 +619,7 @@ $font-size-lg:                $font-size-base * 1.25 !default;
 $font-weight-lighter:         lighter !default;
 $font-weight-light:           300 !default;
 $font-weight-normal:          400 !default;
+$font-weight-medium:          500 !default;
 $font-weight-semibold:        600 !default;
 $font-weight-bold:            700 !default;
 $font-weight-bolder:          bolder !default;
@@ -591,7 +655,7 @@ $headings-font-family:        null !default;
 $headings-font-style:         null !default;
 $headings-font-weight:        500 !default;
 $headings-line-height:        1.2 !default;
-$headings-color:              null !default;
+$headings-color:              inherit !default;
 // scss-docs-end headings-variables

 // scss-docs-start display-headings
@@ -618,7 +682,9 @@ $small-font-size:             .875em !default;

 $sub-sup-font-size:           .75em !default;

-$text-muted:                  $gray-600 !default;
+// fusv-disable
+$text-muted:                  var(--#{$prefix}secondary-color) !default; // Deprecated in 5.3.0
+// fusv-enable

 $initialism-font-size:        $small-font-size !default;

@@ -636,9 +702,13 @@ $hr-height:                   null !default; // Deprecated in v5.2.0
 // fusv-enable

 $hr-border-color:             null !default; // Allows for inherited colors
-$hr-border-width:             $border-width !default;
+$hr-border-width:             var(--#{$prefix}border-width) !default;
 $hr-opacity:                  .25 !default;

+// scss-docs-start vr-variables
+$vr-border-width:             var(--#{$prefix}border-width) !default;
+// scss-docs-end vr-variables
+
 $legend-margin-bottom:        .5rem !default;
 $legend-font-size:            1.5rem !default;
 $legend-font-weight:          null !default;
@@ -648,6 +718,7 @@ $dt-font-weight:              $font-weight-bold !default;
 $list-inline-padding:         .5rem !default;

 $mark-padding:                .1875em !default;
+$mark-color:                  $body-color !default;
 $mark-bg:                     $yellow-100 !default;
 // scss-docs-end type-variables

@@ -664,26 +735,26 @@ $table-cell-padding-x-sm:     .25rem !default;

 $table-cell-vertical-align:   top !default;

-$table-color:                 var(--#{$prefix}body-color) !default;
-$table-bg:                    transparent !default;
+$table-color:                 var(--#{$prefix}emphasis-color) !default;
+$table-bg:                    var(--#{$prefix}body-bg) !default;
 $table-accent-bg:             transparent !default;

 $table-th-font-weight:        null !default;

 $table-striped-color:         $table-color !default;
 $table-striped-bg-factor:     .05 !default;
-$table-striped-bg:            rgba($black, $table-striped-bg-factor) !default;
+$table-striped-bg:            rgba(var(--#{$prefix}emphasis-color-rgb), $table-striped-bg-factor) !default;

 $table-active-color:          $table-color !default;
 $table-active-bg-factor:      .1 !default;
-$table-active-bg:             rgba($black, $table-active-bg-factor) !default;
+$table-active-bg:             rgba(var(--#{$prefix}emphasis-color-rgb), $table-active-bg-factor) !default;

 $table-hover-color:           $table-color !default;
 $table-hover-bg-factor:       .075 !default;
-$table-hover-bg:              rgba($black, $table-hover-bg-factor) !default;
+$table-hover-bg:              rgba(var(--#{$prefix}emphasis-color-rgb), $table-hover-bg-factor) !default;

-$table-border-factor:         .1 !default;
-$table-border-width:          $border-width !default;
+$table-border-factor:         .2 !default;
+$table-border-width:          var(--#{$prefix}border-width) !default;
 $table-border-color:          var(--#{$prefix}border-color) !default;

 $table-striped-order:         odd !default;
@@ -691,7 +762,7 @@ $table-striped-columns-order: even !default;

 $table-group-separator-color: currentcolor !default;

-$table-caption-color:         $text-muted !default;
+$table-caption-color:         var(--#{$prefix}secondary-color) !default;

 $table-bg-scale:              -80% !default;
 // scss-docs-end table-variables
@@ -721,11 +792,11 @@ $input-btn-font-family:       null !default;
 $input-btn-font-size:         $font-size-base !default;
 $input-btn-line-height:       $line-height-base !default;

-$input-btn-focus-width:         .25rem !default;
-$input-btn-focus-color-opacity: .25 !default;
-$input-btn-focus-color:         rgba($component-active-bg, $input-btn-focus-color-opacity) !default;
-$input-btn-focus-blur:          0 !default;
-$input-btn-focus-box-shadow:    0 0 $input-btn-focus-blur $input-btn-focus-width $input-btn-focus-color !default;
+$input-btn-focus-width:         $focus-ring-width !default;
+$input-btn-focus-color-opacity: $focus-ring-opacity !default;
+$input-btn-focus-color:         $focus-ring-color !default;
+$input-btn-focus-blur:          $focus-ring-blur !default;
+$input-btn-focus-box-shadow:    $focus-ring-box-shadow !default;

 $input-btn-padding-y-sm:      .25rem !default;
 $input-btn-padding-x-sm:      .5rem !default;
@@ -735,7 +806,7 @@ $input-btn-padding-y-lg:      .5rem !default;
 $input-btn-padding-x-lg:      1rem !default;
 $input-btn-font-size-lg:      $font-size-lg !default;

-$input-btn-border-width:      $border-width !default;
+$input-btn-border-width:      var(--#{$prefix}border-width) !default;
 // scss-docs-end input-btn-variables


@@ -744,6 +815,7 @@ $input-btn-border-width:      $border-width !default;
 // For each of Bootstrap's buttons, define text, background, and border color.

 // scss-docs-start btn-variables
+$btn-color:                   var(--#{$prefix}body-color) !default;
 $btn-padding-y:               $input-btn-padding-y !default;
 $btn-padding-x:               $input-btn-padding-x !default;
 $btn-font-family:             $input-btn-font-family !default;
@@ -771,11 +843,12 @@ $btn-active-box-shadow:       inset 0 3px 5px rgba($black, .125) !default;
 $btn-link-color:              var(--#{$prefix}link-color) !default;
 $btn-link-hover-color:        var(--#{$prefix}link-hover-color) !default;
 $btn-link-disabled-color:     $gray-600 !default;
+$btn-link-focus-shadow-rgb:   to-rgb(mix(color-contrast($link-color), $link-color, 15%)) !default;

 // Allows for customizing button radius independently from global border radius
-$btn-border-radius:           $border-radius !default;
-$btn-border-radius-sm:        $border-radius-sm !default;
-$btn-border-radius-lg:        $border-radius-lg !default;
+$btn-border-radius:           var(--#{$prefix}border-radius) !default;
+$btn-border-radius-sm:        var(--#{$prefix}border-radius-sm) !default;
+$btn-border-radius-lg:        var(--#{$prefix}border-radius-lg) !default;

 $btn-transition:              color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;

@@ -797,7 +870,7 @@ $form-text-margin-top:                  .25rem !default;
 $form-text-font-size:                   $small-font-size !default;
 $form-text-font-style:                  null !default;
 $form-text-font-weight:                 null !default;
-$form-text-color:                       $text-muted !default;
+$form-text-color:                       var(--#{$prefix}secondary-color) !default;
 // scss-docs-end form-text-variables

 // scss-docs-start form-label-variables
@@ -824,19 +897,19 @@ $input-padding-y-lg:                    $input-btn-padding-y-lg !default;
 $input-padding-x-lg:                    $input-btn-padding-x-lg !default;
 $input-font-size-lg:                    $input-btn-font-size-lg !default;

-$input-bg:                              $body-bg !default;
+$input-bg:                              var(--#{$prefix}body-bg) !default;
 $input-disabled-color:                  null !default;
-$input-disabled-bg:                     $gray-200 !default;
+$input-disabled-bg:                     var(--#{$prefix}secondary-bg) !default;
 $input-disabled-border-color:           null !default;

-$input-color:                           $body-color !default;
-$input-border-color:                    $gray-400 !default;
+$input-color:                           var(--#{$prefix}body-color) !default;
+$input-border-color:                    var(--#{$prefix}border-color) !default;
 $input-border-width:                    $input-btn-border-width !default;
-$input-box-shadow:                      $box-shadow-inset !default;
+$input-box-shadow:                      var(--#{$prefix}box-shadow-inset) !default;

-$input-border-radius:                   $border-radius !default;
-$input-border-radius-sm:                $border-radius-sm !default;
-$input-border-radius-lg:                $border-radius-lg !default;
+$input-border-radius:                   var(--#{$prefix}border-radius) !default;
+$input-border-radius-sm:                var(--#{$prefix}border-radius-sm) !default;
+$input-border-radius-lg:                var(--#{$prefix}border-radius-lg) !default;

 $input-focus-bg:                        $input-bg !default;
 $input-focus-border-color:              tint-color($component-active-bg, 50%) !default;
@@ -844,10 +917,10 @@ $input-focus-color:                     $input-color !default;
 $input-focus-width:                     $input-btn-focus-width !default;
 $input-focus-box-shadow:                $input-btn-focus-box-shadow !default;

-$input-placeholder-color:               $gray-600 !default;
-$input-plaintext-color:                 $body-color !default;
+$input-placeholder-color:               var(--#{$prefix}secondary-color) !default;
+$input-plaintext-color:                 var(--#{$prefix}body-color) !default;

-$input-height-border:                   $input-border-width * 2 !default;
+$input-height-border:                   calc(#{$input-border-width} * 2) !default; // stylelint-disable-line function-disallowed-list

 $input-height-inner:                    add($input-line-height * 1em, $input-padding-y * 2) !default;
 $input-height-inner-half:               add($input-line-height * .5em, $input-padding-y) !default;
@@ -874,11 +947,11 @@ $form-check-transition:                   null !default;
 $form-check-input-active-filter:          brightness(90%) !default;

 $form-check-input-bg:                     $input-bg !default;
-$form-check-input-border:                 1px solid rgba($black, .25) !default;
+$form-check-input-border:                 var(--#{$prefix}border-width) solid var(--#{$prefix}border-color) !default;
 $form-check-input-border-radius:          .25em !default;
 $form-check-radio-border-radius:          50% !default;
 $form-check-input-focus-border:           $input-focus-border-color !default;
-$form-check-input-focus-box-shadow:       $input-btn-focus-box-shadow !default;
+$form-check-input-focus-box-shadow:       $focus-ring-box-shadow !default;

 $form-check-input-checked-color:          $component-active-color !default;
 $form-check-input-checked-bg-color:       $component-active-bg !default;
@@ -919,7 +992,7 @@ $input-group-addon-padding-y:           $input-padding-y !default;
 $input-group-addon-padding-x:           $input-padding-x !default;
 $input-group-addon-font-weight:         $input-font-weight !default;
 $input-group-addon-color:               $input-color !default;
-$input-group-addon-bg:                  $gray-200 !default;
+$input-group-addon-bg:                  var(--#{$prefix}tertiary-bg) !default;
 $input-group-addon-border-color:        $input-border-color !default;
 // scss-docs-end input-group-variables

@@ -934,7 +1007,7 @@ $form-select-line-height:           $input-line-height !default;
 $form-select-color:                 $input-color !default;
 $form-select-bg:                    $input-bg !default;
 $form-select-disabled-color:        null !default;
-$form-select-disabled-bg:           $gray-200 !default;
+$form-select-disabled-bg:           $input-disabled-bg !default;
 $form-select-disabled-border-color: $input-disabled-border-color !default;
 $form-select-bg-position:           right $form-select-padding-x center !default;
 $form-select-bg-size:               16px 12px !default; // In pixels because image dimensions
@@ -948,7 +1021,7 @@ $form-select-feedback-icon-size:        $input-height-inner-half $input-height-i
 $form-select-border-width:        $input-border-width !default;
 $form-select-border-color:        $input-border-color !default;
 $form-select-border-radius:       $input-border-radius !default;
-$form-select-box-shadow:          $box-shadow-inset !default;
+$form-select-box-shadow:          var(--#{$prefix}box-shadow-inset) !default;

 $form-select-focus-border-color:  $input-focus-border-color !default;
 $form-select-focus-width:         $input-focus-width !default;
@@ -971,9 +1044,9 @@ $form-select-transition:          $input-transition !default;
 $form-range-track-width:          100% !default;
 $form-range-track-height:         .5rem !default;
 $form-range-track-cursor:         pointer !default;
-$form-range-track-bg:             $gray-300 !default;
+$form-range-track-bg:             var(--#{$prefix}secondary-bg) !default;
 $form-range-track-border-radius:  1rem !default;
-$form-range-track-box-shadow:     $box-shadow-inset !default;
+$form-range-track-box-shadow:     var(--#{$prefix}box-shadow-inset) !default;

 $form-range-thumb-width:                   1rem !default;
 $form-range-thumb-height:                  $form-range-thumb-width !default;
@@ -984,26 +1057,28 @@ $form-range-thumb-box-shadow:              0 .1rem .25rem rgba($black, .1) !defa
 $form-range-thumb-focus-box-shadow:        0 0 0 1px $body-bg, $input-focus-box-shadow !default;
 $form-range-thumb-focus-box-shadow-width:  $input-focus-width !default; // For focus box shadow issue in Edge
 $form-range-thumb-active-bg:               tint-color($component-active-bg, 70%) !default;
-$form-range-thumb-disabled-bg:             $gray-500 !default;
+$form-range-thumb-disabled-bg:             var(--#{$prefix}secondary-color) !default;
 $form-range-thumb-transition:              background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
 // scss-docs-end form-range-variables

 // scss-docs-start form-file-variables
 $form-file-button-color:          $input-color !default;
-$form-file-button-bg:             $input-group-addon-bg !default;
-$form-file-button-hover-bg:       shade-color($form-file-button-bg, 5%) !default;
+$form-file-button-bg:             var(--#{$prefix}tertiary-bg) !default;
+$form-file-button-hover-bg:       var(--#{$prefix}secondary-bg) !default;
 // scss-docs-end form-file-variables

 // scss-docs-start form-floating-variables
-$form-floating-height:            add(3.5rem, $input-height-border) !default;
-$form-floating-line-height:       1.25 !default;
-$form-floating-padding-x:         $input-padding-x !default;
-$form-floating-padding-y:         1rem !default;
-$form-floating-input-padding-t:   1.625rem !default;
-$form-floating-input-padding-b:   .625rem !default;
-$form-floating-label-opacity:     .65 !default;
-$form-floating-label-transform:   scale(.85) translateY(-.5rem) translateX(.15rem) !default;
-$form-floating-transition:        opacity .1s ease-in-out, transform .1s ease-in-out !default;
+$form-floating-height:                  add(3.5rem, $input-height-border) !default;
+$form-floating-line-height:             1.25 !default;
+$form-floating-padding-x:               $input-padding-x !default;
+$form-floating-padding-y:               1rem !default;
+$form-floating-input-padding-t:         1.625rem !default;
+$form-floating-input-padding-b:         .625rem !default;
+$form-floating-label-height:            1.5em !default;
+$form-floating-label-opacity:           .65 !default;
+$form-floating-label-transform:         scale(.85) translateY(-.5rem) translateX(.15rem) !default;
+$form-floating-label-disabled-color:    $gray-600 !default;
+$form-floating-transition:              opacity .1s ease-in-out, transform .1s ease-in-out !default;
 // scss-docs-end form-floating-variables

 // Form validation
@@ -1016,20 +1091,35 @@ $form-feedback-valid-color:         $success !default;
 $form-feedback-invalid-color:       $danger !default;

 $form-feedback-icon-valid-color:    $form-feedback-valid-color !default;
-$form-feedback-icon-valid:          url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'><path fill='#{$form-feedback-icon-valid-color}' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/></svg>") !default;
+$form-feedback-icon-valid:          url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'><path fill='#{$form-feedback-icon-valid-color}' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1'/></svg>") !default;
 $form-feedback-icon-invalid-color:  $form-feedback-invalid-color !default;
 $form-feedback-icon-invalid:        url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='#{$form-feedback-icon-invalid-color}'><circle cx='6' cy='6' r='4.5'/><path stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/><circle cx='6' cy='8.2' r='.6' fill='#{$form-feedback-icon-invalid-color}' stroke='none'/></svg>") !default;
 // scss-docs-end form-feedback-variables

+// scss-docs-start form-validation-colors
+$form-valid-color:                  $form-feedback-valid-color !default;
+$form-valid-border-color:           $form-feedback-valid-color !default;
+$form-invalid-color:                $form-feedback-invalid-color !default;
+$form-invalid-border-color:         $form-feedback-invalid-color !default;
+// scss-docs-end form-validation-colors
+
 // scss-docs-start form-validation-states
 $form-validation-states: (
  "valid": (
-    "color": $form-feedback-valid-color,
-    "icon": $form-feedback-icon-valid
+    "color": var(--#{$prefix}form-valid-color),
+    "icon": $form-feedback-icon-valid,
+    "tooltip-color": #fff,
+    "tooltip-bg-color": var(--#{$prefix}success),
+    "focus-box-shadow": 0 0 $input-btn-focus-blur $input-focus-width rgba(var(--#{$prefix}success-rgb), $input-btn-focus-color-opacity),
+    "border-color": var(--#{$prefix}form-valid-border-color),
  ),
  "invalid": (
-    "color": $form-feedback-invalid-color,
-    "icon": $form-feedback-icon-invalid
+    "color": var(--#{$prefix}form-invalid-color),
+    "icon": $form-feedback-icon-invalid,
+    "tooltip-color": #fff,
+    "tooltip-bg-color": var(--#{$prefix}danger),
+    "focus-box-shadow": 0 0 $input-btn-focus-blur $input-focus-width rgba(var(--#{$prefix}danger-rgb), $input-btn-focus-color-opacity),
+    "border-color": var(--#{$prefix}form-invalid-border-color),
  )
 ) !default;
 // scss-docs-end form-validation-states
@@ -1052,6 +1142,16 @@ $zindex-tooltip:                    1080 !default;
 $zindex-toast:                      1090 !default;
 // scss-docs-end zindex-stack

+// scss-docs-start zindex-levels-map
+$zindex-levels: (
+  n1: -1,
+  0: 0,
+  1: 1,
+  2: 2,
+  3: 3
+) !default;
+// scss-docs-end zindex-levels-map
+

 // Navs

@@ -1063,19 +1163,24 @@ $nav-link-font-weight:              null !default;
 $nav-link-color:                    var(--#{$prefix}link-color) !default;
 $nav-link-hover-color:              var(--#{$prefix}link-hover-color) !default;
 $nav-link-transition:               color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out !default;
-$nav-link-disabled-color:           $gray-600 !default;
+$nav-link-disabled-color:           var(--#{$prefix}secondary-color) !default;
+$nav-link-focus-box-shadow:         $focus-ring-box-shadow !default;

-$nav-tabs-border-color:             $gray-300 !default;
-$nav-tabs-border-width:             $border-width !default;
-$nav-tabs-border-radius:            $border-radius !default;
-$nav-tabs-link-hover-border-color:  $gray-200 $gray-200 $nav-tabs-border-color !default;
-$nav-tabs-link-active-color:        $gray-700 !default;
-$nav-tabs-link-active-bg:           $body-bg !default;
-$nav-tabs-link-active-border-color: $gray-300 $gray-300 $nav-tabs-link-active-bg !default;
+$nav-tabs-border-color:             var(--#{$prefix}border-color) !default;
+$nav-tabs-border-width:             var(--#{$prefix}border-width) !default;
+$nav-tabs-border-radius:            var(--#{$prefix}border-radius) !default;
+$nav-tabs-link-hover-border-color:  var(--#{$prefix}secondary-bg) var(--#{$prefix}secondary-bg) $nav-tabs-border-color !default;
+$nav-tabs-link-active-color:        var(--#{$prefix}emphasis-color) !default;
+$nav-tabs-link-active-bg:           var(--#{$prefix}body-bg) !default;
+$nav-tabs-link-active-border-color: var(--#{$prefix}border-color) var(--#{$prefix}border-color) $nav-tabs-link-active-bg !default;

-$nav-pills-border-radius:           $border-radius !default;
+$nav-pills-border-radius:           var(--#{$prefix}border-radius) !default;
 $nav-pills-link-active-color:       $component-active-color !default;
 $nav-pills-link-active-bg:          $component-active-bg !default;
+
+$nav-underline-gap:                 1rem !default;
+$nav-underline-border-width:        .125rem !default;
+$nav-underline-link-active-color:   var(--#{$prefix}emphasis-color) !default;
 // scss-docs-end nav-variables


@@ -1101,12 +1206,13 @@ $navbar-toggler-border-radius:      $btn-border-radius !default;
 $navbar-toggler-focus-width:        $btn-focus-width !default;
 $navbar-toggler-transition:         box-shadow .15s ease-in-out !default;

-$navbar-light-color:                rgba($black, .55) !default;
-$navbar-light-hover-color:          rgba($black, .7) !default;
-$navbar-light-active-color:         rgba($black, .9) !default;
-$navbar-light-disabled-color:       rgba($black, .3) !default;
-$navbar-light-toggler-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'><path stroke='#{$navbar-light-color}' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/></svg>") !default;
-$navbar-light-toggler-border-color: rgba($black, .1) !default;
+$navbar-light-color:                rgba(var(--#{$prefix}emphasis-color-rgb), .65) !default;
+$navbar-light-hover-color:          rgba(var(--#{$prefix}emphasis-color-rgb), .8) !default;
+$navbar-light-active-color:         rgba(var(--#{$prefix}emphasis-color-rgb), 1) !default;
+$navbar-light-disabled-color:       rgba(var(--#{$prefix}emphasis-color-rgb), .3) !default;
+$navbar-light-icon-color:           rgba($body-color, .75) !default;
+$navbar-light-toggler-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'><path stroke='#{$navbar-light-icon-color}' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/></svg>") !default;
+$navbar-light-toggler-border-color: rgba(var(--#{$prefix}emphasis-color-rgb), .15) !default;
 $navbar-light-brand-color:          $navbar-light-active-color !default;
 $navbar-light-brand-hover-color:    $navbar-light-active-color !default;
 // scss-docs-end navbar-variables
@@ -1116,7 +1222,8 @@ $navbar-dark-color:                 rgba($white, .55) !default;
 $navbar-dark-hover-color:           rgba($white, .75) !default;
 $navbar-dark-active-color:          $white !default;
 $navbar-dark-disabled-color:        rgba($white, .25) !default;
-$navbar-dark-toggler-icon-bg:       url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'><path stroke='#{$navbar-dark-color}' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/></svg>") !default;
+$navbar-dark-icon-color:            $navbar-dark-color !default;
+$navbar-dark-toggler-icon-bg:       url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'><path stroke='#{$navbar-dark-icon-color}' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/></svg>") !default;
 $navbar-dark-toggler-border-color:  rgba($white, .1) !default;
 $navbar-dark-brand-color:           $navbar-dark-active-color !default;
 $navbar-dark-brand-hover-color:     $navbar-dark-active-color !default;
@@ -1133,24 +1240,24 @@ $dropdown-padding-x:                0 !default;
 $dropdown-padding-y:                .5rem !default;
 $dropdown-spacer:                   .125rem !default;
 $dropdown-font-size:                $font-size-base !default;
-$dropdown-color:                    $body-color !default;
-$dropdown-bg:                       $white !default;
+$dropdown-color:                    var(--#{$prefix}body-color) !default;
+$dropdown-bg:                       var(--#{$prefix}body-bg) !default;
 $dropdown-border-color:             var(--#{$prefix}border-color-translucent) !default;
-$dropdown-border-radius:            $border-radius !default;
-$dropdown-border-width:             $border-width !default;
-$dropdown-inner-border-radius:      subtract($dropdown-border-radius, $dropdown-border-width) !default;
+$dropdown-border-radius:            var(--#{$prefix}border-radius) !default;
+$dropdown-border-width:             var(--#{$prefix}border-width) !default;
+$dropdown-inner-border-radius:      calc(#{$dropdown-border-radius} - #{$dropdown-border-width}) !default; // stylelint-disable-line function-disallowed-list
 $dropdown-divider-bg:               $dropdown-border-color !default;
 $dropdown-divider-margin-y:         $spacer * .5 !default;
-$dropdown-box-shadow:               $box-shadow !default;
+$dropdown-box-shadow:               var(--#{$prefix}box-shadow) !default;

-$dropdown-link-color:               $gray-900 !default;
-$dropdown-link-hover-color:         shade-color($dropdown-link-color, 10%) !default;
-$dropdown-link-hover-bg:            $gray-200 !default;
+$dropdown-link-color:               var(--#{$prefix}body-color) !default;
+$dropdown-link-hover-color:         $dropdown-link-color !default;
+$dropdown-link-hover-bg:            var(--#{$prefix}tertiary-bg) !default;

 $dropdown-link-active-color:        $component-active-color !default;
 $dropdown-link-active-bg:           $component-active-bg !default;

-$dropdown-link-disabled-color:      $gray-500 !default;
+$dropdown-link-disabled-color:      var(--#{$prefix}tertiary-color) !default;

 $dropdown-item-padding-y:           $spacer * .25 !default;
 $dropdown-item-padding-x:           $spacer !default;
@@ -1192,33 +1299,33 @@ $pagination-padding-x-lg:           1.5rem !default;
 $pagination-font-size:              $font-size-base !default;

 $pagination-color:                  var(--#{$prefix}link-color) !default;
-$pagination-bg:                     $white !default;
-$pagination-border-radius:          $border-radius !default;
-$pagination-border-width:           $border-width !default;
-$pagination-margin-start:           ($pagination-border-width * -1) !default;
-$pagination-border-color:           $gray-300 !default;
+$pagination-bg:                     var(--#{$prefix}body-bg) !default;
+$pagination-border-radius:          var(--#{$prefix}border-radius) !default;
+$pagination-border-width:           var(--#{$prefix}border-width) !default;
+$pagination-margin-start:           calc(-1 * #{$pagination-border-width}) !default; // stylelint-disable-line function-disallowed-list
+$pagination-border-color:           var(--#{$prefix}border-color) !default;

 $pagination-focus-color:            var(--#{$prefix}link-hover-color) !default;
-$pagination-focus-bg:               $gray-200 !default;
-$pagination-focus-box-shadow:       $input-btn-focus-box-shadow !default;
+$pagination-focus-bg:               var(--#{$prefix}secondary-bg) !default;
+$pagination-focus-box-shadow:       $focus-ring-box-shadow !default;
 $pagination-focus-outline:          0 !default;

 $pagination-hover-color:            var(--#{$prefix}link-hover-color) !default;
-$pagination-hover-bg:               $gray-200 !default;
-$pagination-hover-border-color:     $gray-300 !default;
+$pagination-hover-bg:               var(--#{$prefix}tertiary-bg) !default;
+$pagination-hover-border-color:     var(--#{$prefix}border-color) !default; // Todo in v6: remove this?

 $pagination-active-color:           $component-active-color !default;
 $pagination-active-bg:              $component-active-bg !default;
-$pagination-active-border-color:    $pagination-active-bg !default;
+$pagination-active-border-color:    $component-active-bg !default;

-$pagination-disabled-color:         $gray-600 !default;
-$pagination-disabled-bg:            $white !default;
-$pagination-disabled-border-color:  $gray-300 !default;
+$pagination-disabled-color:         var(--#{$prefix}secondary-color) !default;
+$pagination-disabled-bg:            var(--#{$prefix}secondary-bg) !default;
+$pagination-disabled-border-color:  var(--#{$prefix}border-color) !default;

 $pagination-transition:              color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;

-$pagination-border-radius-sm:       $border-radius-sm !default;
-$pagination-border-radius-lg:       $border-radius-lg !default;
+$pagination-border-radius-sm:       var(--#{$prefix}border-radius-sm) !default;
+$pagination-border-radius-lg:       var(--#{$prefix}border-radius-lg) !default;
 // scss-docs-end pagination-variables


@@ -1235,18 +1342,20 @@ $placeholder-opacity-min:           .2 !default;
 $card-spacer-y:                     $spacer !default;
 $card-spacer-x:                     $spacer !default;
 $card-title-spacer-y:               $spacer * .5 !default;
-$card-border-width:                 $border-width !default;
+$card-title-color:                  null !default;
+$card-subtitle-color:               null !default;
+$card-border-width:                 var(--#{$prefix}border-width) !default;
 $card-border-color:                 var(--#{$prefix}border-color-translucent) !default;
-$card-border-radius:                $border-radius !default;
+$card-border-radius:                var(--#{$prefix}border-radius) !default;
 $card-box-shadow:                   null !default;
 $card-inner-border-radius:          subtract($card-border-radius, $card-border-width) !default;
 $card-cap-padding-y:                $card-spacer-y * .5 !default;
 $card-cap-padding-x:                $card-spacer-x !default;
-$card-cap-bg:                       rgba($black, .03) !default;
+$card-cap-bg:                       rgba(var(--#{$prefix}body-color-rgb), .03) !default;
 $card-cap-color:                    null !default;
 $card-height:                       null !default;
 $card-color:                        null !default;
-$card-bg:                           $white !default;
+$card-bg:                           var(--#{$prefix}body-bg) !default;
 $card-img-overlay-padding:          $spacer !default;
 $card-group-margin:                 $grid-gutter-width * .5 !default;
 // scss-docs-end card-variables
@@ -1256,11 +1365,11 @@ $card-group-margin:                 $grid-gutter-width * .5 !default;
 // scss-docs-start accordion-variables
 $accordion-padding-y:                     1rem !default;
 $accordion-padding-x:                     1.25rem !default;
-$accordion-color:                         $body-color !default; // Sass variable because of $accordion-button-icon
-$accordion-bg:                            $body-bg !default;
-$accordion-border-width:                  $border-width !default;
+$accordion-color:                         var(--#{$prefix}body-color) !default;
+$accordion-bg:                            var(--#{$prefix}body-bg) !default;
+$accordion-border-width:                  var(--#{$prefix}border-width) !default;
 $accordion-border-color:                  var(--#{$prefix}border-color) !default;
-$accordion-border-radius:                 $border-radius !default;
+$accordion-border-radius:                 var(--#{$prefix}border-radius) !default;
 $accordion-inner-border-radius:           subtract($accordion-border-radius, $accordion-border-width) !default;

 $accordion-body-padding-y:                $accordion-padding-y !default;
@@ -1268,23 +1377,25 @@ $accordion-body-padding-x:                $accordion-padding-x !default;

 $accordion-button-padding-y:              $accordion-padding-y !default;
 $accordion-button-padding-x:              $accordion-padding-x !default;
-$accordion-button-color:                  $accordion-color !default;
+$accordion-button-color:                  var(--#{$prefix}body-color) !default;
 $accordion-button-bg:                     var(--#{$prefix}accordion-bg) !default;
 $accordion-transition:                    $btn-transition, border-radius .15s ease !default;
-$accordion-button-active-bg:              tint-color($component-active-bg, 90%) !default;
-$accordion-button-active-color:           shade-color($primary, 10%) !default;
+$accordion-button-active-bg:              var(--#{$prefix}primary-bg-subtle) !default;
+$accordion-button-active-color:           var(--#{$prefix}primary-text-emphasis) !default;

-$accordion-button-focus-border-color:     $input-focus-border-color !default;
+// fusv-disable
+$accordion-button-focus-border-color:     $input-focus-border-color !default; // Deprecated in v5.3.3
+// fusv-enable
 $accordion-button-focus-box-shadow:       $btn-focus-box-shadow !default;

 $accordion-icon-width:                    1.25rem !default;
-$accordion-icon-color:                    $accordion-button-color !default;
-$accordion-icon-active-color:             $accordion-button-active-color !default;
+$accordion-icon-color:                    $body-color !default;
+$accordion-icon-active-color:             $primary-text-emphasis !default;
 $accordion-icon-transition:               transform .2s ease-in-out !default;
 $accordion-icon-transform:                rotate(-180deg) !default;

-$accordion-button-icon:         url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-color}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>") !default;
-$accordion-button-active-icon:  url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-active-color}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>") !default;
+$accordion-button-icon:         url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='#{$accordion-icon-color}' stroke-linecap='round' stroke-linejoin='round'><path d='m2 5 6 6 6-6'/></svg>") !default;
+$accordion-button-active-icon:  url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='#{$accordion-icon-active-color}' stroke-linecap='round' stroke-linejoin='round'><path d='m2 5 6 6 6-6'/></svg>") !default;
 // scss-docs-end accordion-variables

 // Tooltips
@@ -1292,9 +1403,9 @@ $accordion-button-active-icon:  url("data:image/svg+xml,<svg xmlns='http://www.w
 // scss-docs-start tooltip-variables
 $tooltip-font-size:                 $font-size-sm !default;
 $tooltip-max-width:                 200px !default;
-$tooltip-color:                     $white !default;
-$tooltip-bg:                        $black !default;
-$tooltip-border-radius:             $border-radius !default;
+$tooltip-color:                     var(--#{$prefix}body-bg) !default;
+$tooltip-bg:                        var(--#{$prefix}emphasis-color) !default;
+$tooltip-border-radius:             var(--#{$prefix}border-radius) !default;
 $tooltip-opacity:                   .9 !default;
 $tooltip-padding-y:                 $spacer * .25 !default;
 $tooltip-padding-x:                 $spacer * .5 !default;
@@ -1322,21 +1433,21 @@ $form-feedback-tooltip-border-radius: $tooltip-border-radius !default;

 // scss-docs-start popover-variables
 $popover-font-size:                 $font-size-sm !default;
-$popover-bg:                        $white !default;
+$popover-bg:                        var(--#{$prefix}body-bg) !default;
 $popover-max-width:                 276px !default;
-$popover-border-width:              $border-width !default;
+$popover-border-width:              var(--#{$prefix}border-width) !default;
 $popover-border-color:              var(--#{$prefix}border-color-translucent) !default;
-$popover-border-radius:             $border-radius-lg !default;
-$popover-inner-border-radius:       subtract($popover-border-radius, $popover-border-width) !default;
-$popover-box-shadow:                $box-shadow !default;
+$popover-border-radius:             var(--#{$prefix}border-radius-lg) !default;
+$popover-inner-border-radius:       calc(#{$popover-border-radius} - #{$popover-border-width}) !default; // stylelint-disable-line function-disallowed-list
+$popover-box-shadow:                var(--#{$prefix}box-shadow) !default;

 $popover-header-font-size:          $font-size-base !default;
-$popover-header-bg:                 shade-color($popover-bg, 6%) !default;
+$popover-header-bg:                 var(--#{$prefix}secondary-bg) !default;
 $popover-header-color:              $headings-color !default;
 $popover-header-padding-y:          .5rem !default;
 $popover-header-padding-x:          $spacer !default;

-$popover-body-color:                $body-color !default;
+$popover-body-color:                var(--#{$prefix}body-color) !default;
 $popover-body-padding-y:            $spacer !default;
 $popover-body-padding-x:            $spacer !default;

@@ -1359,16 +1470,16 @@ $toast-padding-x:                   .75rem !default;
 $toast-padding-y:                   .5rem !default;
 $toast-font-size:                   .875rem !default;
 $toast-color:                       null !default;
-$toast-background-color:            rgba($white, .85) !default;
-$toast-border-width:                $border-width !default;
+$toast-background-color:            rgba(var(--#{$prefix}body-bg-rgb), .85) !default;
+$toast-border-width:                var(--#{$prefix}border-width) !default;
 $toast-border-color:                var(--#{$prefix}border-color-translucent) !default;
-$toast-border-radius:               $border-radius !default;
-$toast-box-shadow:                  $box-shadow !default;
+$toast-border-radius:               var(--#{$prefix}border-radius) !default;
+$toast-box-shadow:                  var(--#{$prefix}box-shadow) !default;
 $toast-spacing:                     $container-padding-x !default;

-$toast-header-color:                $gray-600 !default;
-$toast-header-background-color:     rgba($white, .85) !default;
-$toast-header-border-color:         rgba($black, .05) !default;
+$toast-header-color:                var(--#{$prefix}secondary-color) !default;
+$toast-header-background-color:     rgba(var(--#{$prefix}body-bg-rgb), .85) !default;
+$toast-header-border-color:         $toast-border-color !default;
 // scss-docs-end toast-variables


@@ -1380,7 +1491,7 @@ $badge-font-weight:                 $font-weight-bold !default;
 $badge-color:                       $white !default;
 $badge-padding-y:                   .35em !default;
 $badge-padding-x:                   .65em !default;
-$badge-border-radius:               $border-radius !default;
+$badge-border-radius:               var(--#{$prefix}border-radius) !default;
 // scss-docs-end badge-variables


@@ -1396,14 +1507,14 @@ $modal-dialog-margin-y-sm-up:       1.75rem !default;

 $modal-title-line-height:           $line-height-base !default;

-$modal-content-color:               null !default;
-$modal-content-bg:                  $white !default;
+$modal-content-color:               var(--#{$prefix}body-color) !default;
+$modal-content-bg:                  var(--#{$prefix}body-bg) !default;
 $modal-content-border-color:        var(--#{$prefix}border-color-translucent) !default;
-$modal-content-border-width:        $border-width !default;
-$modal-content-border-radius:       $border-radius-lg !default;
+$modal-content-border-width:        var(--#{$prefix}border-width) !default;
+$modal-content-border-radius:       var(--#{$prefix}border-radius-lg) !default;
 $modal-content-inner-border-radius: subtract($modal-content-border-radius, $modal-content-border-width) !default;
-$modal-content-box-shadow-xs:       $box-shadow-sm !default;
-$modal-content-box-shadow-sm-up:    $box-shadow !default;
+$modal-content-box-shadow-xs:       var(--#{$prefix}box-shadow-sm) !default;
+$modal-content-box-shadow-sm-up:    var(--#{$prefix}box-shadow) !default;

 $modal-backdrop-bg:                 $black !default;
 $modal-backdrop-opacity:            .5 !default;
@@ -1438,24 +1549,26 @@ $modal-scale-transform:             scale(1.02) !default;
 $alert-padding-y:               $spacer !default;
 $alert-padding-x:               $spacer !default;
 $alert-margin-bottom:           1rem !default;
-$alert-border-radius:           $border-radius !default;
+$alert-border-radius:           var(--#{$prefix}border-radius) !default;
 $alert-link-font-weight:        $font-weight-bold !default;
-$alert-border-width:            $border-width !default;
-$alert-bg-scale:                -80% !default;
-$alert-border-scale:            -70% !default;
-$alert-color-scale:             40% !default;
+$alert-border-width:            var(--#{$prefix}border-width) !default;
 $alert-dismissible-padding-r:   $alert-padding-x * 3 !default; // 3x covers width of x plus default padding on either side
 // scss-docs-end alert-variables

+// fusv-disable
+$alert-bg-scale:                -80% !default; // Deprecated in v5.2.0, to be removed in v6
+$alert-border-scale:            -70% !default; // Deprecated in v5.2.0, to be removed in v6
+$alert-color-scale:             40% !default; // Deprecated in v5.2.0, to be removed in v6
+// fusv-enable

 // Progress bars

 // scss-docs-start progress-variables
 $progress-height:                   1rem !default;
 $progress-font-size:                $font-size-base * .75 !default;
-$progress-bg:                       $gray-200 !default;
-$progress-border-radius:            $border-radius !default;
-$progress-box-shadow:               $box-shadow-inset !default;
+$progress-bg:                       var(--#{$prefix}secondary-bg) !default;
+$progress-border-radius:            var(--#{$prefix}border-radius) !default;
+$progress-box-shadow:               var(--#{$prefix}box-shadow-inset) !default;
 $progress-bar-color:                $white !default;
 $progress-bar-bg:                   $primary !default;
 $progress-bar-animation-timing:     1s linear infinite !default;
@@ -1466,30 +1579,32 @@ $progress-bar-transition:           width .6s ease !default;
 // List group

 // scss-docs-start list-group-variables
-$list-group-color:                  $gray-900 !default;
-$list-group-bg:                     $white !default;
-$list-group-border-color:           rgba($black, .125) !default;
-$list-group-border-width:           $border-width !default;
-$list-group-border-radius:          $border-radius !default;
+$list-group-color:                  var(--#{$prefix}body-color) !default;
+$list-group-bg:                     var(--#{$prefix}body-bg) !default;
+$list-group-border-color:           var(--#{$prefix}border-color) !default;
+$list-group-border-width:           var(--#{$prefix}border-width) !default;
+$list-group-border-radius:          var(--#{$prefix}border-radius) !default;

 $list-group-item-padding-y:         $spacer * .5 !default;
 $list-group-item-padding-x:         $spacer !default;
-$list-group-item-bg-scale:          -80% !default;
-$list-group-item-color-scale:       40% !default;
+// fusv-disable
+$list-group-item-bg-scale:          -80% !default; // Deprecated in v5.3.0
+$list-group-item-color-scale:       40% !default; // Deprecated in v5.3.0
+// fusv-enable

-$list-group-hover-bg:               $gray-100 !default;
+$list-group-hover-bg:               var(--#{$prefix}tertiary-bg) !default;
 $list-group-active-color:           $component-active-color !default;
 $list-group-active-bg:              $component-active-bg !default;
 $list-group-active-border-color:    $list-group-active-bg !default;

-$list-group-disabled-color:         $gray-600 !default;
+$list-group-disabled-color:         var(--#{$prefix}secondary-color) !default;
 $list-group-disabled-bg:            $list-group-bg !default;

-$list-group-action-color:           $gray-700 !default;
-$list-group-action-hover-color:     $list-group-action-color !default;
+$list-group-action-color:           var(--#{$prefix}secondary-color) !default;
+$list-group-action-hover-color:     var(--#{$prefix}emphasis-color) !default;

-$list-group-action-active-color:    $body-color !default;
-$list-group-action-active-bg:       $gray-200 !default;
+$list-group-action-active-color:    var(--#{$prefix}body-color) !default;
+$list-group-action-active-bg:       var(--#{$prefix}secondary-bg) !default;
 // scss-docs-end list-group-variables


@@ -1497,11 +1612,11 @@ $list-group-action-active-bg:       $gray-200 !default;

 // scss-docs-start thumbnail-variables
 $thumbnail-padding:                 .25rem !default;
-$thumbnail-bg:                      $body-bg !default;
-$thumbnail-border-width:            $border-width !default;
+$thumbnail-bg:                      var(--#{$prefix}body-bg) !default;
+$thumbnail-border-width:            var(--#{$prefix}border-width) !default;
 $thumbnail-border-color:            var(--#{$prefix}border-color) !default;
-$thumbnail-border-radius:           $border-radius !default;
-$thumbnail-box-shadow:              $box-shadow-sm !default;
+$thumbnail-border-radius:           var(--#{$prefix}border-radius) !default;
+$thumbnail-box-shadow:              var(--#{$prefix}box-shadow-sm) !default;
 // scss-docs-end thumbnail-variables


@@ -1509,7 +1624,7 @@ $thumbnail-box-shadow:              $box-shadow-sm !default;

 // scss-docs-start figure-variables
 $figure-caption-font-size:          $small-font-size !default;
-$figure-caption-color:              $gray-600 !default;
+$figure-caption-color:              var(--#{$prefix}secondary-color) !default;
 // scss-docs-end figure-variables


@@ -1522,8 +1637,8 @@ $breadcrumb-padding-x:              0 !default;
 $breadcrumb-item-padding-x:         .5rem !default;
 $breadcrumb-margin-bottom:          1rem !default;
 $breadcrumb-bg:                     null !default;
-$breadcrumb-divider-color:          $gray-600 !default;
-$breadcrumb-active-color:           $gray-600 !default;
+$breadcrumb-divider-color:          var(--#{$prefix}secondary-color) !default;
+$breadcrumb-active-color:           var(--#{$prefix}secondary-color) !default;
 $breadcrumb-divider:                quote("/") !default;
 $breadcrumb-divider-flipped:        $breadcrumb-divider !default;
 $breadcrumb-border-radius:          null !default;
@@ -1537,6 +1652,7 @@ $carousel-control-width:             15% !default;
 $carousel-control-opacity:           .5 !default;
 $carousel-control-hover-opacity:     .9 !default;
 $carousel-control-transition:        opacity .15s ease !default;
+$carousel-control-icon-filter:       null !default;

 $carousel-indicator-width:           30px !default;
 $carousel-indicator-height:          3px !default;
@@ -1554,17 +1670,17 @@ $carousel-caption-spacer:            1.25rem !default;

 $carousel-control-icon-width:        2rem !default;

-$carousel-control-prev-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$carousel-control-color}'><path d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'/></svg>") !default;
-$carousel-control-next-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$carousel-control-color}'><path d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z'/></svg>") !default;
+$carousel-control-prev-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$carousel-control-color}'><path d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0'/></svg>") !default;
+$carousel-control-next-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$carousel-control-color}'><path d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708'/></svg>") !default;

 $carousel-transition-duration:       .6s !default;
 $carousel-transition:                transform $carousel-transition-duration ease-in-out !default; // Define transform transition first if using multiple transitions (e.g., `transform 2s ease, opacity .5s ease-out`)
 // scss-docs-end carousel-variables

 // scss-docs-start carousel-dark-variables
-$carousel-dark-indicator-active-bg:  $black !default;
-$carousel-dark-caption-color:        $black !default;
-$carousel-dark-control-icon-filter:  invert(1) grayscale(100) !default;
+$carousel-dark-indicator-active-bg:  $black !default; // Deprecated in v5.3.4
+$carousel-dark-caption-color:        $black !default; // Deprecated in v5.3.4
+$carousel-dark-control-icon-filter:  invert(1) grayscale(100) !default; // Deprecated in v5.3.4
 // scss-docs-end carousel-dark-variables


@@ -1591,13 +1707,14 @@ $btn-close-height:           $btn-close-width !default;
 $btn-close-padding-x:        .25em !default;
 $btn-close-padding-y:        $btn-close-padding-x !default;
 $btn-close-color:            $black !default;
-$btn-close-bg:               url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$btn-close-color}'><path d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/></svg>") !default;
-$btn-close-focus-shadow:     $input-btn-focus-box-shadow !default;
+$btn-close-bg:               url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$btn-close-color}'><path d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414'/></svg>") !default;
+$btn-close-focus-shadow:     $focus-ring-box-shadow !default;
 $btn-close-opacity:          .5 !default;
 $btn-close-hover-opacity:    .75 !default;
 $btn-close-focus-opacity:    1 !default;
 $btn-close-disabled-opacity: .25 !default;
-$btn-close-white-filter:     invert(1) grayscale(100%) brightness(200%) !default;
+$btn-close-filter:           null !default;
+$btn-close-white-filter:     invert(1) grayscale(100%) brightness(200%) !default; // Deprecated in v5.3.4
 // scss-docs-end close-variables


@@ -1612,8 +1729,8 @@ $offcanvas-transition-duration:     .3s !default;
 $offcanvas-border-color:            $modal-content-border-color !default;
 $offcanvas-border-width:            $modal-content-border-width !default;
 $offcanvas-title-line-height:       $modal-title-line-height !default;
-$offcanvas-bg-color:                $modal-content-bg !default;
-$offcanvas-color:                   $modal-content-color !default;
+$offcanvas-bg-color:                var(--#{$prefix}body-bg) !default;
+$offcanvas-color:                   var(--#{$prefix}body-color) !default;
 $offcanvas-box-shadow:              $modal-content-box-shadow-xs !default;
 $offcanvas-backdrop-bg:             $modal-backdrop-bg !default;
 $offcanvas-backdrop-opacity:        $modal-backdrop-opacity !default;
@@ -1632,3 +1749,5 @@ $kbd-bg:                            var(--#{$prefix}body-color) !default;
 $nested-kbd-font-weight:            null !default; // Deprecated in v5.2.0, removing in v6

 $pre-color:                         null !default;
+
+@import "variables-dark"; // TODO: can be removed safely in v6, only here to avoid breaking changes in v5.3
@@ -5,9 +5,9 @@ $include-column-box-sizing: true !default;

@import "functions";
@import "variables";
+@import "variables-dark";
@import "maps";

-@import "mixins/lists";
@import "mixins/breakpoints";
@import "mixins/container";
@import "mixins/grid";
@@ -15,8 +15,6 @@ $include-column-box-sizing: true !default;

@import "vendor/rfs";

-@import "root";
-
@import "containers";
@import "grid";

@@ -3,6 +3,7 @@

@import "functions";
@import "variables";
+@import "variables-dark";
@import "maps";
@import "mixins";
@import "root";
@@ -4,6 +4,7 @@
 // Configuration
@import "functions";
@import "variables";
+@import "variables-dark";
@import "maps";
@import "mixins";
@import "utilities";
@@ -6,6 +6,7 @@
 // Configuration
@import "functions";
@import "variables";
+@import "variables-dark";
@import "maps";
@import "mixins";
@import "utilities";
@@ -5,6 +5,7 @@
  > .form-control-plaintext,
  > .form-select {
    height: $form-floating-height;
+    min-height: $form-floating-height;
    line-height: $form-floating-line-height;
  }

@@ -12,10 +13,12 @@
    position: absolute;
    top: 0;
    left: 0;
-    width: 100%;
+    z-index: 2;
+    max-width: 100%;
    height: 100%; // allow textareas
    padding: $form-floating-padding-y $form-floating-padding-x;
    overflow: hidden;
+    color: rgba(var(--#{$prefix}body-color-rgb), #{$form-floating-label-opacity});
    text-align: start;
    text-overflow: ellipsis;
    white-space: nowrap;
@@ -48,6 +51,7 @@
  > .form-select {
    padding-top: $form-floating-input-padding-t;
    padding-bottom: $form-floating-input-padding-b;
+    padding-left: $form-floating-padding-x;
  }

  > .form-control:focus,
@@ -55,21 +59,39 @@
  > .form-control-plaintext,
  > .form-select {
    ~ label {
-      opacity: $form-floating-label-opacity;
      transform: $form-floating-label-transform;
    }
  }
  // Duplicated because `:-webkit-autofill` invalidates other selectors when grouped
  > .form-control:-webkit-autofill {
    ~ label {
-      opacity: $form-floating-label-opacity;
      transform: $form-floating-label-transform;
    }
  }
+  > textarea:focus,
+  > textarea:not(:placeholder-shown) {
+    ~ label::after {
+      position: absolute;
+      inset: $form-floating-padding-y ($form-floating-padding-x * .5);
+      z-index: -1;
+      height: $form-floating-label-height;
+      content: "";
+      background-color: $input-bg;
+      @include border-radius($input-border-radius);
+    }
+  }
+  > textarea:disabled ~ label::after {
+    background-color: $input-disabled-bg;
+  }

  > .form-control-plaintext {
    ~ label {
      border-width: $input-border-width 0; // Required to properly position label text - as explained above
    }
  }
+
+  > :disabled ~ label,
+  > .form-control:disabled ~ label { // Required for `.form-control`s because of specificity
+    color: $form-floating-label-disabled-color;
+  }
 }
@@ -27,16 +27,20 @@
 }

 .form-check-input {
+  --#{$prefix}form-check-bg: #{$form-check-input-bg};
+
+  flex-shrink: 0;
  width: $form-check-input-width;
  height: $form-check-input-width;
  margin-top: ($line-height-base - $form-check-input-width) * .5; // line-height minus check height
  vertical-align: top;
-  background-color: $form-check-input-bg;
+  appearance: none;
+  background-color: var(--#{$prefix}form-check-bg);
+  background-image: var(--#{$prefix}form-check-bg-image);
  background-repeat: no-repeat;
  background-position: center;
  background-size: contain;
  border: $form-check-input-border;
-  appearance: none;
  print-color-adjust: exact; // Keep themed appearance for print
  @include transition($form-check-transition);

@@ -65,17 +69,17 @@

    &[type="checkbox"] {
      @if $enable-gradients {
-        background-image: escape-svg($form-check-input-checked-bg-image), var(--#{$prefix}gradient);
+        --#{$prefix}form-check-bg-image: #{escape-svg($form-check-input-checked-bg-image)}, var(--#{$prefix}gradient);
      } @else {
-        background-image: escape-svg($form-check-input-checked-bg-image);
+        --#{$prefix}form-check-bg-image: #{escape-svg($form-check-input-checked-bg-image)};
      }
    }

    &[type="radio"] {
      @if $enable-gradients {
-        background-image: escape-svg($form-check-radio-checked-bg-image), var(--#{$prefix}gradient);
+        --#{$prefix}form-check-bg-image: #{escape-svg($form-check-radio-checked-bg-image)}, var(--#{$prefix}gradient);
      } @else {
-        background-image: escape-svg($form-check-radio-checked-bg-image);
+        --#{$prefix}form-check-bg-image: #{escape-svg($form-check-radio-checked-bg-image)};
      }
    }
  }
@@ -85,9 +89,9 @@
    border-color: $form-check-input-indeterminate-border-color;

    @if $enable-gradients {
-      background-image: escape-svg($form-check-input-indeterminate-bg-image), var(--#{$prefix}gradient);
+      --#{$prefix}form-check-bg-image: #{escape-svg($form-check-input-indeterminate-bg-image)}, var(--#{$prefix}gradient);
    } @else {
-      background-image: escape-svg($form-check-input-indeterminate-bg-image);
+      --#{$prefix}form-check-bg-image: #{escape-svg($form-check-input-indeterminate-bg-image)};
    }
  }

@@ -121,24 +125,26 @@
  padding-left: $form-switch-padding-start;

  .form-check-input {
+    --#{$prefix}form-switch-bg: #{escape-svg($form-switch-bg-image)};
+
    width: $form-switch-width;
    margin-left: $form-switch-padding-start * -1;
-    background-image: escape-svg($form-switch-bg-image);
+    background-image: var(--#{$prefix}form-switch-bg);
    background-position: left center;
-    @include border-radius($form-switch-border-radius);
+    @include border-radius($form-switch-border-radius, 0);
    @include transition($form-switch-transition);

    &:focus {
-      background-image: escape-svg($form-switch-focus-bg-image);
+      --#{$prefix}form-switch-bg: #{escape-svg($form-switch-focus-bg-image)};
    }

    &:checked {
      background-position: $form-switch-checked-bg-position;

      @if $enable-gradients {
-        background-image: escape-svg($form-switch-checked-bg-image), var(--#{$prefix}gradient);
+        --#{$prefix}form-switch-bg: #{escape-svg($form-switch-checked-bg-image)}, var(--#{$prefix}gradient);
      } @else {
-        background-image: escape-svg($form-switch-checked-bg-image);
+        --#{$prefix}form-switch-bg: #{escape-svg($form-switch-checked-bg-image)};
      }
    }
  }
@@ -173,3 +179,11 @@
    }
  }
 }
+
+@if $enable-dark-mode {
+  @include color-mode(dark) {
+    .form-switch .form-check-input:not(:checked):not(:focus) {
+      --#{$prefix}form-switch-bg: #{escape-svg($form-switch-bg-image-dark)};
+    }
+  }
+}
@@ -11,10 +11,10 @@
  font-weight: $input-font-weight;
  line-height: $input-line-height;
  color: $input-color;
+  appearance: none; // Fix appearance for date inputs in Safari
  background-color: $input-bg;
  background-clip: padding-box;
  border: $input-border-width solid $input-border-color;
-  appearance: none; // Fix appearance for date inputs in Safari

  // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
  @include border-radius($input-border-radius, 0);
@@ -44,12 +44,31 @@
    }
  }

-  // Add some height to date inputs on iOS
-  // https://github.com/twbs/bootstrap/issues/23307
-  // TODO: we can remove this workaround once https://bugs.webkit.org/show_bug.cgi?id=198959 is resolved
  &::-webkit-date-and-time-value {
+    // On Android Chrome, form-control's "width: 100%" makes the input width too small
+    // Tested under Android 11 / Chrome 89, Android 12 / Chrome 100, Android 13 / Chrome 109
+    //
+    // On iOS Safari, form-control's "appearance: none" + "width: 100%" makes the input width too small
+    // Tested under iOS 16.2 / Safari 16.2
+    min-width: 85px; // Seems to be a good minimum safe width
+
+    // Add some height to date inputs on iOS
+    // https://github.com/twbs/bootstrap/issues/23307
+    // TODO: we can remove this workaround once https://bugs.webkit.org/show_bug.cgi?id=198959 is resolved
    // Multiply line-height by 1em if it has no unit
    height: if(unit($input-line-height) == "", $input-line-height * 1em, $input-line-height);
+
+    // Android Chrome type="date" is taller than the other inputs
+    // because of "margin: 1px 24px 1px 4px" inside the shadow DOM
+    // Tested under Android 11 / Chrome 89, Android 12 / Chrome 100, Android 13 / Chrome 109
+    margin: 0;
+  }
+
+  // Prevent excessive date input height in Webkit
+  // https://github.com/twbs/bootstrap/issues/34433
+  &::-webkit-datetime-edit {
+    display: block;
+    padding: 0;
  }

  // Placeholder
@@ -186,6 +205,7 @@ textarea {
  }

  &::-webkit-color-swatch {
+    border: 0 !important; // stylelint-disable-line declaration-no-important
    @include border-radius($input-border-radius);
  }

@@ -8,8 +8,8 @@
  width: 100%;
  height: add($form-range-thumb-height, $form-range-thumb-focus-box-shadow-width * 2);
  padding: 0; // Need to reset padding
-  background-color: transparent;
  appearance: none;
+  background-color: transparent;

  &:focus {
    outline: 0;
@@ -28,12 +28,12 @@
    width: $form-range-thumb-width;
    height: $form-range-thumb-height;
    margin-top: ($form-range-track-height - $form-range-thumb-height) * .5; // Webkit specific
+    appearance: none;
    @include gradient-bg($form-range-thumb-bg);
    border: $form-range-thumb-border;
    @include border-radius($form-range-thumb-border-radius);
    @include box-shadow($form-range-thumb-box-shadow);
    @include transition($form-range-thumb-transition);
-    appearance: none;

    &:active {
      @include gradient-bg($form-range-thumb-active-bg);
@@ -54,12 +54,12 @@
  &::-moz-range-thumb {
    width: $form-range-thumb-width;
    height: $form-range-thumb-height;
+    appearance: none;
    @include gradient-bg($form-range-thumb-bg);
    border: $form-range-thumb-border;
    @include border-radius($form-range-thumb-border-radius);
    @include box-shadow($form-range-thumb-box-shadow);
    @include transition($form-range-thumb-transition);
-    appearance: none;

    &:active {
      @include gradient-bg($form-range-thumb-active-bg);
@@ -4,17 +4,19 @@
 // https://primer.github.io/.

 .form-select {
+  --#{$prefix}form-select-bg-img: #{escape-svg($form-select-indicator)};
+
  display: block;
  width: 100%;
  padding: $form-select-padding-y $form-select-indicator-padding $form-select-padding-y $form-select-padding-x;
-  -moz-padding-start: subtract($form-select-padding-x, 3px); // See https://github.com/twbs/bootstrap/issues/32636
  font-family: $form-select-font-family;
  @include font-size($form-select-font-size);
  font-weight: $form-select-font-weight;
  line-height: $form-select-line-height;
  color: $form-select-color;
+  appearance: none;
  background-color: $form-select-bg;
-  background-image: escape-svg($form-select-indicator);
+  background-image: var(--#{$prefix}form-select-bg-img), var(--#{$prefix}form-select-bg-icon, none);
  background-repeat: no-repeat;
  background-position: $form-select-bg-position;
  background-size: $form-select-bg-size;
@@ -22,7 +24,6 @@
  @include border-radius($form-select-border-radius, 0);
  @include box-shadow($form-select-box-shadow);
  @include transition($form-select-transition);
-  appearance: none;

  &:focus {
    border-color: $form-select-focus-border-color;
@@ -69,3 +70,11 @@
  @include font-size($form-select-font-size-lg);
  @include border-radius($form-select-border-radius-lg);
 }
+
+@if $enable-dark-mode {
+  @include color-mode(dark) {
+    .form-select {
+      --#{$prefix}form-select-bg-img: #{escape-svg($form-select-indicator-dark)};
+    }
+  }
+}
@@ -121,7 +121,7 @@
  }

  > :not(:first-child):not(.dropdown-menu)#{$validation-messages} {
-    margin-left: -$input-border-width;
+    margin-left: calc(-1 * #{$input-border-width}); // stylelint-disable-line function-disallowed-list
    @include border-start-radius(0);
  }

@@ -1,10 +1,7 @@
-// stylelint-disable function-name-case
-
 // All-caps `RGBA()` function used because of this Sass bug: https://github.com/sass/node-sass/issues/2251
@each $color, $value in $theme-colors {
-  $color-rgb: to-rgb($value);
  .text-bg-#{$color} {
    color: color-contrast($value) if($enable-important-utilities, !important, null);
-    background-color: RGBA($color-rgb, var(--#{$prefix}bg-opacity, 1)) if($enable-important-utilities, !important, null);
+    background-color: RGBA(var(--#{$prefix}#{$color}-rgb), var(--#{$prefix}bg-opacity, 1)) if($enable-important-utilities, !important, null);
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Samuele Locatelli	d6f5e71b4d	Merge branch 'develop'	2026-05-05 11:20:58 +02:00
Samuele Locatelli	c3c0ecfcf9	Merge branch 'main' into develop	2026-05-05 11:20:51 +02:00
Samuele Locatelli	aff6fffb1f	Merge tag 'AddCustomBootstrapDialog' into develop Aggiunto componente BlazorDialog	2026-05-05 11:20:43 +02:00
Samuele Locatelli	9aaafece6a	fix test vecchio customdialog eliminato	2026-05-05 11:20:29 +02:00
Samuele Locatelli	fbeaba90ac	Merge branch 'release/AddCustomBootstrapDialog'	2026-05-05 11:19:49 +02:00
Samuele Locatelli	aaab18910b	Pulzia	2026-05-05 11:19:22 +02:00
Samuele Locatelli	1936d43a04	Update componente BlazorDialog	2026-05-05 11:19:03 +02:00
Samuele Locatelli	b347b975bc	Spostato componente in librery...	2026-05-05 10:36:55 +02:00
Samuele Locatelli	aa2719c9eb	Aggiunto componente Bootstrap modale	2026-05-05 10:34:12 +02:00
Samuele Locatelli	7433f6a676	update customDialog	2026-05-05 10:18:37 +02:00
Samuele Locatelli	12b43c52c9	Aggiunta custom dialog(in testing)	2026-05-05 10:18:27 +02:00
Samuele Locatelli	08bd55d759	Merge tag 'AddProgressPareto_01' into develop Aggiunta progressbar pareto nei componenti	2026-05-04 12:25:35 +02:00
Samuele Locatelli	5dfa7cc717	Merge branch 'release/AddProgressPareto_01'	2026-05-04 12:25:24 +02:00
Samuele Locatelli	bad3deff3a	Aggiunta componente progress pareto semaforico	2026-05-04 12:25:04 +02:00
Samuele Locatelli	4d7632b64a	Merge tag 'AddInputDouble' into develop Aggiiunta componente double vs decimal	2025-11-03 12:28:50 +01:00
Samuele Locatelli	13afd3f482	Merge branch 'release/AddInputDouble'	2025-11-03 12:28:34 +01:00
Samuele Locatelli	f6f68d84a8	Aggiunto anche componente esplicito x double oltre che x decimals	2025-11-03 12:28:11 +01:00
Samuele Locatelli	dd52c1d8f5	Merge tag 'AddInputSpecialCompo' into develop Aggiunta componenti input smart x decimal e percentage + dict comparer	2025-11-03 11:12:32 +01:00
Samuele Locatelli	fcba37ca40	Merge branch 'release/AddInputSpecialCompo'	2025-11-03 11:12:12 +01:00
Samuele Locatelli	95eae4756e	update pagina test componenti	2025-11-03 11:04:47 +01:00
Samuele Locatelli	de50098ac6	Aggiunta utils x comparatore dizionario	2025-11-03 11:03:55 +01:00
Samuele Locatelli	898a576812	Aggiunta componenti input decimale e percentuale	2025-11-03 11:03:45 +01:00
Samuele Locatelli	e0523bce40	Merge tag 'AddFileHelper_01' into develop Aggiunta file helper calcolo size con unità di misura	2025-10-06 10:36:26 +02:00
Samuele Locatelli	a33f1d1251	Merge branch 'release/AddFileHelper_01'	2025-10-06 10:36:12 +02:00
Samuele Locatelli	74fcc0b096	Aggiunto helper x calcolo/display dimensione files	2025-10-06 10:35:45 +02:00
Samuele Locatelli	59f15c6c74	Merge tag 'AddMultiButton_01' into develop Aggiunta elemento multi-button tra i componenti Razor	2025-07-18 15:33:32 +02:00
Samuele Locatelli	ec68a41e93	Merge branch 'release/AddMultiButton_01'	2025-07-18 15:33:13 +02:00
Samuele Locatelli	8fd14ba2da	Aggiunta componente MultiButton	2025-07-18 15:32:45 +02:00
Samuele Locatelli	9a129e7f57	Merge tag 'UpdateSorter_01' into develop Update sorter (e conf relative)	2025-06-30 19:43:36 +02:00
Samuele Locatelli	6f56cd6758	Merge branch 'release/UpdateSorter_01'	2025-06-30 19:43:27 +02:00
Samuele Locatelli	3aee8ec236	Update sorter	2025-06-30 19:43:01 +02:00
Samuele Locatelli	d74687ec5c	Merge tag 'MoveXZingUtilsCompo_02' into develop Update compoenti XZing + eliminazione file esclusi da utils	2025-04-09 07:40:14 +02:00
Samuele Locatelli	c786587a36	Merge branch 'release/MoveXZingUtilsCompo_02'	2025-04-09 07:39:54 +02:00
Samuele Locatelli	0dc136e0f3	Rimozione file inutilizzati	2025-04-09 07:39:42 +02:00
Samuele Locatelli	ecc84f119c	Update versione JS XZing x barcode	2025-04-09 07:37:23 +02:00
Samuele Locatelli	3768a9de85	Merge tag 'CalMonthFixHeight_01' into develop Update grafico componente calendario x evitare height 100%	2025-04-01 08:18:07 +02:00
Samuele Locatelli	4369352269	Merge branch 'release/CalMonthFixHeight_01'	2025-04-01 08:10:11 +02:00
Samuele Locatelli	4b7407019e	Update calendario x non avere height 100%	2025-04-01 08:09:24 +02:00
Samuele Locatelli	bd39ba1584	Merge tag 'MoveXZingUtilsCompo_01' into develop Update rimozione riferimento XZing	2025-03-14 10:08:37 +01:00
Samuele Locatelli	67d213eb79	Merge branch 'release/MoveXZingUtilsCompo_01'	2025-03-14 10:06:18 +01:00
Samuele Locatelli	33e84a30ed	update componenti, spostamento codice XZing	2025-03-14 10:03:39 +01:00
Samuele Locatelli	0be5ee5130	Merge tag 'AddNetInfo_01' into develop Aggiunta ulteriori netinfo (IP) + test	2025-01-17 16:11:02 +01:00
Samuele Locatelli	373ecc60d9	Merge branch 'release/AddNetInfo_01'	2025-01-17 16:10:49 +01:00
Samuele Locatelli	828460e317	Aggiunta nuove info x IP	2025-01-17 16:10:19 +01:00
Samuele Locatelli	027bda3cef	Merge tag 'UpdateSorterComp_01' into develop Modifica comportamento parametri sorter x update	2025-01-15 08:59:25 +01:00
Samuele Locatelli	d20760d645	Merge branch 'release/UpdateSorterComp_01'	2025-01-15 08:58:56 +01:00
Samuele Locatelli	5540fa9226	Update gestione eventi sorter	2025-01-15 08:58:29 +01:00
Samuele Locatelli	c12733570d	Merge tag 'FixDoughnot_02' into develop Impostazione parametrica x bordo Doughnut	2025-01-13 18:07:32 +01:00
Samuele Locatelli	ce38fedfaf	Merge branch 'release/FixDoughnot_02'	2025-01-13 18:07:22 +01:00
Samuele Locatelli	0843df6929	Aggiunta gestione bordo parametrico	2025-01-13 18:07:10 +01:00
Samuele Locatelli	a9853c1e46	Merge tag 'FixDoughnot_01' into develop Fix gestione display doughnut con spessore bordo visibile	2025-01-13 18:05:41 +01:00
Samuele Locatelli	07299178c8	Merge branch 'release/FixDoughnot_01'	2025-01-13 18:05:13 +01:00
Samuele Locatelli	fa4480836f	Update visualizzazione Doughnut: aggiunto spessore bordo	2025-01-13 18:04:39 +01:00
Samuele Locatelli	f4a405f293	Merge tag 'FixPeriodoMonth_01' into develop Fix gestione periodo mensile a dicembre con addmonth finale	2024-12-27 18:31:09 +01:00
Samuele Locatelli	e0f94fda68	Merge branch 'release/FixPeriodoMonth_01'	2024-12-27 18:30:42 +01:00
Samuele Locatelli	0b29326d55	Bozza aggiunta funzioni x dwnload update	2024-12-27 18:30:04 +01:00
Samuele Locatelli	13dff4f2c5	Correzione calcolo date sul finire anno (13° mese...)	2024-12-27 18:29:54 +01:00