diff --git a/src/NodeDev.Blazor.Server/App.razor b/src/NodeDev.Blazor.Server/App.razor
index a3a1b38..f045c2c 100644
--- a/src/NodeDev.Blazor.Server/App.razor
+++ b/src/NodeDev.Blazor.Server/App.razor
@@ -1,12 +1,32 @@
-﻿<Router AppAssembly="@typeof(App).Assembly">
-    <Found Context="routeData">
-        <RouteView RouteData="@routeData" />
-        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
-    </Found>
-    <NotFound>
-        <PageTitle>Not found</PageTitle>
-        <LayoutView>
-            <p role="alert">Sorry, there's nothing at this address.</p>
-        </LayoutView>
-    </NotFound>
-</Router>
+﻿<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <base href="/" />
+
+    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
+    <link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
+    <link href="_content/NodeDev.Blazor/styles.css" rel="stylesheet" />
+
+    <link href="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.css" rel="stylesheet" />
+
+    <link href="_content/Z.Blazor.Diagrams/style.min.css" rel="stylesheet" />
+    <link href="_content/Z.Blazor.Diagrams/default.styles.min.css" rel="stylesheet" />
+</head>
+<body style="width: 100vw; height: 100vh">
+
+    <Routes @rendermode="InteractiveServer" />
+
+    <script src="_content/BlazorMonaco/jsInterop.js"></script>
+    <script src="_content/BlazorMonaco/lib/monaco-editor/min/vs/loader.js"></script>
+    <script src="_content/BlazorMonaco/lib/monaco-editor/min/vs/editor/editor.main.js"></script>
+
+    <script src="_framework/blazor.web.js"></script>
+    <script src="_content/MudBlazor/MudBlazor.min.js"></script>
+
+    <script src="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.js"></script>
+
+    <script src="_content/Z.Blazor.Diagrams/script.min.js"></script>
+</body>
+</html>
diff --git a/src/NodeDev.Blazor.Server/Pages/_Host.cshtml b/src/NodeDev.Blazor.Server/Pages/_Host.cshtml
deleted file mode 100644
index 2c69c62..0000000
--- a/src/NodeDev.Blazor.Server/Pages/_Host.cshtml
+++ /dev/null
@@ -1,8 +0,0 @@
-﻿@page "/"
-@namespace NodeDev.Blazor.Server.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@{
-    Layout = "_Layout";
-}
-
-<component type="typeof(App)" render-mode="Server" />
diff --git a/src/NodeDev.Blazor.Server/Pages/_Layout.cshtml b/src/NodeDev.Blazor.Server/Pages/_Layout.cshtml
deleted file mode 100644
index fee0154..0000000
--- a/src/NodeDev.Blazor.Server/Pages/_Layout.cshtml
+++ /dev/null
@@ -1,37 +0,0 @@
-﻿@using Microsoft.AspNetCore.Components.Web
-@namespace NodeDev.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <base href="~/" />
-
-    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
-    <link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
-    <link href="_content/NodeDev.Blazor/styles.css" rel="stylesheet" />
-
-    <link href="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.css" rel="stylesheet" />
-
-    <link href="_content/Z.Blazor.Diagrams/style.min.css" rel="stylesheet" />
-    <link href="_content/Z.Blazor.Diagrams/default.styles.min.css" rel="stylesheet" />
-
-    <component type="typeof(HeadOutlet)" render-mode="Server" />
-</head>
-<body style="width: 100vw; height: 100vh">
-    @RenderBody()
-
-    <script src="_content/BlazorMonaco/jsInterop.js"></script>
-    <script src="_content/BlazorMonaco/lib/monaco-editor/min/vs/loader.js"></script>
-    <script src="_content/BlazorMonaco/lib/monaco-editor/min/vs/editor/editor.main.js"></script>
-
-    <script src="_framework/blazor.server.js"></script>
-    <script src="_content/MudBlazor/MudBlazor.min.js"></script>
-
-    <script src="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.js"></script>
-
-    <script src="_content/Z.Blazor.Diagrams/script.min.js"></script>
-</body>
-</html>
diff --git a/src/NodeDev.Blazor.Server/Program.cs b/src/NodeDev.Blazor.Server/Program.cs
index 9fc06a0..6dc07cf 100644
--- a/src/NodeDev.Blazor.Server/Program.cs
+++ b/src/NodeDev.Blazor.Server/Program.cs
@@ -1,12 +1,11 @@
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Web;
+using NodeDev.Blazor.Server;
 using NodeDev.Blazor.Services;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-builder.Services.AddRazorPages();
-builder.Services.AddServerSideBlazor();
+builder.Services.AddRazorComponents()
+	.AddInteractiveServerComponents();
 
 builder.Services.AddNodeDev();
 
@@ -20,11 +19,11 @@
     app.UseHsts();
 }
 
-app.UseStaticFiles();
+app.UseAntiforgery();
 
-app.UseRouting();
+app.UseStaticFiles();
 
-app.MapBlazorHub();
-app.MapFallbackToPage("/_Host");
+app.MapRazorComponents<App>()
+	.AddInteractiveServerRenderMode();
 
 app.Run();
diff --git a/src/NodeDev.Blazor.Server/Routes.razor b/src/NodeDev.Blazor.Server/Routes.razor
new file mode 100644
index 0000000..a3a1b38
--- /dev/null
+++ b/src/NodeDev.Blazor.Server/Routes.razor
@@ -0,0 +1,12 @@
+﻿<Router AppAssembly="@typeof(App).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" />
+        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+    </Found>
+    <NotFound>
+        <PageTitle>Not found</PageTitle>
+        <LayoutView>
+            <p role="alert">Sorry, there's nothing at this address.</p>
+        </LayoutView>
+    </NotFound>
+</Router>
diff --git a/src/NodeDev.Blazor.Server/_Imports.razor b/src/NodeDev.Blazor.Server/_Imports.razor
index ba4e4ec..3ab33a0 100644
--- a/src/NodeDev.Blazor.Server/_Imports.razor
+++ b/src/NodeDev.Blazor.Server/_Imports.razor
@@ -5,5 +5,6 @@
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Web.Virtualization
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.JSInterop
 @using NodeDev.Blazor.Server
