diff --git a/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs
index 991094306b7..87ed30b2032 100644
--- a/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs
+++ b/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs
@@ -604,11 +604,6 @@ void AddData(DemoMenuItem item)
                     Url = "list-view"
                 },
                 new()
-                {
-                    Text = Localizer["Locator"],
-                    Url = "locator"
-                },
-                new()
                 {
                     Text = Localizer["ImageViewer"],
                     Url = "image-viewer"
@@ -1301,6 +1296,11 @@ void AddServices(DemoMenuItem item)
                     Url = "html-renderer"
                 },
                 new()
+                {
+                    Text = Localizer["Locator"],
+                    Url = "locator"
+                },
+                new()
                 {
                     Text = Localizer["Title"],
                     Url = "title"
diff --git a/src/BootstrapBlazor/wwwroot/scss/theme/bootstrap.blazor.scss b/src/BootstrapBlazor/wwwroot/scss/theme/bootstrap.blazor.scss
index 7b1c19c4e7c..d32237b330e 100644
--- a/src/BootstrapBlazor/wwwroot/scss/theme/bootstrap.blazor.scss
+++ b/src/BootstrapBlazor/wwwroot/scss/theme/bootstrap.blazor.scss
@@ -620,9 +620,9 @@ $bb-tree-item-margin: 1px 0;
 $bb-tree-icon-width: 22px;
 $bb-tree-check-margin: 0 4px;
 $bb-tree-node-padding: .25rem .5rem;
-$bb-tree-item-active-color: #409eff;
-$bb-tree-item-active-bg: #e9ecef;
-$bb-tree-item-hover-bg: var(--bs-secondary);
+$bb-tree-item-active-color: var(--bs-body-color);
+$bb-tree-item-active-bg: rgba(var(--bs-body-color-rgb),.08);
+$bb-tree-item-hover-bg: rgba(var(--bs-body-color-rgb),.12);
 $bb-tree-icon-margin-right: .5rem;
 
 // Upload