diff --git a/content/pages/setup.md b/content/pages/setup.md
index 1d22800..234bb63 100644
--- a/content/pages/setup.md
+++ b/content/pages/setup.md
@@ -19,6 +19,8 @@ A running list of the software, tools, and infrastructure I use day to day — a
 - **[Android](https://www.android.com/)** — my current mobile OS. But as Google is increasingly hostile to privacy, I plan to switch to [GrapheneOS](https://grapheneos.org/) on a Pixel device in the future.
 - **[FUTO Keyboard](https://keyboard.futo.tech/)** — my keyboard of choice. I like the layout and the feel of the keys, and I enjoy customizing it to my liking.
 - **[F-Droid](https://f-droid.org/)** — my app store of choice. I like the open-source apps it offers, and I enjoy discovering new apps that respect my privacy.
+- **[Thunderbird](https://www.thunderbird.net/)** — my email client of choice. I like the features it offers, and I enjoy customizing it to my liking.
+- **[DAVx5](https://www.davx5.com/)** — my CalDAV/CardDAV client of choice. I like the features it offers, and I enjoy customizing it to my liking.
 
 ## Browser
 
@@ -84,7 +86,8 @@ I run my own infrastructure on a Hetzner VPS, mostly because I like understandin
 - **[Vaultwarden](https://github.com/dani-garcia/vaultwarden)** — self-hosted password manager, so I control my credentials.
 - **[Supabase](https://github.com/supabase/supabase)** (self-hosted) — my own Postgres, auth, and storage instance for personal projects, without relying on a third-party service.
 - **[Continuwuity](https://forgejo.ellis.link/continuwuation/continuwuity)** (a Matrix server implementation) — lets me chat with friends and communities without relying on a corporate service.
+- **[Radicale](https://radicale.org/)** — my self-hosted CalDAV/CardDAV server, so I control my calendar and contacts.
 
 ---
 
-This list changes fairly often — I'll keep it updated as tools come and go.
\ No newline at end of file
+This list changes fairly often — I'll keep it updated as tools come and go.