diff --git a/src/ZB.MOM.WW.ScadaBridge.Host/Components/App.razor b/src/ZB.MOM.WW.ScadaBridge.Host/Components/App.razor
index ca194b33..79e37825 100644
--- a/src/ZB.MOM.WW.ScadaBridge.Host/Components/App.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.Host/Components/App.razor
@@ -7,7 +7,7 @@
     <title>ScadaBridge</title>
     <link href="/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
     <link href="/lib/bootstrap-icons/bootstrap-icons.css" rel="stylesheet" />
-    <link href="_content/ZB.MOM.WW.ScadaBridge.CentralUI/css/theme.css" rel="stylesheet" />
+    <ThemeHead />
     <link href="/ZB.MOM.WW.ScadaBridge.Host.styles.css" rel="stylesheet" />
     <link href="_content/ZB.MOM.WW.ScadaBridge.CentralUI/css/site.css" rel="stylesheet" />
     <HeadOutlet @rendermode="InteractiveServer" />
@@ -77,7 +77,7 @@
         });
     </script>
     <script src="/js/treeview-storage.js"></script>
-    <script src="_content/ZB.MOM.WW.ScadaBridge.CentralUI/js/nav-state.js"></script>
+    <ThemeScripts />
     <script src="_content/ZB.MOM.WW.ScadaBridge.CentralUI/js/monaco-init.js"></script>
     <script src="_content/ZB.MOM.WW.ScadaBridge.CentralUI/js/audit-grid.js"></script>
     <script src="_content/ZB.MOM.WW.ScadaBridge.CentralUI/js/transport.js"></script>