diff --git a/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor b/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor
index 76c254e40..dc5d901f7 100644
--- a/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor
@@ -6,9 +6,20 @@
     <div class="dropdown-menu" aria-labelledby="@($"navbarDropdown{ParentPage.PageId}")">
         @foreach (var childPage in GetChildPages())
         {
+            var _attributes = new Dictionary<string, object>();
+            _attributes.Add("href", GetUrl(childPage));
+            var _target = GetTarget(childPage);
+            if (!string.IsNullOrEmpty(_target))
+            {
+                _attributes.Add("target", _target);
+            }
+            if (!string.IsNullOrEmpty(childPage.ThemeType))
+            {
+                _attributes.Add("data-enhance-nav", "false");
+            }
             if (childPage.PageId == PageState.Page.PageId)
             {
-                <a class="nav-link active px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                <a class="nav-link active px-3" @attributes="_attributes">
                     <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                         <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name <span class="visually-hidden-focusable">(current)</span>
@@ -17,7 +28,7 @@
             }
             else
             {
-                <a class="nav-link px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                <a class="nav-link px-3" @attributes="_attributes">
                     <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                         <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name
@@ -32,12 +43,23 @@ else
     <ul class="navbar-nav mr-auto">
         @foreach (var childPage in GetChildPages())
         {
+            var _attributes = new Dictionary<string, object>();
+            _attributes.Add("href", GetUrl(childPage));
+            var _target = GetTarget(childPage);
+            if (!string.IsNullOrEmpty(_target))
+            {
+                _attributes.Add("target", _target);
+            }
+            if (!string.IsNullOrEmpty(childPage.ThemeType))
+            {
+                _attributes.Add("data-enhance-nav", "false");
+            }
             if (!Pages.Any(e => e.ParentId == childPage.PageId))
             {
                 if (childPage.PageId == PageState.Page.PageId)
                 {
                     <li class="nav-item">
-                        <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                        <a class="nav-link active" @attributes="_attributes">
                             <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                                 <span class="@childPage.Icon" aria-hidden="true" />
                                 @childPage.Name <span class="visually-hidden-focusable">(current)</span>
@@ -48,7 +70,7 @@ else
                 else
                 {
                     <li class="nav-item">
-                        <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                        <a class="nav-link" @attributes="_attributes">
                             <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                                 <span class="@childPage.Icon" aria-hidden="true" />
                                 @childPage.Name
@@ -62,7 +84,7 @@ else
                 if (childPage.PageId == PageState.Page.PageId)
                 {
                     <li class="nav-item dropdown active">
-                        <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <a class="nav-link dropdown-toggle" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" @attributes="_attributes">
                             <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name <span class="visually-hidden-focusable">(current)</span>
                         </a>
@@ -72,7 +94,7 @@ else
                 else
                 {
                     <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <a class="nav-link dropdown-toggle" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" @attributes="_attributes">
                             <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name
                         </a>
diff --git a/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor b/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor
index c7417b28b..b0d5fc43e 100644
--- a/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor
@@ -5,10 +5,21 @@
 {
     foreach (var childPage in GetChildPages())
     {
+        var _attributes = new Dictionary<string, object>();
+        _attributes.Add("href", GetUrl(childPage));
+        var _target = GetTarget(childPage);
+        if (!string.IsNullOrEmpty(_target))
+        {
+            _attributes.Add("target", _target);
+        }
+        if (!string.IsNullOrEmpty(childPage.ThemeType))
+        {
+            _attributes.Add("data-enhance-nav", "false");
+        }
         if (childPage.PageId == PageState.Page.PageId)
         {
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
-                <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                <a class="nav-link active" @attributes="_attributes">
                     <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                         <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name <span class="visually-hidden-focusable">(current)</span>
@@ -19,7 +30,7 @@
         else
         {
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
-                <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                <a class="nav-link" @attributes="_attributes">
                     <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                         <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name
@@ -38,10 +49,21 @@ else
     <ul class="nav flex-column">
         @foreach (var childPage in GetChildPages())
         {
+            var _attributes = new Dictionary<string, object>();
+            _attributes.Add("href", GetUrl(childPage));
+            var _target = GetTarget(childPage);
+            if (!string.IsNullOrEmpty(_target))
+            {
+                _attributes.Add("target", _target);
+            }
+            if (!string.IsNullOrEmpty(childPage.ThemeType))
+            {
+                _attributes.Add("data-enhance-nav", "false");
+            }
             if (childPage.PageId == PageState.Page.PageId)
             {
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
-                    <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                    <a class="nav-link active" @attributes="_attributes">
                         <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                             <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name <span class="visually-hidden-focusable">(current)</span>
@@ -52,7 +74,7 @@ else
             else
             {
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
-                    <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                    <a class="nav-link" @attributes="_attributes">
                         <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                             <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name