diff --git a/Oqtane.Client/Themes/Controls/Theme/Menu.razor b/Oqtane.Client/Themes/Controls/Theme/Menu.razor
index 0f2610cc..738ece1b 100644
--- a/Oqtane.Client/Themes/Controls/Theme/Menu.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/Menu.razor
@@ -1,20 +1,33 @@
-@namespace Oqtane.Themes.Controls
+@namespace Oqtane.Themes.Controls
 
-@switch (Orientation)
+@if (ComponentType != null)
 {
-    case "Horizontal":
-        <MenuHorizontal/>
-        break;
-    default: // Vertical
-    {
-        <MenuVertical/>
-        break;
-    }
+    <DynamicComponent Type="@ComponentType"></DynamicComponent>
 }
 
 @code{
-
     [Parameter]
     public string Orientation { get; set; }
 
+    [Parameter]
+    public string MenuType { get; set; }
+
+    public Type ComponentType { get; set; }
+
+    protected override void OnInitialized()
+    {
+        if (string.IsNullOrEmpty(MenuType) && !string.IsNullOrEmpty(Orientation))
+        {
+            if (Orientation == "Horizontal")
+            {
+                MenuType = "Oqtane.Themes.Controls.MenuHorizontal, Oqtane.Client";
+            }
+            else
+            {
+                MenuType = "Oqtane.Themes.Controls.MenuVertical, Oqtane.Client";
+            }
+        }
+
+        ComponentType = Type.GetType(MenuType);
+    }
 }
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
index 5032499a..f4fe08d6 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
@@ -4,7 +4,8 @@
 
 <main role="main">
     <nav class="navbar navbar-dark bg-primary fixed-top">
-        <Logo UseSiteNameAsFallback="true" /><Menu Orientation="Horizontal" />
+        <Logo UseSiteNameAsFallback="true" />
+        <Menu MenuType="Oqtane.Themes.Controls.MenuHorizontal, Oqtane.Client" />
         <div class="controls ms-auto">
             <div class="controls-group">
                 <Search CssClass="me-3 text-center bg-primary" />