diff --git a/sample/Demo/Demo.csproj b/sample/Demo/Demo.csproj
index 5d7019f..ef09257 100644
--- a/sample/Demo/Demo.csproj
+++ b/sample/Demo/Demo.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/DemoAuth/DemoAuth.csproj b/sample/DemoAuth/DemoAuth.csproj
index 61fa105..f77c9d7 100644
--- a/sample/DemoAuth/DemoAuth.csproj
+++ b/sample/DemoAuth/DemoAuth.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>aspnet-WebApplication2-BE3CB597-3006-40BA-9FE0-C651562C4A99</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/sample/DemoServer/DemoServer.csproj b/sample/DemoServer/DemoServer.csproj
index 968505f..3fbc4f4 100644
--- a/sample/DemoServer/DemoServer.csproj
+++ b/sample/DemoServer/DemoServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/XTabs/BlazorXTabs.csproj b/src/XTabs/BlazorXTabs.csproj
index 7f2432b..4cee583 100644
--- a/src/XTabs/BlazorXTabs.csproj
+++ b/src/XTabs/BlazorXTabs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,12 +32,17 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
 	</ItemGroup>
 
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
+	</ItemGroup>
+
   <PropertyGroup>
   </PropertyGroup>
 
   <PropertyGroup>
     <PackageId>BlazorXTabs</PackageId>
-    <Version>1.9.0</Version>
+    <Version>2.0.0</Version>
     <Authors>David Moreira</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <ProjectUrl>https://github.com/David-Moreira/XTabs</ProjectUrl>
diff --git a/src/XTabs/XTabs.razor b/src/XTabs/XTabs.razor
index 5da7c79..79be512 100644
--- a/src/XTabs/XTabs.razor
+++ b/src/XTabs/XTabs.razor
@@ -21,7 +21,7 @@
         </div>
 
         <div class="xtabs-content tab-content">
-            @if ( RenderMode == RenderMode.Full )
+            @if ( RenderMode == BlazorXTabs.Configuration.RenderMode.Full )
             {
                 @foreach ( var tab in TabContent )
                 {
@@ -65,7 +65,7 @@
                 }
             }
 
-            @if ( RenderMode == RenderMode.Steps )
+            @if ( RenderMode == BlazorXTabs.Configuration.RenderMode.Steps )
             {
                 <div class="xtabs-steps-buttons d-flex justify-content-center mb-1">
                     @if ( PreviousStepsContent is object )