diff --git a/Oqtane.Client/Themes/Controls/Theme/MenuBase.cs b/Oqtane.Client/Themes/Controls/Theme/MenuBase.cs
index dd697ef0..689b7a04 100644
--- a/Oqtane.Client/Themes/Controls/Theme/MenuBase.cs
+++ b/Oqtane.Client/Themes/Controls/Theme/MenuBase.cs
@@ -19,12 +19,7 @@ namespace Oqtane.Themes.Controls
         {
             if (page.IsClickable)
             {
-                var url = string.IsNullOrEmpty(page.Url) ? NavigateUrl(page.Path) : page.Url;
-                if (PageState.QueryString.ContainsKey("method"))
-                {
-                    url += ((url.Contains("?")) ? "&" : "?") + "method=" + PageState.QueryString["method"];
-                }
-                return url;
+                return string.IsNullOrEmpty(page.Url) ? NavigateUrl(page.Path) : page.Url;
             }
             else
             {
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 6ee92baa..0719a546 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -42,16 +42,6 @@
         }
         headcontent += $"<link id=\"app-favicon\" rel=\"shortcut icon\" type=\"image/{favicontype}\" href=\"{favicon}\" />\n";
 
-        if (PageState.QueryString.ContainsKey("method") && PageState.QueryString["method"] == "new")
-        {
-            // stylesheets
-            foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet))
-            {
-                var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url;
-                headcontent += "<link rel=\"stylesheet\" href=\"" + url + "\"" + (!string.IsNullOrEmpty(resource.Integrity) ? " integrity=\"" + resource.Integrity + "\"" : "") + (!string.IsNullOrEmpty(resource.CrossOrigin) ? " crossorigin=\"" + resource.CrossOrigin + "\"" : "") + " type=\"text/css\"/>" + "\n";
-            }
-        }
-
         // head content
         AddHeadContent(headcontent, PageState.Site.HeadContent);
         if (!string.IsNullOrEmpty(PageState.Site.HeadContent))
@@ -106,27 +96,24 @@
             }
         }
 
-        if (!PageState.QueryString.ContainsKey("method") || (PageState.QueryString.ContainsKey("method") && PageState.QueryString["method"] == "old"))
+        // style sheets
+        if (PageState.Page.Resources != null && PageState.Page.Resources.Exists(item => item.ResourceType == ResourceType.Stylesheet))
         {
-            // style sheets
-            if (PageState.Page.Resources != null && PageState.Page.Resources.Exists(item => item.ResourceType == ResourceType.Stylesheet))
+            var interop = new Interop(JSRuntime);
+            string batch = DateTime.UtcNow.ToString("yyyyMMddHHmmssfff");
+            var links = new List<object>();
+            foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet))
             {
-                var interop = new Interop(JSRuntime);
-                string batch = DateTime.UtcNow.ToString("yyyyMMddHHmmssfff");
-                var links = new List<object>();
-                foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet))
-                {
-                    var prefix = "app-stylesheet-" + resource.Level.ToString().ToLower();
-                    var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url;
-                    links.Add(new { id = prefix + "-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", insertbefore = prefix });
-                }
-                if (links.Any())
-                {
-                    await interop.IncludeLinks(links.ToArray());
-                }
-                await interop.RemoveElementsById("app-stylesheet-page-", "", "app-stylesheet-page-" + batch + "-00");
-                await interop.RemoveElementsById("app-stylesheet-module-", "", "app-stylesheet-module-" + batch + "-00");
+                var prefix = "app-stylesheet-" + resource.Level.ToString().ToLower();
+                var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url;
+                links.Add(new { id = prefix + "-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", insertbefore = prefix });
             }
+            if (links.Any())
+            {
+                await interop.IncludeLinks(links.ToArray());
+            }
+            await interop.RemoveElementsById("app-stylesheet-page-", "", "app-stylesheet-page-" + batch + "-00");
+            await interop.RemoveElementsById("app-stylesheet-module-", "", "app-stylesheet-module-" + batch + "-00");
         }
     }
 
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index 55ddb127..4b44e341 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -167,29 +167,26 @@ namespace Oqtane.Pages
                         }
 
                         // stylesheets
-                        if (!HttpContext.Request.Query.ContainsKey("method") || (HttpContext.Request.Query.ContainsKey("method") && HttpContext.Request.Query["method"] == "old"))
+                        var resources = new List<Resource>();
+                        if (string.IsNullOrEmpty(page.ThemeType))
                         {
-                            var resources = new List<Resource>();
-                            if (string.IsNullOrEmpty(page.ThemeType))
-                            {
-                                page.ThemeType = site.DefaultThemeType;
-                            }
-                            var theme = site.Themes.FirstOrDefault(item => item.Themes.Any(item => item.TypeName == page.ThemeType));
-                            if (theme?.Resources != null)
-                            {
-                                resources.AddRange(theme.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList());
-                            }
-                            var type = Type.GetType(page.ThemeType);
-                            if (type != null)
-                            {
-                                var obj = Activator.CreateInstance(type) as IThemeControl;
-                                if (obj?.Resources != null)
-                                {
-                                    resources.AddRange(obj.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList());
-                                }
-                            }
-                            ManageStyleSheets(resources, alias, theme.ThemeName);
+                            page.ThemeType = site.DefaultThemeType;
                         }
+                        var theme = site.Themes.FirstOrDefault(item => item.Themes.Any(item => item.TypeName == page.ThemeType));
+                        if (theme?.Resources != null)
+                        {
+                            resources.AddRange(theme.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList());
+                        }
+                        var type = Type.GetType(page.ThemeType);
+                        if (type != null)
+                        {
+                            var obj = Activator.CreateInstance(type) as IThemeControl;
+                            if (obj?.Resources != null)
+                            {
+                                resources.AddRange(obj.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList());
+                            }
+                        }
+                        ManageStyleSheets(resources, alias, theme.ThemeName);
 
                         // scripts
                         if (Runtime == "Server")