diff --git a/.github/README.md b/.github/README.md
index 8324b24..cc9e5a5 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -1,10 +1,10 @@
 # Data Protection
 
-[![Documentation](https://img.shields.io/badge/Documentation-123?color=394933&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0iY3VycmVudENvbG9yIiBjb2xvcj0id2hpdGUiIGNsYXNzPSJiaSBiaS1ib29rIiB2aWV3Qm94PSIwIDAgMTYgMTYiPgogIDxwYXRoIGQ9Ik0xIDIuODI4Yy44ODUtLjM3IDIuMTU0LS43NjkgMy4zODgtLjg5MyAxLjMzLS4xMzQgMi40NTguMDYzIDMuMTEyLjc1MnY5Ljc0NmMtLjkzNS0uNTMtMi4xMi0uNjAzLTMuMjEzLS40OTMtMS4xOC4xMi0yLjM3LjQ2MS0zLjI4Ny44MTF6bTcuNS0uMTQxYy42NTQtLjY4OSAxLjc4Mi0uODg2IDMuMTEyLS43NTIgMS4yMzQuMTI0IDIuNTAzLjUyMyAzLjM4OC44OTN2OS45MjNjLS45MTgtLjM1LTIuMTA3LS42OTItMy4yODctLjgxLTEuMDk0LS4xMTEtMi4yNzgtLjAzOS0zLjIxMy40OTJ6TTggMS43ODNDNy4wMTUuOTM2IDUuNTg3LjgxIDQuMjg3Ljk0Yy0xLjUxNC4xNTMtMy4wNDIuNjcyLTMuOTk0IDEuMTA1QS41LjUgMCAwIDAgMCAyLjV2MTFhLjUuNSAwIDAgMCAuNzA3LjQ1NWMuODgyLS40IDIuMzAzLS44ODEgMy42OC0xLjAyIDEuNDA5LS4xNDIgMi41OS4wODcgMy4yMjMuODc3YS41LjUgMCAwIDAgLjc4IDBjLjYzMy0uNzkgMS44MTQtMS4wMTkgMy4yMjItLjg3NyAxLjM3OC4xMzkgMi44LjYyIDMuNjgxIDEuMDJBLjUuNSAwIDAgMCAxNiAxMy41di0xMWEuNS41IDAgMCAwLS4yOTMtLjQ1NWMtLjk1Mi0uNDMzLTIuNDgtLjk1Mi0zLjk5NC0xLjEwNUMxMC40MTMuODA5IDguOTg1LjkzNiA4IDEuNzgzIi8+Cjwvc3ZnPg==&style=for-the-badge)](https://docs.jcdc.dev/umbraco-community-dataprotection/latest)
-[![Umbraco Marketplace](https://img.shields.io/badge/Umbraco%20Marketplace-%23f5c1bc?logo=umbraco&logoColor=162335&style=for-the-badge)](https://marketplace.umbraco.com/package/Umbraco.Community.DataProtection)
-[![GitHub](https://img.shields.io/badge/GitHub-1?logo=github&color=232925&style=for-the-badge)](https://github.com/jcdcdev/Umbraco.Community.DataProtection)
-[![NuGet Downloads](https://img.shields.io/nuget/dt/Umbraco.Community.DataProtection?labelColor=4536d3&color=4536d3&label=NuGet&logo=nuget&style=for-the-badge)](https://www.nuget.org/packages/Umbraco.Community.DataProtection)
-[![Project Website](https://img.shields.io/badge/Project%20Website-jcdcdev?color=3c4834&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0id2hpdGUiIGNsYXNzPSJiaSBiaS1wYy1kaXNwbGF5IiB2aWV3Qm94PSIwIDAgMTYgMTYiPgogIDxwYXRoIGQ9Ik04IDFhMSAxIDAgMCAxIDEtMWg2YTEgMSAwIDAgMSAxIDF2MTRhMSAxIDAgMCAxLTEgMUg5YTEgMSAwIDAgMS0xLTF6bTEgMTMuNWEuNS41IDAgMSAwIDEgMCAuNS41IDAgMCAwLTEgMG0yIDBhLjUuNSAwIDEgMCAxIDAgLjUuNSAwIDAgMC0xIDBNOS41IDFhLjUuNSAwIDAgMCAwIDFoNWEuNS41IDAgMCAwIDAtMXpNOSAzLjVhLjUuNSAwIDAgMCAuNS41aDVhLjUuNSAwIDAgMCAwLTFoLTVhLjUuNSAwIDAgMC0uNS41TTEuNSAyQTEuNSAxLjUgMCAwIDAgMCAzLjV2N0ExLjUgMS41IDAgMCAwIDEuNSAxMkg2djJoLS41YS41LjUgMCAwIDAgMCAxSDd2LTRIMS41YS41LjUgMCAwIDEtLjUtLjV2LTdhLjUuNSAwIDAgMSAuNS0uNUg3VjJ6Ii8+Cjwvc3ZnPg==&style=for-the-badge)](https://jcdc.dev/umbraco-packages/data-protection)
+[![Documentation](https://jcdc.dev/badge/Documentation/primary/book)](https://docs.jcdc.dev/umbraco-community-dataprotection/latest)
+[![Umbraco Marketplace](https://jcdc.dev/badge/Umbraco%20Marketplace/umbraco/umbraco)](https://marketplace.umbraco.com/package/Umbraco.Community.DataProtection)
+[![GitHub](https://jcdc.dev/badge/GitHub/github/github)](https://github.com/jcdcdev/Umbraco.Community.DataProtection)
+[![NuGet package downloads](https://jcdc.dev/badge/nuget/Umbraco.Community.DataProtection)](https://www.nuget.org/packages/Umbraco.Community.DataProtection)
+[![Project Website](https://jcdc.dev/badge/Project%20Website/primary/laptop)](https://jcdc.dev/umbraco-packages/data-protection)
 
 
 
@@ -22,10 +22,10 @@ dotnet add package Umbraco.Community.DataProtection
 
 ## Security
 
-> [!NOTE]
-> This project takes security and support seriously.
-> Please visit the [Security](https://github.com/jcdcdev/Umbraco.Community.DataProtection?tab=security-ov-file) page for more information.
-
+> [!NOTE]
+> This project takes security and support seriously.
+> Please visit the [Security](https://github.com/jcdcdev/Umbraco.Community.DataProtection?tab=security-ov-file) page for more information.
+
 
 
 ## Contributing
diff --git a/SECURITY.md b/SECURITY.md
index 1175230..74d7b88 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -8,18 +8,18 @@ The following table outlines the versions of the project that are currently supp
 > Once a version starts its security phase, it will no longer receive feature updates. Only critical bug fixes and security updates will be provided.
 
 | Package Version                                                                            | Umbraco Version | Security Phase Start | End of Life |
-| ---------------------------------------------------------------------------------- | --------------- | -------------------- | ----------- |
-| [13.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v13) | 13 | 2025-12-14 | 2026-12-14 |
-| [16.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v16) | 16 | 2026-03-12 | 2026-06-12 |
+| ---------------------------------------------------------------------------------- | --------------- | -------------------- | ----------- || [13.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v13) | 13 | 2025-12-14 | 2026-12-14 |
+| [16.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v16) | 16 | 2026-03-12 | 2026-06-12 |
 | [17.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v17) | 17 | 2027-11-27 | 2028-11-27 |
+
 ## Unsupported Versions
 
 | Package Version                                                               |  Umbraco Version  | End of Life |
-| ---------------------------------------------------------------------------------- | ---------------  | ----------- |
-| [10.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v10) | 10 | 2025-06-16 |
-| [12.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v12) | 12 | 2024-06-29 |
-| [14.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v14) | 14 | 2025-05-30 |
-| [15.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v15) | 15 | 2025-11-14 |
+| ---------------------------------------------------------------------------------- | ---------------  | ----------- || [10.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v10) | 10 | 2025-06-16 |
+| [12.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v12) | 12 | 2024-06-29 |
+| [14.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v14) | 14 | 2025-05-30 |
+| [15.x](https://github.com/jcdcdev/Umbraco.Community.DataProtection/tree/v15) | 15 | 2025-11-14 |
+
 
 
 ## Future Support
diff --git a/docs/README_nuget.md b/docs/README_nuget.md
index 5a92da0..5c54a1b 100644
--- a/docs/README_nuget.md
+++ b/docs/README_nuget.md
@@ -1,10 +1,10 @@
 # Data Protection
 
-[![Documentation](https://img.shields.io/badge/Documentation-123?color=394933&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0iY3VycmVudENvbG9yIiBjb2xvcj0id2hpdGUiIGNsYXNzPSJiaSBiaS1ib29rIiB2aWV3Qm94PSIwIDAgMTYgMTYiPgogIDxwYXRoIGQ9Ik0xIDIuODI4Yy44ODUtLjM3IDIuMTU0LS43NjkgMy4zODgtLjg5MyAxLjMzLS4xMzQgMi40NTguMDYzIDMuMTEyLjc1MnY5Ljc0NmMtLjkzNS0uNTMtMi4xMi0uNjAzLTMuMjEzLS40OTMtMS4xOC4xMi0yLjM3LjQ2MS0zLjI4Ny44MTF6bTcuNS0uMTQxYy42NTQtLjY4OSAxLjc4Mi0uODg2IDMuMTEyLS43NTIgMS4yMzQuMTI0IDIuNTAzLjUyMyAzLjM4OC44OTN2OS45MjNjLS45MTgtLjM1LTIuMTA3LS42OTItMy4yODctLjgxLTEuMDk0LS4xMTEtMi4yNzgtLjAzOS0zLjIxMy40OTJ6TTggMS43ODNDNy4wMTUuOTM2IDUuNTg3LjgxIDQuMjg3Ljk0Yy0xLjUxNC4xNTMtMy4wNDIuNjcyLTMuOTk0IDEuMTA1QS41LjUgMCAwIDAgMCAyLjV2MTFhLjUuNSAwIDAgMCAuNzA3LjQ1NWMuODgyLS40IDIuMzAzLS44ODEgMy42OC0xLjAyIDEuNDA5LS4xNDIgMi41OS4wODcgMy4yMjMuODc3YS41LjUgMCAwIDAgLjc4IDBjLjYzMy0uNzkgMS44MTQtMS4wMTkgMy4yMjItLjg3NyAxLjM3OC4xMzkgMi44LjYyIDMuNjgxIDEuMDJBLjUuNSAwIDAgMCAxNiAxMy41di0xMWEuNS41IDAgMCAwLS4yOTMtLjQ1NWMtLjk1Mi0uNDMzLTIuNDgtLjk1Mi0zLjk5NC0xLjEwNUMxMC40MTMuODA5IDguOTg1LjkzNiA4IDEuNzgzIi8+Cjwvc3ZnPg==&style=for-the-badge)](https://docs.jcdc.dev/umbraco-community-dataprotection/latest)
-[![Umbraco Marketplace](https://img.shields.io/badge/Umbraco%20Marketplace-%23f5c1bc?logo=umbraco&logoColor=162335&style=for-the-badge)](https://marketplace.umbraco.com/package/Umbraco.Community.DataProtection)
-[![GitHub](https://img.shields.io/badge/GitHub-1?logo=github&color=232925&style=for-the-badge)](https://github.com/jcdcdev/Umbraco.Community.DataProtection)
-[![NuGet Downloads](https://img.shields.io/nuget/dt/Umbraco.Community.DataProtection?labelColor=4536d3&color=4536d3&label=NuGet&logo=nuget&style=for-the-badge)](https://www.nuget.org/packages/Umbraco.Community.DataProtection)
-[![Project Website](https://img.shields.io/badge/Project%20Website-jcdcdev?color=3c4834&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0id2hpdGUiIGNsYXNzPSJiaSBiaS1wYy1kaXNwbGF5IiB2aWV3Qm94PSIwIDAgMTYgMTYiPgogIDxwYXRoIGQ9Ik04IDFhMSAxIDAgMCAxIDEtMWg2YTEgMSAwIDAgMSAxIDF2MTRhMSAxIDAgMCAxLTEgMUg5YTEgMSAwIDAgMS0xLTF6bTEgMTMuNWEuNS41IDAgMSAwIDEgMCAuNS41IDAgMCAwLTEgMG0yIDBhLjUuNSAwIDEgMCAxIDAgLjUuNSAwIDAgMC0xIDBNOS41IDFhLjUuNSAwIDAgMCAwIDFoNWEuNS41IDAgMCAwIDAtMXpNOSAzLjVhLjUuNSAwIDAgMCAuNS41aDVhLjUuNSAwIDAgMCAwLTFoLTVhLjUuNSAwIDAgMC0uNS41TTEuNSAyQTEuNSAxLjUgMCAwIDAgMCAzLjV2N0ExLjUgMS41IDAgMCAwIDEuNSAxMkg2djJoLS41YS41LjUgMCAwIDAgMCAxSDd2LTRIMS41YS41LjUgMCAwIDEtLjUtLjV2LTdhLjUuNSAwIDAgMSAuNS0uNUg3VjJ6Ii8+Cjwvc3ZnPg==&style=for-the-badge)](https://jcdc.dev/umbraco-packages/data-protection)
+[![Documentation](https://jcdc.dev/badge/Documentation/primary/book)](https://docs.jcdc.dev/umbraco-community-dataprotection/latest)
+[![Umbraco Marketplace](https://jcdc.dev/badge/Umbraco%20Marketplace/umbraco/umbraco)](https://marketplace.umbraco.com/package/Umbraco.Community.DataProtection)
+[![GitHub](https://jcdc.dev/badge/GitHub/github/github)](https://github.com/jcdcdev/Umbraco.Community.DataProtection)
+[![NuGet package downloads](https://jcdc.dev/badge/nuget/Umbraco.Community.DataProtection)](https://www.nuget.org/packages/Umbraco.Community.DataProtection)
+[![Project Website](https://jcdc.dev/badge/Project%20Website/primary/laptop)](https://jcdc.dev/umbraco-packages/data-protection)