diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 0f56752d..8023da67 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -77,7 +77,7 @@ namespace Oqtane.Modules
                 {
                     if (PageState.Page.Resources != null)
                     {
-                        resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Namespace == type.Namespace).ToList();
+                        resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level != ResourceLevel.Site && item.Namespace == type.Namespace).ToList();
                     }
                 }
                 else // modulecontrolbase
diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs
index 8dcbe65c..8fcb1a30 100644
--- a/Oqtane.Client/Themes/ThemeBase.cs
+++ b/Oqtane.Client/Themes/ThemeBase.cs
@@ -40,7 +40,7 @@ namespace Oqtane.Themes
                 {
                     if (PageState.Page.Resources != null)
                     {
-                        resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Namespace == type.Namespace).ToList();
+                        resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level != ResourceLevel.Site && item.Namespace == type.Namespace).ToList();
                     }
                 }
                 else // themecontrolbase, containerbase
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index df98874c..cd3a1764 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -513,22 +513,25 @@
         {
             foreach (var resource in resources)
             {
-                if (resource.Url.StartsWith("~"))
+                if (resource.Level != ResourceLevel.Site)
                 {
-                    resource.Url = resource.Url.Replace("~", "/" + type + "/" + name + "/").Replace("//", "/");
-                }
-                if (!resource.Url.Contains("://") && alias.BaseUrl != "" && !resource.Url.StartsWith(alias.BaseUrl))
-                {
-                    resource.Url = alias.BaseUrl + resource.Url;
-                }
+                    if (resource.Url.StartsWith("~"))
+                    {
+                        resource.Url = resource.Url.Replace("~", "/" + type + "/" + name + "/").Replace("//", "/");
+                    }
+                    if (!resource.Url.Contains("://") && alias.BaseUrl != "" && !resource.Url.StartsWith(alias.BaseUrl))
+                    {
+                        resource.Url = alias.BaseUrl + resource.Url;
+                    }
 
-                // ensure resource does not exist already
-                if (!pageresources.Exists(item => item.Url.ToLower() == resource.Url.ToLower()))
-                {
-                    resource.Level = level;
-                    resource.Namespace = name;
-                    pageresources.Add(resource);
-				}
+                    // ensure resource does not exist already
+                    if (!pageresources.Exists(item => item.Url.ToLower() == resource.Url.ToLower()))
+                    {
+                        resource.Level = level;
+                        resource.Namespace = name;
+                        pageresources.Add(resource);
+                    }
+                }
 			}
 		}
 		return pageresources;
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 1bf1ac23..0719a546 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -42,13 +42,6 @@
         }
         headcontent += $"<link id=\"app-favicon\" rel=\"shortcut icon\" type=\"image/{favicontype}\" href=\"{favicon}\" />\n";
 
-        // 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))
@@ -103,49 +96,24 @@
             }
         }
 
-        if (PageState.Page.Resources != null)
+        // style sheets
+        if (PageState.Page.Resources != null && PageState.Page.Resources.Exists(item => item.ResourceType == ResourceType.Stylesheet))
         {
-            if (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 (PageState.Page.Resources.Exists(item => item.ResourceType == ResourceType.Script))
-            //{
-            //    var scripts = new List<object>();
-            //    var inline = 0;
-            //    foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level != ResourceLevel.Site))
-            //    {
-            //        if (!string.IsNullOrEmpty(resource.Url))
-            //        {
-            //            var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url;
-            //            scripts.Add(new { href = url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module, location = resource.Location.ToString().ToLower() });
-            //        }
-            //        else
-            //        {
-            //            inline += 1;
-            //            await interop.IncludeScript(GetType().Namespace.ToLower() + inline.ToString(), "", "", "", resource.Content, resource.Location.ToString().ToLower());
-            //        }
-            //    }
-            //    if (scripts.Any())
-            //    {
-            //        await interop.IncludeScripts(scripts.ToArray());
-            //    }
-            //}
+            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.Maui/wwwroot/index.html b/Oqtane.Maui/wwwroot/index.html
index a1469a6b..1dac89ee 100644
--- a/Oqtane.Maui/wwwroot/index.html
+++ b/Oqtane.Maui/wwwroot/index.html
@@ -9,8 +9,8 @@
 	<script src="js/app.js"></script>
 	<script src="js/loadjs.min.js"></script>
 	<link rel="stylesheet" href="css/app.css" />
-	<link id="app-stylesheet-page" rel="stylesheet" href="css/empty.css" disabled />
-	<link id="app-stylesheet-module" rel="stylesheet" href="css/empty.css" disabled />
+	<link id="app-stylesheet-page" />
+	<link id="app-stylesheet-module" />
 </head>
 
 <body>
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index 22bc6a90..4aee45f2 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -15,8 +15,8 @@
     {
         <link id="app-manifest" rel="manifest" />
     }
-    <style id="app-stylesheet-page"></style>
-    <style id="app-stylesheet-module"></style>
+    <link id="app-stylesheet-page" />
+    <link id="app-stylesheet-module" />
     <component type="typeof(Oqtane.Head)" render-mode="@((RenderMode)Enum.Parse(typeof(RenderMode), Model.RenderMode, true))" />
     @Html.Raw(Model.HeadResources)
 </head>
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index be518155..4b3d9929 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -475,8 +475,8 @@ namespace Oqtane.Pages
             {
                 var url = (resource.Url.Contains("://")) ? resource.Url : alias.BaseUrl + resource.Url;
                 return "<script src=\"" + url + "\"" +
-                    ((!string.IsNullOrEmpty(resource.CrossOrigin)) ? " crossorigin=\"" + resource.CrossOrigin + "\"" : "") +
                     ((!string.IsNullOrEmpty(resource.Integrity)) ? " integrity=\"" + resource.Integrity + "\"" : "") +
+                    ((!string.IsNullOrEmpty(resource.CrossOrigin)) ? " crossorigin=\"" + resource.CrossOrigin + "\"" : "") +
                     "></script>";
             }
             else