diff --git a/HotKeys2.E2ETest/Toolbelt.Blazor.HotKeys.E2ETest.csproj b/HotKeys2.E2ETest/Toolbelt.Blazor.HotKeys.E2ETest.csproj
index 2b65368..279426e 100644
--- a/HotKeys2.E2ETest/Toolbelt.Blazor.HotKeys.E2ETest.csproj
+++ b/HotKeys2.E2ETest/Toolbelt.Blazor.HotKeys.E2ETest.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.41.2" />
+    <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.42.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageReference Include="Toolbelt.WorkDirectory" Version="1.0.0" />
diff --git a/HotKeys2/ILLink.Substitutions.xml b/HotKeys2/ILLink.Substitutions.xml
index 0617026..b33d595 100644
--- a/HotKeys2/ILLink.Substitutions.xml
+++ b/HotKeys2/ILLink.Substitutions.xml
@@ -2,7 +2,7 @@
 <linker>
   <assembly fullname="Toolbelt.Blazor.HotKeys2">
     <type fullname="Toolbelt.Blazor.HotKeys2.HotKeys" feature="Toolbelt.Blazor.HotKeys2.OptimizeForWasm" featurevalue="true">
-      <method signature="System.String GetVersionText()" body="stub" value="3.3.0" />
+      <method signature="System.String GetVersionText()" body="stub" value="4.0.0" />
     </type>
   </assembly>
 </linker>
\ No newline at end of file
diff --git a/HotKeys2/Toolbelt.Blazor.HotKeys2.csproj b/HotKeys2/Toolbelt.Blazor.HotKeys2.csproj
index 77be3a6..685a4cf 100644
--- a/HotKeys2/Toolbelt.Blazor.HotKeys2.csproj
+++ b/HotKeys2/Toolbelt.Blazor.HotKeys2.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>3.3.0</Version>
+    <Version>4.0.0</Version>
     <Copyright>Copyright © 2022-2024 J.Sakamoto, Mozilla Public License 2.0</Copyright>
     <Authors>J.Sakamoto</Authors>
     <RepositoryType>git</RepositoryType>
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 8bda9e7..78a70c1 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,3 +1,8 @@
+v.4.0.0
+- [Breaking Change] The "Remove()" method now removes a single hotkey entry by only the key combination parameters, at least as long as it can be uniquely identified.
+  - It will throw an exception if the parameters identify two or more hotkey entries.
+- Improve: Add another overloaded "Remove()" method with a filter function to remove multiple hotkey entries.
+
 v.3.3.0
 - Improve: Add overloaded version of Add() methods for async methods returns a Task.
 
diff --git a/SampleSites/Client/SampleSite.Client.csproj b/SampleSites/Client/SampleSite.Client.csproj
index 6007220..669ddcf 100644
--- a/SampleSites/Client/SampleSite.Client.csproj
+++ b/SampleSites/Client/SampleSite.Client.csproj
@@ -9,23 +9,23 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PublishSPAforGitHubPages.Build" Version="2.1.0" />
+    <PackageReference Include="PublishSPAforGitHubPages.Build" Version="2.1.1" />
     <PackageReference Include="BlazorWasmPreRendering.Build" Version="3.1.0-preview.4" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'  ">
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.11" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.28" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.28" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'  ">
-    <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="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.17" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.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="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.3" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SampleSites/Components/SampleSite.Components.csproj b/SampleSites/Components/SampleSite.Components.csproj
index 3b684d7..d3ca438 100644
--- a/SampleSites/Components/SampleSite.Components.csproj
+++ b/SampleSites/Components/SampleSite.Components.csproj
@@ -8,19 +8,19 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.28" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.17" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="3.3.0" />
+    <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="4.0.0" />
     <!--<ProjectReference Include="..\..\HotKeys2\Toolbelt.Blazor.HotKeys2.csproj" />-->
   </ItemGroup>
 
diff --git a/SampleSites/Server8/SampleSite.Server8.csproj b/SampleSites/Server8/SampleSite.Server8.csproj
index 8e3c0bc..a238590 100644
--- a/SampleSites/Server8/SampleSite.Server8.csproj
+++ b/SampleSites/Server8/SampleSite.Server8.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.3" />
   </ItemGroup>
 
   <ItemGroup>