diff --git a/Oqtane.Client/UI/InteractiveRenderMode.cs b/Oqtane.Client/UI/InteractiveRenderMode.cs
index 1094aafb..0483b748 100644
--- a/Oqtane.Client/UI/InteractiveRenderMode.cs
+++ b/Oqtane.Client/UI/InteractiveRenderMode.cs
@@ -6,7 +6,7 @@ namespace Oqtane.UI
 {
     public static class InteractiveRenderMode
     {
-        public static IComponentRenderMode GetInteractiveRenderMode(string runtime, bool prerender)
+        public static IComponentRenderMode? GetInteractiveRenderMode(string runtime, bool prerender)
         {
             switch (runtime)
             {
@@ -17,7 +17,7 @@ namespace Oqtane.UI
                 case Runtimes.Auto:
                     return new InteractiveAutoRenderMode(prerender: prerender);
             }
-            return new InteractiveServerRenderMode(prerender: prerender); // default to interactiver server
+            return null; // default to inherit existing render mode
         }
     }
 }
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index ccb80cf2..262a919a 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -53,30 +53,6 @@
         {
             headcontent = AddHeadContent(headcontent, PageState.Page.HeadContent);
         }
-        if (PageState.RenderMode == RenderModes.Static)
-        {
-            string batch = DateTime.UtcNow.ToString("yyyyMMddHHmmssfff");
-            int count = 0;
-            foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet && item.Level == ResourceLevel.Module))
-            {
-                // if (resource.Url.StartsWith("~"))
-                // {
-                //     resource.Url = resource.Url.Replace("~", "/Themes/" + Utilities.GetTypeName(name) + "/").Replace("//", "/");
-                // }
-                if (!resource.Url.Contains("://") && PageState.Alias.BaseUrl != "" && !resource.Url.StartsWith(PageState.Alias.BaseUrl))
-                {
-                    resource.Url = PageState.Alias.BaseUrl + resource.Url;
-                }
-
-                if (!headcontent.Contains(resource.Url, StringComparison.OrdinalIgnoreCase))
-                {
-                    count++;
-                    string id = "id=\"app-stylesheet-" + resource.Level.ToString().ToLower() + "-" + batch + "-" + count.ToString("00") + "\" ";
-                    headcontent += "<link " + id + "rel=\"stylesheet\" href=\"" + resource.Url + "\"" + (!string.IsNullOrEmpty(resource.Integrity) ? " integrity=\"" + resource.Integrity + "\"" : "") + (!string.IsNullOrEmpty(resource.CrossOrigin) ? " crossorigin=\"" + resource.CrossOrigin + "\"" : "") + " type=\"text/css\"/>" + Environment.NewLine;
-                }
-            }
-
-        }
         SiteState.Properties.HeadContent = headcontent;
 
         DynamicComponent = builder =>
diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor
index 0e3d5ac3..1b741832 100644
--- a/Oqtane.Server/Components/App.razor
+++ b/Oqtane.Server/Components/App.razor
@@ -184,12 +184,12 @@
                         }
                     }
                     ManageStyleSheets(resources, alias, theme.ThemeName);
+
+                    // scripts
                     if (_renderMode == RenderModes.Static)
                     {
                         ManageScripts(resources, alias);
                     }
-
-                    // scripts
                     if (_renderMode == RenderModes.Interactive && _runtime == Runtimes.Server)
                     {
                         _reconnectScript = CreateReconnectScript();
@@ -233,6 +233,10 @@
                     }
 
                     // create initial PageState 
+                    // page needs to be populated 
+                    // site.modules need to be populated
+                    // user needs to be populated
+
                     _pageState = new PageState
                     {
                         Alias = alias,