diff --git a/docs/email.md b/docs/email.md
index 7adf7272..0a3548cb 100644
--- a/docs/email.md
+++ b/docs/email.md
@@ -275,7 +275,7 @@ An email aliasing service allows you to easily generate a new email address for
@@ -297,36 +297,36 @@ Our email aliasing recommendations are providers that allow you to create aliase
Using an aliasing service requires trusting both your email provider and your aliasing provider with your unencrypted messages. Some providers mitigate this slightly with automatic PGP encryption, which reduces the number of parties you need to trust from two to one by encrypting incoming emails before they are delivered to your final mailbox provider.
-### AnonAddy
+### addy.io
!!! recommendation
- { align=right }
- { align=right }
+ { align=right }
+ { align=right }
- **AnonAddy** lets you create 20 domain aliases on a shared domain for free, or unlimited "standard" aliases which are less anonymous.
+ **addy.io** lets you create 10 domain aliases on a shared domain for free, or unlimited "standard" aliases which are less anonymous.
- [:octicons-home-16: Homepage](https://anonaddy.com){ .md-button .md-button--primary }
- [:octicons-eye-16:](https://anonaddy.com/privacy/){ .card-link title="Privacy Policy" }
- [:octicons-info-16:](https://app.anonaddy.com/docs/){ .card-link title=Documentation}
+ [:octicons-home-16: Homepage](https://addy.io){ .md-button .md-button--primary }
+ [:octicons-eye-16:](https://addy.io/privacy){ .card-link title="Privacy Policy" }
+ [:octicons-info-16:](https://app.addy.io/docs){ .card-link title=Documentation}
[:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
- [:octicons-heart-16:](https://anonaddy.com/donate/){ .card-link title=Contribute }
+ [:octicons-heart-16:](https://addy.io/donate){ .card-link title=Contribute }
??? downloads
- - [:simple-android: Android](https://anonaddy.com/faq/#is-there-an-android-app)
- - [:material-apple-ios: iOS](https://anonaddy.com/faq/#is-there-an-ios-app)
- - [:simple-firefoxbrowser: Firefox](https://addons.mozilla.org/en-GB/firefox/addon/anonaddy/)
- - [:simple-googlechrome: Chrome](https://chrome.google.com/webstore/detail/anonaddy-anonymous-email/iadbdpnoknmbdeolbapdackdcogdmjpe)
+ - [:simple-android: Android](https://addy.io/faq/#is-there-an-android-app)
+ - [:material-apple-ios: iOS](https://addy.io/faq/#is-there-an-ios-app)
+ - [:simple-firefoxbrowser: Firefox](https://addons.mozilla.org/firefox/addon/addy_io/)
+ - [:simple-googlechrome: Chrome](https://chrome.google.com/webstore/detail/addyio-anonymous-email-fo/iadbdpnoknmbdeolbapdackdcogdmjpe)
-The number of shared aliases (which end in a shared domain like @anonaddy.me) that you can create is limited to 20 on AnonAddy's free plan and 50 on their $12/year plan. You can create unlimited standard aliases (which end in a domain like @[username].anonaddy.com or a custom domain on paid plans), however, as previously mentioned, this can be detrimental to privacy because people can trivially tie your standard aliases together based on the domain name alone. Unlimited shared aliases are available for $36/year.
+The number of shared aliases (which end in a shared domain like @addy.io) that you can create is limited to 10 on addy.io's free plan, 50 on their $1/month plan and unlimited on the $4/month plan (billed $3 for a year). You can create unlimited standard aliases (which end in a domain like @[username].addy.io or a custom domain on paid plans), however, as previously mentioned, this can be detrimental to privacy because people can trivially tie your standard aliases together based on the domain name alone. They are useful where a shared domain might be blocked by a service.
Notable free features:
-- [x] 20 Shared Aliases
+- [x] 10 Shared Aliases
- [x] Unlimited Standard Aliases
- [ ] No Outgoing Replies
-- [x] 2 Recipient Mailboxes
+- [x] 1 Recipient Mailboxes
- [x] Automatic PGP Encryption
### SimpleLogin
@@ -347,7 +347,7 @@ Notable free features:
- [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=io.simplelogin.android)
- [:simple-appstore: App Store](https://apps.apple.com/app/id1494359858)
- [:simple-github: GitHub](https://github.com/simple-login/Simple-Login-Android/releases)
- - [:simple-firefoxbrowser: Firefox](https://addons.mozilla.org/en-US/firefox/addon/simplelogin/)
+ - [:simple-firefoxbrowser: Firefox](https://addons.mozilla.org/firefox/addon/simplelogin/)
- [:simple-googlechrome: Chrome](https://chrome.google.com/webstore/detail/dphilobhebphkdjbpfohgikllaljmgbn)
- [:simple-microsoftedge: Edge](https://microsoftedge.microsoft.com/addons/detail/simpleloginreceive-sen/diacfpipniklenphgljfkmhinphjlfff)
- [:simple-safari: Safari](https://apps.apple.com/app/id1494051017)
diff --git a/docs/tools.md b/docs/tools.md
index b52e35bf..4fcc421b 100644
--- a/docs/tools.md
+++ b/docs/tools.md
@@ -130,7 +130,7 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b