diff --git a/src/BlazeKit.Website.Islands/BlazeKit.Website.Islands.csproj b/src/BlazeKit.Website.Islands/BlazeKit.Website.Islands.csproj
index b103a6a..7cc3cfb 100644
--- a/src/BlazeKit.Website.Islands/BlazeKit.Website.Islands.csproj
+++ b/src/BlazeKit.Website.Islands/BlazeKit.Website.Islands.csproj
@@ -4,13 +4,19 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <CompilerGeneratedFilesOutputPath>.blazekit</CompilerGeneratedFilesOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.CustomElements" Version="8.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
     <ProjectReference Include="..\..\src\BlazeKit.Reactivity\BlazeKit.Reactivity.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Components\MVVM\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/BlazeKit.Website.Islands/Components/BlzInteractive.cs b/src/BlazeKit.Website.Islands/Components/BlzInteractive.cs
new file mode 100644
index 0000000..d1c9d5e
--- /dev/null
+++ b/src/BlazeKit.Website.Islands/Components/BlzInteractive.cs
@@ -0,0 +1,17 @@
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
+
+namespace BlazeKit.Website.Islands;
+
+[__PrivateComponentRenderModeAttribute]
+public abstract class BlzInteractive : ComponentBase
+{
+    public BlzInteractive()
+    { }
+
+    private sealed class __PrivateComponentRenderModeAttribute : global::Microsoft.AspNetCore.Components.RenderModeAttribute
+    {
+        private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl => RenderMode.InteractiveWebAssembly;
+        public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
+    }
+}
diff --git a/src/BlazeKit.Website.Islands/Components/Counter.razor b/src/BlazeKit.Website.Islands/Components/Counter.razor
index ad3ded5..c4a33d4 100644
--- a/src/BlazeKit.Website.Islands/Components/Counter.razor
+++ b/src/BlazeKit.Website.Islands/Components/Counter.razor
@@ -1,4 +1,5 @@
 @inherits ReactiveComponentEnvelope
+
 @code
 {
     private ISignal<string> text;
diff --git a/src/BlazeKit.Website.Islands/Components/HydratedComponent.razor b/src/BlazeKit.Website.Islands/Components/HydratedComponent.razor
new file mode 100644
index 0000000..0e0a109
--- /dev/null
+++ b/src/BlazeKit.Website.Islands/Components/HydratedComponent.razor
@@ -0,0 +1,23 @@
+@code {
+    [Parameter] required public RenderFragment SSG {get;set;}
+    [Parameter] required public RenderFragment CSR {get;set;}
+
+    [Inject] required public IJSRuntime jsRuntime {get;set;}
+
+    @* [Parameter] public BlazeKit.Islands.LoadOn LoadAt {get;set;} = BlazeKit.Islands.LoadOn.Hover; *@
+    private string id = "";
+    protected override async void OnInitialized()
+    {
+        if(!OperatingSystem.IsBrowser()) {
+            // generate SSG id for compoennt
+            id = Guid.NewGuid().ToString();
+        }
+    }
+
+}
+@if(!OperatingSystem.IsBrowser()) {
+    @* <div load-on="@LoadAt.ToString().ToLower()" blazekit-id="@id"> *@
+        @SSG
+    @* </div> *@
+}
+@CSR
diff --git a/src/BlazeKit.Website.Islands/Components/MVVM/Counter.razor b/src/BlazeKit.Website.Islands/Components/MVVM/Counter.razor
new file mode 100644
index 0000000..f663f1e
--- /dev/null
+++ b/src/BlazeKit.Website.Islands/Components/MVVM/Counter.razor
@@ -0,0 +1,26 @@
+@inherits ReactiveComponentEnvelope
+@code {
+    public Islands.Components.MVVM.VMCounter ViewModel { get; set; }
+
+    public Counter() { }
+
+    override protected void OnInitialized()
+    {
+        ViewModel = new Islands.Components.MVVM.VMCounter(this);
+    }
+
+    private MarkupString AsHtml(string code)
+    {
+        return new MarkupString(code);
+    }
+}
+@if(ViewModel == null) {
+    <p>Loading...</p>
+} else {
+    <article>
+        <p>Counter: @ViewModel.Counter.Value</p>
+        <p>Doubled: @ViewModel.Doubled.Value</p>
+        <button role="button" @onclick:preventDefault="true" @onclick="() => ViewModel.Increment()">Increment</button>
+        <button role="button" @onclick:preventDefault="true" @onclick="() => ViewModel.Decrement()">Decrement</button>
+    </article>
+}
diff --git a/src/BlazeKit.Website/Routes/Reactivity/MVVM/VMCounter.cs b/src/BlazeKit.Website.Islands/Components/MVVM/VMCounter.cs
similarity index 94%
rename from src/BlazeKit.Website/Routes/Reactivity/MVVM/VMCounter.cs
rename to src/BlazeKit.Website.Islands/Components/MVVM/VMCounter.cs
index e2761a0..384d242 100644
--- a/src/BlazeKit.Website/Routes/Reactivity/MVVM/VMCounter.cs
+++ b/src/BlazeKit.Website.Islands/Components/MVVM/VMCounter.cs
@@ -2,7 +2,7 @@
 using BlazeKit.Reactivity;
 using BlazeKit.Reactivity.Blazor;
 
-namespace BlazeKit.Site.Pages.Reactivity.MVVM
+namespace BlazeKit.Website.Islands.Components.MVVM
 {
     public sealed class VMCounter
     {
diff --git a/src/BlazeKit.Website.Islands/Components/MyCounter.razor b/src/BlazeKit.Website.Islands/Components/MyCounter.razor
new file mode 100644
index 0000000..53e28f1
--- /dev/null
+++ b/src/BlazeKit.Website.Islands/Components/MyCounter.razor
@@ -0,0 +1,12 @@
+@* @inherits BlzInteractive *@
+@code {
+    [Parameter] public int CurrentCount { get; set; }
+
+     private void IncrementCount()
+    {
+        CurrentCount++;
+    }
+}
+<h3>MyCounter</h3>
+<p>Current Count = @CurrentCount</p>
+<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
diff --git a/src/BlazeKit.Website.Islands/Components/MyCounter.razor.cs b/src/BlazeKit.Website.Islands/Components/MyCounter.razor.cs
new file mode 100644
index 0000000..aa22a8b
--- /dev/null
+++ b/src/BlazeKit.Website.Islands/Components/MyCounter.razor.cs
@@ -0,0 +1,6 @@
+namespace BlazeKit.Website.Islands;
+
+public partial class MyCounter : BlzInteractive
+{
+
+}
diff --git a/src/BlazeKit.Website.Islands/_Imports.razor b/src/BlazeKit.Website.Islands/_Imports.razor
index d4bdf8a..9407a11 100644
--- a/src/BlazeKit.Website.Islands/_Imports.razor
+++ b/src/BlazeKit.Website.Islands/_Imports.razor
@@ -10,3 +10,4 @@
 @using BlazeKit.Reactivity
 @using BlazeKit.Reactivity.Signals
 @using BlazeKit.Reactivity.Blazor
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
diff --git a/src/BlazeKit.Website/AppRouter.razor b/src/BlazeKit.Website/AppRouter.razor
index fd64836..64f15f0 100644
--- a/src/BlazeKit.Website/AppRouter.razor
+++ b/src/BlazeKit.Website/AppRouter.razor
@@ -1,5 +1,3 @@
-@using BlazeKit.Site;
-@using BlazeKit.Site.Pages;
 <Router AppAssembly="@typeof(Index).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(Routes.Layout)" />
diff --git a/src/BlazeKit.Website/BlazeKit.Website.csproj b/src/BlazeKit.Website/BlazeKit.Website.csproj
index b930131..840b7aa 100644
--- a/src/BlazeKit.Website/BlazeKit.Website.csproj
+++ b/src/BlazeKit.Website/BlazeKit.Website.csproj
@@ -8,17 +8,14 @@
     <CompilerGeneratedFilesOutputPath>.blazekit</CompilerGeneratedFilesOutputPath>
   </PropertyGroup>
 
-
   <ItemGroup>
-    <SupportedPlatform Include="browser" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
+    <!-- <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" /> -->
     <PackageReference Include="Markdig" Version="0.33.0" />
     <ProjectReference Include="..\..\src\BlazeKit.Reactivity\BlazeKit.Reactivity.csproj" />
     <ProjectReference Include="..\BlazeKit\BlazeKit.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\BlazeKit.Website.Islands\BlazeKit.Website.Islands.csproj" />
+    <ProjectReference Include="..\BlazeKit.Static\BlazeKit.Static.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -33,10 +30,6 @@
     <Watch Include="Routes/**/*.md" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\BlazeKit.Website.Islands\BlazeKit.Website.Islands.csproj" />
-    <ProjectReference Include="..\BlazeKit.Static\BlazeKit.Static.csproj" />
-  </ItemGroup>
 
   <!-- <Target Name="SSG" AfterTargets="AfterPublish">
     <PropertyGroup>
diff --git a/src/BlazeKit.Website/ExampleJsInterop.cs b/src/BlazeKit.Website/ExampleJsInterop.cs
deleted file mode 100644
index ad7b90f..0000000
--- a/src/BlazeKit.Website/ExampleJsInterop.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Microsoft.JSInterop;
-
-namespace BlazeKit.Website;
-
-// This class provides an example of how JavaScript functionality can be wrapped
-// in a .NET class for easy consumption. The associated JavaScript module is
-// loaded on demand when first needed.
-//
-// This class can be registered as scoped DI service and then injected into Blazor
-// components for use.
-
-public class ExampleJsInterop : IAsyncDisposable
-{
-    private readonly Lazy<Task<IJSObjectReference>> moduleTask;
-
-    public ExampleJsInterop(IJSRuntime jsRuntime)
-    {
-        moduleTask = new (() => jsRuntime.InvokeAsync<IJSObjectReference>(
-            "import", "./_content/BlazeKit.Website/exampleJsInterop.js").AsTask());
-    }
-
-    public async ValueTask<string> Prompt(string message)
-    {
-        var module = await moduleTask.Value;
-        return await module.InvokeAsync<string>("showPrompt", message);
-    }
-
-    public async ValueTask DisposeAsync()
-    {
-        if (moduleTask.IsValueCreated)
-        {
-            var module = await moduleTask.Value;
-            await module.DisposeAsync();
-        }
-    }
-}
diff --git a/src/BlazeKit.Website/Program.cs b/src/BlazeKit.Website/Program.cs
index 64a5566..09eb5ba 100644
--- a/src/BlazeKit.Website/Program.cs
+++ b/src/BlazeKit.Website/Program.cs
@@ -18,25 +18,28 @@
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-builder.Services.AddRazorComponents().AddInteractiveWebAssemblyComponents();
+builder.Services.AddRazorComponents()
+            .AddInteractiveWebAssemblyComponents();
 
 var app = builder.Build();
 // Configure the HTTP request pipeline.
-if (!app.Environment.IsDevelopment())
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
 {
     app.UseExceptionHandler("/Error", createScopeForErrors: true);
     // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
     app.UseHsts();
-} else {
-  app.UseWebAssemblyDebugging();
 }
-app.UseBlazorFrameworkFiles();
+// app.UseBlazorFrameworkFiles();
 
 app.UseHttpsRedirection();
-
 app.UseStaticFiles();
 app.UseAntiforgery();
 
-app.MapRazorComponents<BlazeKit.Website.Index>().AddInteractiveWebAssemblyRenderMode();
+app.MapRazorComponents<BlazeKit.Website.Index>()
+        .AddInteractiveWebAssemblyRenderMode();
 
 app.Run();
diff --git a/src/BlazeKit.Website/Properties/launchSettings.json b/src/BlazeKit.Website/Properties/launchSettings.json
new file mode 100644
index 0000000..b79b18b
--- /dev/null
+++ b/src/BlazeKit.Website/Properties/launchSettings.json
@@ -0,0 +1,41 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+    "iisSettings": {
+      "windowsAuthentication": false,
+      "anonymousAuthentication": true,
+      "iisExpress": {
+        "applicationUrl": "http://localhost:45568",
+        "sslPort": 44379
+      }
+    },
+    "profiles": {
+      "http": {
+        "commandName": "Project",
+        "dotnetRunMessages": true,
+        "launchBrowser": true,
+        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+        "applicationUrl": "http://localhost:5000",
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      },
+      "https": {
+        "commandName": "Project",
+        "dotnetRunMessages": true,
+        "launchBrowser": true,
+        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+        "applicationUrl": "https://localhost:7089;http://localhost:5001",
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      },
+      "IIS Express": {
+        "commandName": "IISExpress",
+        "launchBrowser": true,
+        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      }
+    }
+  }
diff --git a/src/BlazeKit.Website/Routes/Create-A-Project/Layout.razor b/src/BlazeKit.Website/Routes/(Getting-Started)/Create-A-Project/Layout.razor
similarity index 100%
rename from src/BlazeKit.Website/Routes/Create-A-Project/Layout.razor
rename to src/BlazeKit.Website/Routes/(Getting-Started)/Create-A-Project/Layout.razor
diff --git a/src/BlazeKit.Website/Routes/Create-A-Project/Page.md b/src/BlazeKit.Website/Routes/(Getting-Started)/Create-A-Project/Page.md
similarity index 100%
rename from src/BlazeKit.Website/Routes/Create-A-Project/Page.md
rename to src/BlazeKit.Website/Routes/(Getting-Started)/Create-A-Project/Page.md
diff --git a/src/BlazeKit.Website/Routes/Layouts/Page.md b/src/BlazeKit.Website/Routes/Layouts/Page.md
index 9020353..c700fff 100644
--- a/src/BlazeKit.Website/Routes/Layouts/Page.md
+++ b/src/BlazeKit.Website/Routes/Layouts/Page.md
@@ -1,14 +1,6 @@
 # 🖼️ File-based Layouts
 **BlazeKit** uses a file-based layout convention which is inspired by [SvelteKit](https/kit.svelte.dev). Again a huge shoutout to the svelte Team for the inspiration.
 
-<div>
-<!--Blazor:{"type":"webassembly","prerenderId":"a6352c03-e287-4367-b7b0-3252740b1477","key":{"locationHash":"cf243a98-9ca6-450a-8723-f31a73a08cc5","formattedComponentKey":""},"assembly":"BlazeKit.Website.Islands","typeName":"BlazeKit.Website.Islands.Components.Counter","parameterDefinitions":"W10=","parameterValues":"W10="}-->
-<BlazeKit.Website.Islands.Components.BlzIsland ComponentType="@(typeof(BlazeKit.Website.Islands.Components.Counter))">
-    <BlazeKit.Website.Islands.Components.Counter />
-</BlazeKit.Website.Islands.Components.BlzIsland>
-<!--Blazor:{"prerenderId":"a6352c03-e287-4367-b7b0-3252740b1477"}-->
-</div>
-
 ## Layout nesting
 Similar to the file-based routing, a layout can be defined in a folder by adding `Layout.razor` file.
 This file **needs to inherit** from **`LayoutComopentBase`**
diff --git a/src/BlazeKit.Website/Routes/Reactivity/Basic/Page.razor b/src/BlazeKit.Website/Routes/Reactivity/Basic/Page.razor
index f1b6020..534cfcc 100644
--- a/src/BlazeKit.Website/Routes/Reactivity/Basic/Page.razor
+++ b/src/BlazeKit.Website/Routes/Reactivity/Basic/Page.razor
@@ -10,11 +10,11 @@
     }
 }
 <h1>Basic</h1>
+
 <BlzIsland ComponentType="@(typeof(Counter))">
     <Counter />
 </BlzIsland>
 
-
 <h4>Code Example</h4>
 <pre>
 <code class="language-cshtml-razor">
diff --git a/src/BlazeKit.Website/Routes/Reactivity/MVVM/Page.razor b/src/BlazeKit.Website/Routes/Reactivity/MVVM/Page.razor
index 9b04438..c7ab340 100644
--- a/src/BlazeKit.Website/Routes/Reactivity/MVVM/Page.razor
+++ b/src/BlazeKit.Website/Routes/Reactivity/MVVM/Page.razor
@@ -1,14 +1,4 @@
-@using BlazeKit.Site.Pages.Reactivity.MVVM
 @code {
-    public VMCounter ViewModel { get; set; }
-
-    public Page()
-    { }
-
-    override protected void OnInitialized()
-    {
-        ViewModel = new VMCounter(this);
-    }
 
     private MarkupString AsHtml(string code)
     {
@@ -17,12 +7,9 @@
 }
 <h1>Model View ViewModel</h1>
 <p>You can even use an MVVM pattern if you like 👍</p>
-<article>
-    <p>Counter: @ViewModel.Counter.Value</p>
-    <p>Doubled: @ViewModel.Doubled.Value</p>
-    <button role="button" @onclick:preventDefault="true" @onclick="() => ViewModel.Increment()">Increment</button>
-    <button role="button" @onclick:preventDefault="true" @onclick="() => ViewModel.Decrement()">Decrement</button>
-</article>
+<BlzIsland ComponentType="@(typeof(BlazeKit.Website.Islands.Components.MVVM.Counter))">
+    <BlazeKit.Website.Islands.Components.MVVM.Counter />
+</BlzIsland>
 <h3>Code Example</h3>
 <pre>
     <code class="language-cshtml-razor">
diff --git a/src/BlazeKit.Website/_Imports.razor b/src/BlazeKit.Website/_Imports.razor
index 126bc4b..547234c 100644
--- a/src/BlazeKit.Website/_Imports.razor
+++ b/src/BlazeKit.Website/_Imports.razor
@@ -4,7 +4,6 @@
 @using Microsoft.AspNetCore.Components.Web
 @* @using Microsoft.AspNetCore.Components.WebAssembly.Http *@
 @using Microsoft.JSInterop
-@using BlazeKit.Site
 @using BlazeKit.Website.Components
 @using BlazeKit.Website
 @using BlazeKit.Website.Islands.Components
diff --git a/src/BlazeKit.Website/appsettings.Development.json b/src/BlazeKit.Website/appsettings.Development.json
new file mode 100644
index 0000000..0c208ae
--- /dev/null
+++ b/src/BlazeKit.Website/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/src/BlazeKit.Website/appsettings.json b/src/BlazeKit.Website/appsettings.json
new file mode 100644
index 0000000..10f68b8
--- /dev/null
+++ b/src/BlazeKit.Website/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}