diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor
index 90e4917c..5a5698af 100644
--- a/Oqtane.Client/App.razor
+++ b/Oqtane.Client/App.razor
@@ -5,7 +5,7 @@
     <SiteRouter OnStateChange="@ChangeState" />
 </CascadingValue>
 
-@functions {
+@code {
     private PageState PageState { get; set; }
 
     private void ChangeState(PageState pagestate)
diff --git a/Oqtane.Client/Modules/Admin/Admin/Index.razor b/Oqtane.Client/Modules/Admin/Admin/Index.razor
index ddc6a87e..3c38f89a 100644
--- a/Oqtane.Client/Modules/Admin/Admin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Admin/Index.razor
@@ -23,7 +23,7 @@
 </ul>
 <br /><br />
 
-@functions {
+@code {
     List<Page> pages;
 
     protected override void OnInit()
diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 0afe0834..bd06d715 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -14,17 +14,17 @@
     @((MarkupString)Message)
     <div class="form-group">
         <label for="Username" class="control-label">Username: </label>
-        <input type="text" name="Username" class="form-control" placeholder="Username" bind="@Username" />
+        <input type="text" name="Username" class="form-control" placeholder="Username" @bind="@Username" />
     </div>
     <div class="form-group">
         <label for="Password" class="control-label">Password: </label>
-        <input type="password" name="Password" class="form-control" placeholder="Password" bind="@Password" />
+        <input type="password" name="Password" class="form-control" placeholder="Password" @bind="@Password" />
     </div>
-    <button type="button" class="btn btn-primary" onclick="@Login">Login</button>
+    <button type="button" class="btn btn-primary" @onclick="@Login">Login</button>
     <NavLink class="btn btn-secondary" href="/">Cancel</NavLink>
 </div>
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Anonymous; } }
 
     public string Message { get; set; } = "<div class=\"alert alert-info\" role=\"alert\">Use host/host For Demo Access</div>";
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index d951481c..55b017d4 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -29,7 +29,7 @@ else
     </table>
 }
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }
 
     List<ModuleDefinition> moduledefinitions;
diff --git a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
index e5b4ef4c..68d4d13c 100644
--- a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
@@ -16,7 +16,7 @@
             <label for="Title" class="control-label">Title: </label>
         </td>
         <td>
-            <input type="text" name="Title" class="form-control" bind="@title" />
+            <input type="text" name="Title" class="form-control" @bind="@title" />
         </td>
     </tr>
     <tr>
@@ -24,7 +24,7 @@
             <label for="Container" class="control-label">Container: </label>
         </td>
         <td>
-            <select class="form-control" bind="@containertype">
+            <select class="form-control" @bind="@containertype">
                 <option value="">&lt;Select Container&gt;</option>
                 @foreach (KeyValuePair<string, string> container in containers)
                 {
@@ -38,7 +38,7 @@
             <label for="ViewPermissions" class="control-label">View Permissions: </label>
         </td>
         <td>
-            <input type="text" name="ViewPermissions" class="form-control" bind="@viewpermissions" />
+            <input type="text" name="ViewPermissions" class="form-control" @bind="@viewpermissions" />
         </td>
     </tr>
     <tr>
@@ -46,7 +46,7 @@
             <label for="EditPermissions" class="control-label">Edit Permissions: </label>
         </td>
         <td>
-            <input type="text" name="EditPermissions" class="form-control" bind="@editpermissions" />
+            <input type="text" name="EditPermissions" class="form-control" @bind="@editpermissions" />
         </td>
     </tr>
     <tr>
@@ -54,7 +54,7 @@
             <label for="Page" class="control-label">Page: </label>
         </td>
         <td>
-            <select class="form-control" bind="@pageid">
+            <select class="form-control" @bind="@pageid">
                 @foreach (Page p in PageState.Pages)
                 {
                     <option value="@p.PageId">@p.Name</option>
@@ -63,10 +63,10 @@
         </td>
     </tr>
 </table>
-<button class="btn btn-success" onclick="@SaveModule">Save</button>
+<button class="btn btn-success" @onclick="@SaveModule">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Edit; } }
     public override string Title { get { return "Module Settings"; } }
 
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 7dbaac95..1e5868bf 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -14,7 +14,7 @@
             <label for="Name" class="control-label">Name: </label>
         </td>
         <td>
-            <input class="form-control" bind="@name" />
+            <input class="form-control" @bind="@name" />
         </td>
     </tr>
     <tr>
@@ -22,7 +22,7 @@
             <label for="Name" class="control-label">Path: </label>
         </td>
         <td>
-            <input class="form-control" bind="@path" />
+            <input class="form-control" @bind="@path" />
         </td>
     </tr>
     <tr>
@@ -30,7 +30,7 @@
             <label for="Name" class="control-label">Parent: </label>
         </td>
         <td>
-            <select class="form-control" bind="@parentid">
+            <select class="form-control" @bind="@parentid">
                 <option value="">&lt;Select Parent&gt;</option>
                 @foreach (Page p in PageState.Pages)
                 {
@@ -44,7 +44,7 @@
             <label for="Name" class="control-label">Order: </label>
         </td>
         <td>
-            <input class="form-control" bind="@order" />
+            <input class="form-control" @bind="@order" />
         </td>
     </tr>
     <tr>
@@ -52,7 +52,7 @@
             <label for="Name" class="control-label">Navigation? </label>
         </td>
         <td>
-            <select class="form-control" bind="@isnavigation">
+            <select class="form-control" @bind="@isnavigation">
                 <option value="true">Yes</option>
                 <option value="false">No</option>
             </select>
@@ -63,7 +63,7 @@
             <label for="Name" class="control-label">Theme: </label>
         </td>
         <td>
-            <select class="form-control" bind="@themetype">
+            <select class="form-control" @bind="@themetype">
                 <option value="">&lt;Select Theme&gt;</option>
                 @foreach (KeyValuePair<string, string> item in themes)
                 {
@@ -77,7 +77,7 @@
             <label for="Name" class="control-label">Layout: </label>
         </td>
         <td>
-            <select class="form-control" bind="@layouttype">
+            <select class="form-control" @bind="@layouttype">
                 <option value="">&lt;Select Layout&gt;</option>
                 @foreach (KeyValuePair<string, string> panelayout in panelayouts)
                 {
@@ -91,7 +91,7 @@
             <label for="Name" class="control-label">Icon: </label>
         </td>
         <td>
-            <input class="form-control" bind="@icon" />
+            <input class="form-control" @bind="@icon" />
         </td>
     </tr>
     <tr>
@@ -99,7 +99,7 @@
             <label for="Name" class="control-label">View Permissions: </label>
         </td>
         <td>
-            <input class="form-control" bind="@viewpermissions" />
+            <input class="form-control" @bind="@viewpermissions" />
         </td>
     </tr>
     <tr>
@@ -107,14 +107,14 @@
             <label for="Name" class="control-label">Edit Permissions: </label>
         </td>
         <td>
-            <input class="form-control" bind="@editpermissions" />
+            <input class="form-control" @bind="@editpermissions" />
         </td>
     </tr>
 </table>
-<button class="btn btn-success" onclick="@SavePage">Save</button>
+<button class="btn btn-success" @onclick="@SavePage">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }
 
     Dictionary<string, string> themes = new Dictionary<string, string>();
diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
index 3c8feeb0..0a3cf339 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Delete.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
@@ -14,7 +14,7 @@
             <label for="Name" class="control-label">Name: </label>
         </td>
         <td>
-            <input class="form-control" bind="@name" readonly />
+            <input class="form-control" @bind="@name" readonly />
         </td>
     </tr>
     <tr>
@@ -22,7 +22,7 @@
             <label for="Name" class="control-label">Path: </label>
         </td>
         <td>
-            <input class="form-control" bind="@path" readonly />
+            <input class="form-control" @bind="@path" readonly />
         </td>
     </tr>
     <tr>
@@ -30,7 +30,7 @@
             <label for="Name" class="control-label">Parent: </label>
         </td>
         <td>
-            <select class="form-control" bind="@parentid" readonly>
+            <select class="form-control" @bind="@parentid" readonly>
                 <option value="">&lt;Select Parent&gt;</option>
                 @foreach (Page p in PageState.Pages)
                 {
@@ -44,7 +44,7 @@
             <label for="Name" class="control-label">Order: </label>
         </td>
         <td>
-            <input class="form-control" bind="@order" readonly />
+            <input class="form-control" @bind="@order" readonly />
         </td>
     </tr>
     <tr>
@@ -52,7 +52,7 @@
             <label for="Name" class="control-label">Navigation? </label>
         </td>
         <td>
-            <select class="form-control" bind="@isnavigation" readonly>
+            <select class="form-control" @bind="@isnavigation" readonly>
                 <option value="true">Yes</option>
                 <option value="false">No</option>
             </select>
@@ -63,7 +63,7 @@
             <label for="Name" class="control-label">Theme: </label>
         </td>
         <td>
-            <select class="form-control" bind="@themetype">
+            <select class="form-control" @bind="@themetype">
                 <option value="">&lt;Select Theme&gt;</option>
                 @foreach (KeyValuePair<string, string> item in themes)
                 {
@@ -77,7 +77,7 @@
             <label for="Name" class="control-label">Layout: </label>
         </td>
         <td>
-            <select class="form-control" bind="@layouttype">
+            <select class="form-control" @bind="@layouttype">
                 <option value="">&lt;Select Layout&gt;</option>
                 @foreach (KeyValuePair<string, string> panelayout in panelayouts)
                 {
@@ -91,7 +91,7 @@
             <label for="Name" class="control-label">Icon: </label>
         </td>
         <td>
-            <input class="form-control" bind="@icon" readonly />
+            <input class="form-control" @bind="@icon" readonly />
         </td>
     </tr>
     <tr>
@@ -99,7 +99,7 @@
             <label for="Name" class="control-label">View Permissions: </label>
         </td>
         <td>
-            <input class="form-control" bind="@viewpermissions" readonly />
+            <input class="form-control" @bind="@viewpermissions" readonly />
         </td>
     </tr>
     <tr>
@@ -107,14 +107,14 @@
             <label for="Name" class="control-label">Edit Permissions: </label>
         </td>
         <td>
-            <input class="form-control" bind="@editpermissions" readonly />
+            <input class="form-control" @bind="@editpermissions" readonly />
         </td>
     </tr>
 </table>
-<button class="btn btn-danger" onclick="@DeletePage">Delete</button>
+<button class="btn btn-danger" @onclick="@DeletePage">Delete</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }
 
     Dictionary<string, string> themes = new Dictionary<string, string>();
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index 698dc3de..5eadcd24 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -15,7 +15,7 @@
             <label for="Name" class="control-label">Name: </label>
         </td>
         <td>
-            <input class="form-control" bind="@name" />
+            <input class="form-control" @bind="@name" />
         </td>
     </tr>
     <tr>
@@ -23,7 +23,7 @@
             <label for="Name" class="control-label">Path: </label>
         </td>
         <td>
-            <input class="form-control" bind="@path" />
+            <input class="form-control" @bind="@path" />
         </td>
     </tr>
     <tr>
@@ -31,7 +31,7 @@
             <label for="Name" class="control-label">Parent: </label>
         </td>
         <td>
-            <select class="form-control" bind="@parentid">
+            <select class="form-control" @bind="@parentid">
                 <option value="">&lt;Select Parent&gt;</option>
                 @foreach (Page p in PageState.Pages)
                 {
@@ -45,7 +45,7 @@
             <label for="Name" class="control-label">Order: </label>
         </td>
         <td>
-            <input class="form-control" bind="@order" />
+            <input class="form-control" @bind="@order" />
         </td>
     </tr>
     <tr>
@@ -53,7 +53,7 @@
             <label for="Name" class="control-label">Navigation? </label>
         </td>
         <td>
-            <select class="form-control" bind="@isnavigation">
+            <select class="form-control" @bind="@isnavigation">
                 <option value="true">Yes</option>
                 <option value="false">No</option>
             </select>
@@ -64,7 +64,7 @@
             <label for="Name" class="control-label">Theme: </label>
         </td>
         <td>
-            <select class="form-control" bind="@themetype">
+            <select class="form-control" @bind="@themetype">
                 <option value="">&lt;Select Theme&gt;</option>
                 @foreach (KeyValuePair<string, string> item in themes)
                 {
@@ -78,7 +78,7 @@
             <label for="Name" class="control-label">Layout: </label>
         </td>
         <td>
-            <select class="form-control" bind="@layouttype">
+            <select class="form-control" @bind="@layouttype">
                 <option value="">&lt;Select Layout&gt;</option>
                 @foreach (KeyValuePair<string, string> panelayout in panelayouts)
                 {
@@ -92,7 +92,7 @@
             <label for="Name" class="control-label">Icon: </label>
         </td>
         <td>
-            <input class="form-control" bind="@icon" />
+            <input class="form-control" @bind="@icon" />
         </td>
     </tr>
     <tr>
@@ -100,7 +100,7 @@
             <label for="Name" class="control-label">View Permissions: </label>
         </td>
         <td>
-            <input class="form-control" bind="@viewpermissions" />
+            <input class="form-control" @bind="@viewpermissions" />
         </td>
     </tr>
     <tr>
@@ -108,14 +108,14 @@
             <label for="Name" class="control-label">Edit Permissions: </label>
         </td>
         <td>
-            <input class="form-control" bind="@editpermissions" />
+            <input class="form-control" @bind="@editpermissions" />
         </td>
     </tr>
 </table>
-<button class="btn btn-success" onclick="@SavePage">Save</button>
+<button class="btn btn-success" @onclick="@SavePage">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }
 
     Dictionary<string, string> themes = new Dictionary<string, string>();
diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
index d94f1bc1..73c6856f 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -35,6 +35,6 @@ else
     <ActionLink Action="Add" Text="Add Page" />
 }
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index c1d6eaab..67120c3d 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -11,17 +11,17 @@
 <div class="container">
     <div class="form-group">
         <label for="Username" class="control-label">Email: </label>
-        <input type="text" name="Username" class="form-control" placeholder="Username" bind="@Username" />
+        <input type="text" name="Username" class="form-control" placeholder="Username" @bind="@Username" />
     </div>
     <div class="form-group">
         <label for="Password" class="control-label">Password: </label>
-        <input type="password" name="Password" class="form-control" placeholder="Password" bind="@Password" />
+        <input type="password" name="Password" class="form-control" placeholder="Password" @bind="@Password" />
     </div>
     <button type="button" class="btn btn-primary">Register</button>
     <NavLink class="btn btn-secondary" href="/">Cancel</NavLink>
 </div>
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Anonymous; } }
 
     public string Username { get; set; } = "";
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index b3e9489e..ff04b471 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -21,7 +21,7 @@ else
             <label for="Name" class="control-label">Tenant: </label>
         </td>
         <td>
-            <select class="form-control" bind="@tenantid">
+            <select class="form-control" @bind="@tenantid">
                 <option value="">&lt;Select Tenant&gt;</option>
                 @foreach (Tenant tenant in tenants)
                 {
@@ -35,7 +35,7 @@ else
             <label for="Name" class="control-label">Name: </label>
         </td>
         <td>
-            <input class="form-control" bind="@name" />
+            <input class="form-control" @bind="@name" />
         </td>
     </tr>
     <tr>
@@ -43,7 +43,7 @@ else
             <label for="Name" class="control-label">Alias: </label>
         </td>
         <td>
-            <input class="form-control" bind="@url" />
+            <input class="form-control" @bind="@url" />
         </td>
     </tr>
     <tr>
@@ -51,15 +51,15 @@ else
             <label for="Name" class="control-label">Logo: </label>
         </td>
         <td>
-            <input class="form-control" bind="@logo" />
+            <input class="form-control" @bind="@logo" />
         </td>
     </tr>
 </table>
-<button class="btn btn-success" onclick="@SaveSite">Save</button>
+<button class="btn btn-success" @onclick="@SaveSite">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 }
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }
 
     List<Tenant> tenants;
diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor
index 6d3f665c..bc54b094 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor
@@ -30,7 +30,7 @@ else
     <ActionLink Action="Add" Text="Add Site" />
 }
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }
 
     List<Site> sites;
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
index ac89230e..4c606d1a 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -28,7 +28,7 @@ else
     </table>
 }
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }
 
     List<Theme> Themes;
diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index 6be55798..5445251b 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -29,7 +29,7 @@ else
     </table>
 }
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }
 
     List<User> Users;
diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor
index 6b8ba4cc..bccc2d14 100644
--- a/Oqtane.Client/Modules/Controls/ActionLink.razor
+++ b/Oqtane.Client/Modules/Controls/ActionLink.razor
@@ -10,7 +10,7 @@
     <NavLink class="@buttonClass" href="@url">@text</NavLink>
 }
 
-@functions {
+@code {
     [Parameter]
     private string Action { get; set; }
 
diff --git a/Oqtane.Client/Modules/Counter/Index.razor b/Oqtane.Client/Modules/Counter/Index.razor
index b95a4406..77dd787d 100644
--- a/Oqtane.Client/Modules/Counter/Index.razor
+++ b/Oqtane.Client/Modules/Counter/Index.razor
@@ -2,10 +2,10 @@
 @inherits ModuleBase
 Current count: @currentCount
 <br />
-<button class="btn btn-primary" onclick="@IncrementCount">Click me</button>
+<button class="btn btn-primary" @onclick="@IncrementCount">Click me</button>
 <br /><br />
 
-@functions {
+@code {
     int currentCount = 0;
 
     void IncrementCount()
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index de6c70e1..4bdd8aaf 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -16,15 +16,15 @@
                 <label for="Name" class="control-label">Content: </label>
             </td>
             <td>
-                <textarea class="form-control" bind="@content" rows="5" style="width:400px;" />
+                <textarea class="form-control" @bind="@content" rows="5" style="width:400px;" />
             </td>
         </tr>
     </table>
-    <button class="btn btn-success" onclick="@SaveContent">Save</button>
+    <button class="btn btn-success" @onclick="@SaveContent">Save</button>
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 </form>
 
-@functions {
+@code {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Edit; } }
     public override string Title { get { return "Edit Html/Text"; } }
 
diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor
index a8fa3cd3..cc679988 100644
--- a/Oqtane.Client/Modules/HtmlText/Index.razor
+++ b/Oqtane.Client/Modules/HtmlText/Index.razor
@@ -12,7 +12,7 @@
 
 <br /><ActionLink Action="Edit" /><br /><br />
 
-@functions {
+@code {
     string content;
 
     protected override async Task OnInitAsync()
diff --git a/Oqtane.Client/Modules/Weather/Index.razor b/Oqtane.Client/Modules/Weather/Index.razor
index 0e5333af..5ca38bc8 100644
--- a/Oqtane.Client/Modules/Weather/Index.razor
+++ b/Oqtane.Client/Modules/Weather/Index.razor
@@ -31,7 +31,7 @@ else
     </table>
 }
 
-@functions {
+@code {
     WeatherForecast[] forecasts;
 
     protected override async Task OnInitAsync()
diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj
index aaa24925..12c8fdef 100644
--- a/Oqtane.Client/Oqtane.Client.csproj
+++ b/Oqtane.Client/Oqtane.Client.csproj
@@ -27,8 +27,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Oqtane.Client/Shared/Container.razor b/Oqtane.Client/Shared/Container.razor
index 9adfd0df..9d309925 100644
--- a/Oqtane.Client/Shared/Container.razor
+++ b/Oqtane.Client/Shared/Container.razor
@@ -5,7 +5,7 @@
     @DynamicComponent
 </CascadingValue>
 
-@functions {
+@code {
     [CascadingParameter]
     protected PageState PageState { get; set; }
 
diff --git a/Oqtane.Client/Shared/ModuleInstance.razor b/Oqtane.Client/Shared/ModuleInstance.razor
index b2d6f0ad..8a2513a1 100644
--- a/Oqtane.Client/Shared/ModuleInstance.razor
+++ b/Oqtane.Client/Shared/ModuleInstance.razor
@@ -3,7 +3,7 @@
 
 @DynamicComponent
 
-@functions {
+@code {
     [CascadingParameter]
     protected PageState PageState { get; set; }
 
diff --git a/Oqtane.Client/Shared/Pane.razor b/Oqtane.Client/Shared/Pane.razor
index 4a0c0c9a..89776819 100644
--- a/Oqtane.Client/Shared/Pane.razor
+++ b/Oqtane.Client/Shared/Pane.razor
@@ -13,7 +13,7 @@
     @DynamicComponent
 </div>
 
-@functions {
+@code {
     [CascadingParameter]
     protected PageState PageState { get; set; }
 
diff --git a/Oqtane.Client/Shared/PaneLayout.razor b/Oqtane.Client/Shared/PaneLayout.razor
index e117db47..d07d5920 100644
--- a/Oqtane.Client/Shared/PaneLayout.razor
+++ b/Oqtane.Client/Shared/PaneLayout.razor
@@ -3,7 +3,7 @@
 
 @DynamicComponent
 
-@functions {
+@code {
     [CascadingParameter]
     protected PageState PageState { get; set; }
 
diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor
index f313026a..09f7740e 100644
--- a/Oqtane.Client/Shared/SiteRouter.razor
+++ b/Oqtane.Client/Shared/SiteRouter.razor
@@ -5,6 +5,7 @@
 @using System.Collections.Generic
 @using Oqtane.Shared
 @using Microsoft.JSInterop
+@using Microsoft.AspNetCore.Components.Routing
 @inject SiteState SiteState
 @inject IUriHelper UriHelper
 @inject IJSRuntime jsRuntime
@@ -19,7 +20,7 @@
 
 @DynamicComponent
 
-@functions {
+@code {
 
     [CascadingParameter] PageState PageState { get; set; }
 
@@ -236,9 +237,9 @@
         }
     }
 
-    private async void OnLocationChanged(object sender, string AbsoluteUri)
+    private async void OnLocationChanged(object sender, LocationChangedEventArgs args)
     {
-        _absoluteUri = AbsoluteUri;
+        _absoluteUri = args.Location;
         await LocationChanged();
     }
 
diff --git a/Oqtane.Client/Shared/Theme.razor b/Oqtane.Client/Shared/Theme.razor
index b3a0a0ec..b059255c 100644
--- a/Oqtane.Client/Shared/Theme.razor
+++ b/Oqtane.Client/Shared/Theme.razor
@@ -2,7 +2,7 @@
 
 @DynamicComponent
 
-@functions {
+@code {
     [CascadingParameter] PageState PageState { get; set; }
 
     RenderFragment DynamicComponent { get; set; }
diff --git a/Oqtane.Client/Themes/AdminContainer.razor b/Oqtane.Client/Themes/AdminContainer.razor
index ee62578d..57f1f1a0 100644
--- a/Oqtane.Client/Themes/AdminContainer.razor
+++ b/Oqtane.Client/Themes/AdminContainer.razor
@@ -20,7 +20,7 @@
     </div>
 </div>
 
-@functions {
+@code {
     string closeurl;
 
     protected override void OnInit()
diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index ec7f3891..45dc4d4a 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -31,7 +31,7 @@
                 <label for="Module" class="control-label" style="color: white !important;">Module: </label>
                 @if (moduledefinitions != null)
                 {
-                    <select class="form-control" bind="@moduledefinitionname">
+                    <select class="form-control" @bind="@moduledefinitionname">
                         <option value="">&lt;Select Module&gt;</option>
                         @foreach (var moduledefinition in moduledefinitions)
                         {
@@ -42,7 +42,7 @@
             </div>
             <div class="form-group">
                 <label for="Pane" class="control-label" style="color: white !important;">Pane: </label>
-                <select class="form-control" bind="@pane">
+                <select class="form-control" @bind="@pane">
                     <option value="">&lt;Select Pane&gt;</option>
                     @foreach (string pane in PageState.Page.Panes.Split(';'))
                     {
@@ -52,11 +52,11 @@
             </div>
             <div class="form-group">
                 <label for="Title" class="control-label" style="color: white !important;">Title: </label>
-                <input type="text" name="Title" class="form-control" bind="@title" />
+                <input type="text" name="Title" class="form-control" @bind="@title" />
             </div>
             <div class="form-group">
                 <label for="Container" class="control-label" style="color: white !important;">Container: </label>
-                <select class="form-control" bind="@containertype">
+                <select class="form-control" @bind="@containertype">
                     <option value="">&lt;Select Container&gt;</option>
                     @foreach (KeyValuePair<string, string> container in containers)
                     {
@@ -64,13 +64,13 @@
                     }
                 </select>
             </div>
-            <button type="button" class="btn btn-primary" onclick="@AddModule">Add Module To Page</button>
+            <button type="button" class="btn btn-primary" @onclick="@AddModule">Add Module To Page</button>
         </div>
     </div>
 </div>
 <span class="oi oi-menu" style="@display" onclick="openActions()"></span>
 
-@functions {
+@code {
     string display = "display: none";
     List<ModuleDefinition> moduledefinitions;
     Dictionary<string, string> containers = new Dictionary<string, string>();
diff --git a/Oqtane.Client/Themes/Controls/Login.razor b/Oqtane.Client/Themes/Controls/Login.razor
index 718c71fa..a96ae9b9 100644
--- a/Oqtane.Client/Themes/Controls/Login.razor
+++ b/Oqtane.Client/Themes/Controls/Login.razor
@@ -5,9 +5,9 @@
 @inject IUriHelper UriHelper
 @inject IJSRuntime jsRuntime
 
-<button type="button" class="btn btn-primary" onclick="@Click">@name</button>
+<button type="button" class="btn btn-primary" @onclick="@Click">@name</button>
 
-@functions {
+@code {
     string name = "";
 
     protected override async Task OnInitAsync()
diff --git a/Oqtane.Client/Themes/Controls/Logo.razor b/Oqtane.Client/Themes/Controls/Logo.razor
index 5356a3c1..3f77d859 100644
--- a/Oqtane.Client/Themes/Controls/Logo.razor
+++ b/Oqtane.Client/Themes/Controls/Logo.razor
@@ -3,7 +3,7 @@
 
 @((MarkupString)logo)
 
-@functions {
+@code {
     string logo = "";
 
     protected override void OnInit()
diff --git a/Oqtane.Client/Themes/Controls/Menu.razor b/Oqtane.Client/Themes/Controls/Menu.razor
index 3589bc8c..4a5536dd 100644
--- a/Oqtane.Client/Themes/Controls/Menu.razor
+++ b/Oqtane.Client/Themes/Controls/Menu.razor
@@ -30,7 +30,7 @@
     }
 </ul>
 
-@functions {
+@code {
     List<Page> pages;
     Page parent = null;
 
diff --git a/Oqtane.Client/Themes/Controls/ModuleActions.razor b/Oqtane.Client/Themes/Controls/ModuleActions.razor
index 2f31deb5..3f814787 100644
--- a/Oqtane.Client/Themes/Controls/ModuleActions.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleActions.razor
@@ -11,12 +11,12 @@
     <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
         @foreach (var action in actions)
         {
-            <a class="dropdown-item" onclick="@(async () => await ModuleAction(action.Action))">@action.Name</a>
+            <a class="dropdown-item" @onclick="@(async () => await ModuleAction(action.Action))">@action.Name</a>
         }
     </div>
 </div>
 
-@functions {
+@code {
     string display = "display: none";
     List<ActionViewModel> actions;
 
diff --git a/Oqtane.Client/Themes/Controls/ModuleTitle.razor b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
index 12f88728..886ae21b 100644
--- a/Oqtane.Client/Themes/Controls/ModuleTitle.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
@@ -3,7 +3,7 @@
 
 @title
 
-@functions {
+@code {
     string title = "";
 
     protected override void OnInit()
diff --git a/Oqtane.Client/Themes/Controls/Profile.razor b/Oqtane.Client/Themes/Controls/Profile.razor
index b51d656c..e6afd7de 100644
--- a/Oqtane.Client/Themes/Controls/Profile.razor
+++ b/Oqtane.Client/Themes/Controls/Profile.razor
@@ -9,7 +9,7 @@
 
 <NavLink class="btn btn-primary" href="@url">@name</NavLink>
 
-@functions {
+@code {
     string name = "";
     string url = "";
 
diff --git a/Oqtane.Client/Themes/Theme1/Theme1.razor b/Oqtane.Client/Themes/Theme1/Theme1.razor
index d48f3808..8de6feaf 100644
--- a/Oqtane.Client/Themes/Theme1/Theme1.razor
+++ b/Oqtane.Client/Themes/Theme1/Theme1.razor
@@ -27,7 +27,7 @@
     </div>
 </div>
 
-@functions {
+@code {
     public override string Name { get { return "Theme1"; } }
     public override string Panes { get { return "Left;Right"; } }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/Theme2/Theme2.razor b/Oqtane.Client/Themes/Theme2/Theme2.razor
index 7d5708d6..7415e777 100644
--- a/Oqtane.Client/Themes/Theme2/Theme2.razor
+++ b/Oqtane.Client/Themes/Theme2/Theme2.razor
@@ -25,7 +25,7 @@
     </div>
 </div>
 
-@functions {
+@code {
     public override string Name { get { return "Theme2"; } }
     public override string Panes { get { return "Top;Bottom"; } }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor b/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor
index 8b18e622..bf6b4eda 100644
--- a/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor
+++ b/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor
@@ -11,7 +11,7 @@
     </div>
 </div>
 
-@functions {
+@code {
     public override string Name { get { return "Horizontal Layout"; } }
     public override string Panes { get { return "Left;Right"; } }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/Theme3/Theme3.razor b/Oqtane.Client/Themes/Theme3/Theme3.razor
index 35fd3532..a8f5c934 100644
--- a/Oqtane.Client/Themes/Theme3/Theme3.razor
+++ b/Oqtane.Client/Themes/Theme3/Theme3.razor
@@ -20,7 +20,7 @@
     </div>
 </div>
 
-@functions {
+@code {
     public override string Name { get { return "Theme3"; } }
     public override string Panes { get { return ""; } }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/Theme3/VerticalLayout.razor b/Oqtane.Client/Themes/Theme3/VerticalLayout.razor
index fd3f873c..c09852c8 100644
--- a/Oqtane.Client/Themes/Theme3/VerticalLayout.razor
+++ b/Oqtane.Client/Themes/Theme3/VerticalLayout.razor
@@ -9,7 +9,7 @@
     <Pane Name="Bottom" />
 </div>
 
-@functions {
+@code {
     public override string Name { get { return "Vertical Layout"; } }
     public override string Panes { get { return "Top;Bottom"; } }
 }
\ No newline at end of file
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 113a325c..311e5b0f 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -31,8 +31,8 @@
 
   <ItemGroup>
     <PackageReference Include="dbup" Version="4.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview4-19216-03" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview4-19216-03" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview6.19307.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" />
   </ItemGroup>
diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs
index d7b5d3c6..7849d5e7 100644
--- a/Oqtane.Server/Startup.cs
+++ b/Oqtane.Server/Startup.cs
@@ -278,14 +278,15 @@ namespace Oqtane.Server
                 app.UseBlazorDebugging();
             }
 
+            app.UseClientSideBlazorFiles<Client.Startup>();
+
             app.UseRouting();
 
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapDefaultControllerRoute();
+                endpoints.MapFallbackToClientSideBlazor<Client.Startup>("index.html");
             });
-
-            app.UseBlazor<Client.Startup>();
         }
 #endif
     }