diff --git a/.github/workflows/check-buildstatus.yml b/.github/workflows/check-buildstatus.yml
index 2093d4c..620f01f 100644
--- a/.github/workflows/check-buildstatus.yml
+++ b/.github/workflows/check-buildstatus.yml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build TwitchLib.EventSub.Webhooks
diff --git a/.github/workflows/preview-release.yml b/.github/workflows/preview-release.yml
index db61d21..7543106 100644
--- a/.github/workflows/preview-release.yml
+++ b/.github/workflows/preview-release.yml
@@ -10,13 +10,13 @@ jobs:
    runs-on: ubuntu-latest
 
    steps:
-   - uses: actions/checkout@v4
+   - uses: actions/checkout@v5
    - uses: benjlevesque/short-sha@v3.0
      id: short-sha
    - name: Setup .NET
-     uses: actions/setup-dotnet@v3
+     uses: actions/setup-dotnet@v5
      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
    - name: Restore dependencies
      run: dotnet restore
    - name: Build TwitchLib.EventSub.Webhooks
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3261754..d986bfa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,11 +10,11 @@ jobs:
    runs-on: ubuntu-latest
 
    steps:
-   - uses: actions/checkout@v4
+   - uses: actions/checkout@v5
    - name: Setup .NET
-     uses: actions/setup-dotnet@v3
+     uses: actions/setup-dotnet@v5
      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
    - name: Restore dependencies
      run: dotnet restore
    - name: Build TwitchLib.EventSub.Webhooks
diff --git a/TwitchLib.EventSub.Webhooks.Example/TwitchLib.EventSub.Webhooks.Example.csproj b/TwitchLib.EventSub.Webhooks.Example/TwitchLib.EventSub.Webhooks.Example.csproj
index b9b47ba..d61617f 100644
--- a/TwitchLib.EventSub.Webhooks.Example/TwitchLib.EventSub.Webhooks.Example.csproj
+++ b/TwitchLib.EventSub.Webhooks.Example/TwitchLib.EventSub.Webhooks.Example.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/TwitchLib.EventSub.Webhooks.Test/TwitchLib.EventSub.Webhooks.Test.csproj b/TwitchLib.EventSub.Webhooks.Test/TwitchLib.EventSub.Webhooks.Test.csproj
index 739e615..70d6b15 100644
--- a/TwitchLib.EventSub.Webhooks.Test/TwitchLib.EventSub.Webhooks.Test.csproj
+++ b/TwitchLib.EventSub.Webhooks.Test/TwitchLib.EventSub.Webhooks.Test.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <OutputType>Exe</OutputType>
     <RootNamespace>TwitchLib.EventSub.Webhooks.Test</RootNamespace>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <!--
     To enable the Microsoft Testing Platform 'dotnet test' experience, add property:
       <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
@@ -27,10 +27,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="xunit.v3" Version="2.0.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="xunit.v3" Version="3.1.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TwitchLib.EventSub.Webhooks.sln b/TwitchLib.EventSub.Webhooks.sln
deleted file mode 100644
index bf2adfa..0000000
--- a/TwitchLib.EventSub.Webhooks.sln
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.13.35931.197
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TwitchLib.EventSub.Webhooks", "TwitchLib.EventSub.Webhooks\TwitchLib.EventSub.Webhooks.csproj", "{6176B27E-E417-41C8-BDEE-CB09FD342CA5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TwitchLib.EventSub.Webhooks.Example", "TwitchLib.EventSub.Webhooks.Example\TwitchLib.EventSub.Webhooks.Example.csproj", "{26079F7D-9C72-43F9-BCAC-AD7E96AAC5C3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TwitchLib.EventSub.Webhooks.Test", "TwitchLib.EventSub.Webhooks.Test\TwitchLib.EventSub.Webhooks.Test.csproj", "{6951CCDA-242A-8652-D81D-F20D8EF8FD9F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6176B27E-E417-41C8-BDEE-CB09FD342CA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6176B27E-E417-41C8-BDEE-CB09FD342CA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6176B27E-E417-41C8-BDEE-CB09FD342CA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6176B27E-E417-41C8-BDEE-CB09FD342CA5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26079F7D-9C72-43F9-BCAC-AD7E96AAC5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26079F7D-9C72-43F9-BCAC-AD7E96AAC5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26079F7D-9C72-43F9-BCAC-AD7E96AAC5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26079F7D-9C72-43F9-BCAC-AD7E96AAC5C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6951CCDA-242A-8652-D81D-F20D8EF8FD9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6951CCDA-242A-8652-D81D-F20D8EF8FD9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6951CCDA-242A-8652-D81D-F20D8EF8FD9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6951CCDA-242A-8652-D81D-F20D8EF8FD9F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {13902B52-706F-4DA9-8B5F-A1AD45FB4989}
-	EndGlobalSection
-EndGlobal
diff --git a/TwitchLib.EventSub.Webhooks.slnx b/TwitchLib.EventSub.Webhooks.slnx
new file mode 100644
index 0000000..e3aead3
--- /dev/null
+++ b/TwitchLib.EventSub.Webhooks.slnx
@@ -0,0 +1,5 @@
+<Solution>
+  <Project Path="TwitchLib.EventSub.Webhooks.Example/TwitchLib.EventSub.Webhooks.Example.csproj" />
+  <Project Path="TwitchLib.EventSub.Webhooks.Test/TwitchLib.EventSub.Webhooks.Test.csproj" />
+  <Project Path="TwitchLib.EventSub.Webhooks/TwitchLib.EventSub.Webhooks.csproj" />
+</Solution>
diff --git a/TwitchLib.EventSub.Webhooks/Core/Models/WebhookEventSubMetadata.cs b/TwitchLib.EventSub.Webhooks/Core/Models/WebhookEventSubMetadata.cs
index a15a29d..4fd5f0f 100644
--- a/TwitchLib.EventSub.Webhooks/Core/Models/WebhookEventSubMetadata.cs
+++ b/TwitchLib.EventSub.Webhooks/Core/Models/WebhookEventSubMetadata.cs
@@ -11,9 +11,9 @@ public class WebhookEventSubMetadata : EventSubMetadata
     /// <summary>
     /// An ID that uniquely identifies this message.
     /// </summary>
-    public string MessageId { get; set; }
+    public string MessageId { get; set; } = null!;
 
-    public string MessageRetry { get; set; }
+    public string MessageRetry { get; set; } = null!;
 
     /// <summary>
     /// The type of notification.
@@ -23,32 +23,32 @@ public class WebhookEventSubMetadata : EventSubMetadata
     /// <para>webhook_callback_verification — Contains the challenge used to verify that you own the event handler.</para>
     /// <para>revocation — Contains the reason why Twitch revoked your subscription.</para>
     /// </remarks>
-    public string MessageType { get; set; }
+    public string MessageType { get; set; } = null!;
 
     /// <summary>
     /// The HMAC signature that you use to verify that Twitch sent the message.
     /// </summary>
-    public string MessageSignature { get; set; }
+    public string MessageSignature { get; set; } = null!;
 
     /// <summary>
     /// The UTC date and time (in RFC3339 format) that Twitch sent the notification.
     /// </summary>
-    public string MessageTimestamp { get; set; }
+    public string MessageTimestamp { get; set; } = null!;
 
     /// <summary>
     /// The subscription type.
     /// </summary>
-    public string SubscriptionType { get; set; }
+    public string SubscriptionType { get; set; } = null!;
 
     /// <summary>
     /// The subscription version.
     /// </summary>
-    public string SubscriptionVersion { get; set; }
+    public string SubscriptionVersion { get; set; } = null!;
 
     /// <summary>
     /// Contains all headers that start with "twitch-eventsub-"
     /// </summary>
-    public Dictionary<string, string> TwitchEventsubHeaders { get; set; }
+    public Dictionary<string, string> TwitchEventsubHeaders { get; set; } = null!;
 
     internal static bool TryCreateMetadata(IHeaderDictionary headers, out WebhookEventSubMetadata metadata)
     {
diff --git a/TwitchLib.EventSub.Webhooks/Middlewares/EventSubNotificationMiddleware.cs b/TwitchLib.EventSub.Webhooks/Middlewares/EventSubNotificationMiddleware.cs
index 21501b1..5fa7c17 100644
--- a/TwitchLib.EventSub.Webhooks/Middlewares/EventSubNotificationMiddleware.cs
+++ b/TwitchLib.EventSub.Webhooks/Middlewares/EventSubNotificationMiddleware.cs
@@ -44,11 +44,11 @@ public async Task InvokeAsync(HttpContext context)
             }
         }
 
-        private static async Task WriteResponseAsync(HttpContext context, int statusCode, string contentType, string responseBody)
+        private static Task WriteResponseAsync(HttpContext context, int statusCode, string contentType, string responseBody)
         {
             context.Response.StatusCode = statusCode;
             context.Response.ContentType = contentType;
-            await context.Response.WriteAsync(responseBody);
+            return context.Response.WriteAsync(responseBody);
         }
     }
 }
diff --git a/TwitchLib.EventSub.Webhooks/Middlewares/EventSubSignatureVerificationMiddleware.cs b/TwitchLib.EventSub.Webhooks/Middlewares/EventSubSignatureVerificationMiddleware.cs
index e6aadff..c605694 100644
--- a/TwitchLib.EventSub.Webhooks/Middlewares/EventSubSignatureVerificationMiddleware.cs
+++ b/TwitchLib.EventSub.Webhooks/Middlewares/EventSubSignatureVerificationMiddleware.cs
@@ -130,11 +130,11 @@ private static async Task<ReadOnlyMemory<byte>> ReadRequestBodyContentAsync(Http
             return memoryStream.GetBuffer().AsMemory(0, (int)memoryStream.Position);
         }
 
-        private static async Task WriteResponseAsync(HttpContext context, int statusCode, string contentType, string responseBody)
+        private static Task WriteResponseAsync(HttpContext context, int statusCode, string contentType, string responseBody)
         {
             context.Response.StatusCode = statusCode;
             context.Response.ContentType = contentType;
-            await context.Response.WriteAsync(responseBody);
+            return context.Response.WriteAsync(responseBody);
         }
     }
 }
diff --git a/TwitchLib.EventSub.Webhooks/TwitchLib.EventSub.Webhooks.csproj b/TwitchLib.EventSub.Webhooks/TwitchLib.EventSub.Webhooks.csproj
index fdd0aeb..16d3e8d 100644
--- a/TwitchLib.EventSub.Webhooks/TwitchLib.EventSub.Webhooks.csproj
+++ b/TwitchLib.EventSub.Webhooks/TwitchLib.EventSub.Webhooks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <PackageId>TwitchLib.EventSub.Webhooks</PackageId>
     <Authors>swiftyspiffy, Prom3theu5, Syzuna, LuckyNoS7evin</Authors>
     <PackageTags>twitchlib;twitch,eventsub;webhooks</PackageTags>
@@ -11,14 +11,14 @@
     <AssemblyVersion>3.0.0</AssemblyVersion>
     <PackageReleaseNotes>Added .NET 8 build target, Updated TwitchLib.EventSub.Core to the latest version to include the latest subscription type changes</PackageReleaseNotes>
     <RepositoryType>git</RepositoryType>
-    <PackageIconUrl>https://cdn.syzuna-programs.de/images/twitchlib.png</PackageIconUrl>
+	<PackageIcon>twitchlib.png</PackageIcon>
     <PackageProjectUrl>https://github.com/TwitchLib/TwitchLib.EventSub.Webhooks</PackageProjectUrl>
     <RepositoryUrl>https://github.com/TwitchLib/TwitchLib.EventSub.Webhooks</RepositoryUrl>
     <NeutralLanguage>en-US</NeutralLanguage>
 	<PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
-    <Copyright>Copyright 2023</Copyright>
+    <Copyright>Copyright 2025</Copyright>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
@@ -34,6 +34,7 @@
 
   <ItemGroup>
 	<None Include="..\README.md" Pack="true" PackagePath="\" />
+	<None Include="..\twitchlib.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
 </Project>
diff --git a/twitchlib.png b/twitchlib.png
new file mode 100644
index 0000000..25683ee
Binary files /dev/null and b/twitchlib.png differ