diff --git a/docs/calendar-contacts.md b/docs/calendar-contacts.md
index 5fbde9d2..771e444f 100644
--- a/docs/calendar-contacts.md
+++ b/docs/calendar-contacts.md
@@ -76,8 +76,7 @@ Some of these options are self-hostable, or able to be hosted by third party pro
You can self host Nextcloud or pay for service from a [provider](https://nextcloud.com/signup/).
- [Visit ](){ .md-button .md-button--primary } [Privacy Policy](){ .md-button }
- [:pg-tor:](){ .md-button }
+ [Visit nextcloud.com](https://nextcloud.com/){ .md-button .md-button--primary }
**Downloads**
- [:fontawesome-brands-windows: Windows](https://nextcloud.com/install/#install-clients)
diff --git a/docs/tools.md b/docs/tools.md
index 9d88b539..5d93567b 100644
--- a/docs/tools.md
+++ b/docs/tools.md
@@ -2,43 +2,366 @@
title: Privacy Tools
icon: material/tools
hide:
- - navigation
+ - toc
---
If you're looking for a specific solution to something, these are the hardware and software tools we recommend in a variety of categories. Our recommended privacy tools are primarily chosen based on security features, with additional emphasis on decentralized and open-source tools. They are applicable to a variety of threat models ranging from protection against global mass surveillance programs and avoiding big tech companies to mitigating attacks, but only you can determine what will work best for your use case.
If you want assistance figuring out the best privacy tools and alternative programs for your workload/use-case, start a discussion in our [Reddit](https://www.reddit.com/r/privacyguides) or [Matrix](https://matrix.to/#/#privacyguides:matrix.org) communities!
-## Operating Systems
-
-- [:fontawesome-brands-android: Android Recommendations](android.md)
-- [:fontawesome-brands-linux: Linux Recommendations](linux-desktop.md)
-- [:pg-qubes-os: QubesOS Recommendations](qubes.md)
-- [:material-router-wireless: Router Firmware Recommendations](router.md)
+For your convenience, everything we recommend is listed below with a link to the project's homepage. For more details about each project, why they were chosen, and additional tips or tricks we recommend, click the "Learn more" link in each section.
## Web Browsers
-- [:octicons-browser-16: Browsers](browsers.md)
+
+
+- { .twemoji } [Tor Browser](https://www.torproject.org/)
+- { .twemoji } [Firefox (Desktop)](https://firefox.com/)
+- { .twemoji } [Bromite (Android)](https://www.bromite.org/)
+- { .twemoji } [Safari (iOS)](https://www.apple.com/safari/)
+
+
+
+**Browser extensions:**
+
+
+
+- { .twemoji } [uBlock Origin](https://github.com/gorhill/uBlock)
+- { .twemoji } [AdGuard for Safari](https://adguard.com/en/adguard-safari/overview.html)
+- { .twemoji } [Terms of Service; Didn't Read](https://tosdr.org/)
+
+
+
+[Learn more...](browsers.md)
+
+## Operating Systems
+
+### Android
+
+
+
+- { .twemoji }{ .twemoji } [GrapheneOS](https://grapheneos.org/)
+- { .twemoji } [CalyxOS](https://calyxos.org/)
+- { .twemoji } [DivestOS](https://divestos.org/)
+
+
+
+**Android Apps:**
+
+
+
+- { .twemoji } [Droid-ify (F-Droid Client)](https://github.com/Iamlooker/Droid-ify)
+- { .twemoji } [Orbot (Tor Proxy)](https://orbot.app/)
+- { .twemoji } [Shelter (Work Profiles)](https://gitea.angry.im/PeterCxy/Shelter)
+- { .twemoji }{ .twemoji } [Auditor (Supported Devices)](https://attestation.app/)
+- { .twemoji }{ .twemoji } [GrapheneOS](https://github.com/GrapheneOS/Camera)
+- { .twemoji }{ .twemoji } [Secure PDF Viewer](https://github.com/GrapheneOS/PdfViewer)
+- { .twemoji } [PrivacyBlur](https://privacyblur.app/)
+
+
+
+[Learn more...](android.md)
+
+### Linux
+
+
+
+- { .twemoji } [Fedora Workstation](https://getfedora.org/)
+- { .twemoji } [OpenSUSE Tumbleweed](https://get.opensuse.org/tumbleweed/)
+- { .twemoji } [Arch Linux](https://archlinux.org/)
+- { .twemoji } [Fedora Silverblue & Kinoite](https://silverblue.fedoraproject.org/)
+- { .twemoji } [NixOS](https://nixos.org/)
+- { .twemoji } [Whonix (Tor)](https://www.whonix.org/)
+- { .twemoji } [Tails (Live Boot)](https://tails.boum.org/)
+- { .twemoji } [Qubes OS (Xen VM Distribution)*](https://www.qubes-os.org/)
+
+
+
+[Learn more...](linux-desktop.md)
+
+\* Qubes uses Xen to provide strong sandboxing between multiple Linux virtual machine installations, and can run most Linux applications. [Learn more about Qubes...](qubes.md)
+
+### Router Firmware
+
+
+
+- { .twemoji }{ .twemoji } [OpenWrt](https://openwrt.org/)
+- { .twemoji }{ .twemoji } [pfSense](https://www.pfsense.org/)
+
+
+
+[Learn more...](router.md)
## Service Providers
-- [:material-file-cloud: Cloud Storage](cloud.md)
-- [:material-dns: DNS Resolvers](dns.md)
-- [:material-email: Email Hosts](email.md)
-- [:material-search-web: Search Engines](search-engines.md)
-- [:material-account-supervisor-circle-outline: Social Networks](social-networks.md)
-- [:material-newspaper-variant-outline: News Aggregators](social-news-aggregator.md)
-- [:material-vpn: VPN Services](vpn.md)
+### Cloud Storage
+
+
+
+- { .twemoji } [Nextcloud (Self-Hostable)](https://nextcloud.com/)
+- { .twemoji } [Proton Drive](https://drive.protonmail.com/)
+- { .twemoji }{ .twemoji } [Cryptee](https://crypt.ee/)
+- { .twemoji }{ .twemoji } [Tahoe-LAFS (Advanced)](https://www.tahoe-lafs.org/)
+
+
+
+[Learn more...](cloud.md)
+
+### DNS
+
+We [recommend](dns.md#why-should-i-use-encrypted-dns) a number of encrypted DNS servers based on a variety of criteria. Some no-logging choices include [MullvadDNS](https://mullvad.net/en/help/dns-over-https-and-dns-over-tls) and [Quad9](https://quad9.net/), but we recommend you read our full page on DNS before choosing a provider. In many cases using an alternative DNS provider is not recommended. [Learn more...](dns.md)
+
+### Email
+
+
+
+- [ProtonMail](https://protonmail.com/)
+- [Mailbox.org](https://mailbox.org/)
+- [Disroot](https://disroot.org/)
+- [Tutanota](https://tutanota.com/)
+- [StartMail](https://startmail.com/)
+- [CTemplar](https://ctemplar.com/)
+
+
+
+[Learn more...](email.md)
+
+### Search Engines
+
+
+
+- { .twemoji } [DuckDuckGo](https://duckduckgo.com/)
+- { .twemoji } [Startpage](https://www.startpage.com/)
+- [Mojeek](https://www.mojeek.com/)
+- { .twemoji } [Searx](https://searx.me/)
+
+
+
+[Learn more...](search-engines.md)
+
+### Social Media
+
+
+
+- { .twemoji } [Mastodon](https://joinmastodon.org/)
+- { .twemoji } [diaspora*](https://diasporafoundation.org/)
+- { .twemoji } [Friendica](https://friendi.ca/)
+- { .twemoji } [PixelFed](https://pixelfed.org/)
+- { .twemoji } [Pleroma](https://pleroma.social/)
+- { .twemoji } [Movim](https://github.com/movim)
+
+
+
+[Learn more...](social-networks.md)
+
+**News Aggregators:**
+
+
+
+- { .twemoji } [Tildes](https://tildes.net/)
+- { .twemoji } [Lemmy](https://lemmy.ml/)
+- { .twemoji } [Postmill](https://postmill.xyz/)
+- { .twemoji } [Freepost](https://freepo.st/)
+
+
+
+[Learn more...](social-news-aggregator.md)
+
+### VPN Providers
+
+??? danger "VPNs do not provide anonymity"
+
+ Using a VPN will **not** keep your browsing habits anonymous, nor will it add additional security to non-secure (HTTP) traffic.
+
+ If you are looking for **anonymity**, you should use the Tor Browser **instead** of a VPN.
+
+ If you're looking for added **security**, you should always ensure you're connecting to websites using [HTTPS](https://en.wikipedia.org/wiki/HTTPS). A VPN is not a replacement for good security practices.
+
+ [Learn more](vpn.md)
+
+
+
+- [Mullvad](https://mullvad.net/)
+- [ProtonVPN](https://protonvpn.com/)
+- [IVPN](https://www.ivpn.net/)
+
+
+
+[Learn more...](vpn.md)
## Software
-- [:material-calendar: Calendar/Contacts Sync](calendar-contacts.md)
-- [:material-notebook-edit-outline: Digital Notebooks](notebooks.md)
-- [:material-email-open: Email Clients](email-clients.md)
-- [:material-file-lock: Encryption Tools](encryption.md)
-- [:material-share-variant: File Sharing and Sync](file-sharing.md)
-- [:material-tag-remove: Metadata Removal Tools](metadata-removal-tools.md)
-- [:material-form-textbox-password: Password Managers](passwords.md)
-- [:material-file-sign: Productivity Tools](productivity.md)
-- [:material-chat-processing: Real-Time Communication](real-time-communication.md)
-- [:material-security-network: Self-Contained Networks](self-contained-networks.md)
-- [:material-video-wireless: Video Streaming Clients](video-streaming.md)
+### Calendar/Contacts Sync
+
+
+
+- { .twemoji } [Tutanota (SaaS)](https://tutanota.com/calendar)
+- { .twemoji } [Proton Calendar (SaaS)](https://calendar.protonmail.com/)
+- { .twemoji } [EteSync](https://www.etesync.com/)
+- { .twemoji } [Nextcloud](https://nextcloud.com/)
+- [DecSync](https://github.com/39aldo39/DecSync)
+
+
+
+[Learn more...](calendar-contacts.md)
+
+### Notebooks
+
+
+
+- { .twemoji } [Joplin](https://joplinapp.org/)
+- { .twemoji } [Standard Notes](https://standardnotes.org/)
+
+
+
+[Learn more...](notebooks.md)
+
+### Email Clients
+
+
+
+- { .twemoji } [Thunderbird](https://www.thunderbird.net/)
+- { .twemoji } [GNOME Evolution (Linux)](https://wiki.gnome.org/Apps/Evolution)
+- { .twemoji } [Kontact (Linux)](https://kontact.kde.org/)
+- { .twemoji } [Mailvelope (PGP in standard webmail)](https://www.mailvelope.com/)
+- { .twemoji } [K-9 Mail (Android)](https://k9mail.app/)
+- { .twemoji } [FairEmail (Android)](https://email.faircode.eu/)
+- { .twemoji } [Canary Mail (iOS)](https://canarymail.io/)
+- { .twemoji } [NeoMutt (CLI)](https://neomutt.org/)
+
+
+
+[Learn more...](email-clients.md)
+
+### Encryption Tools
+
+??? info "Operating System Disk Encryption"
+
+ For encrypting your operating system drive, we typically recommend using whichever encryption tool your operating system provides, whether that is **BitLocker** on Windows, **FileVault** on macOS, or **LUKS** on Linux. These tools are available out of the box and typically utilize hardware encryption elements such as a TPM that other full-disk encryption software like VeraCrypt will not. VeraCrypt is still suitable for non-operating system disks such as external drives, especially drives that may be accessed from multiple operating systems.
+
+ [Learn more](encryption.md##operating-system-included-full-disk-encryption-fde)
+
+
+
+- { .twemoji }{ .twemoji } [VeraCrypt (FDE)](https://veracrypt.fr/)
+- { .twemoji } [Cryptomator](https://cryptomator.org/)
+- { .twemoji } [Picocrypt](https://evansu.cc/picocrypt)
+- { .twemoji }{ .twemoji } [Hat.sh (Browser-based)](https://hat.sh/)
+- { .twemoji } [Kryptor](https://www.kryptor.co.uk/)
+- { .twemoji } [Tomb](https://www.dyne.org/software/tomb)
+
+
+
+**OpenPGP Clients:**
+
+
+
+- { .twemoji } [GnuPG](https://veracrypt.fr/)
+- { .twemoji } [GPG4Win (Windows)](https://cryptomator.org/)
+- { .twemoji } [MacGPG (macOS)](https://evansu.cc/picocrypt)
+- { .twemoji } [OpenKeychain](https://www.openkeychain.org/)
+
+
+
+[Learn more...](encryption.md)
+
+### File Sharing
+
+
+
+- { .twemoji } [Onionshare](https://onionshare.org/)
+- { .twemoji } [Magic Wormhole](https://magic-wormhole.readthedocs.io/)
+- { .twemoji } [croc](https://schollz.com/blog/croc6)
+- { .twemoji } [FreedomBox](https://freedombox.org/)
+- { .twemoji } [Syncthing](https://syncthing.net/)
+- { .twemoji } [git-annex](https://git-annex.branchable.com/)
+
+
+
+[Learn more...](file-sharing.md)
+
+### Metadata Removal Tools
+
+
+
+- { .twemoji } [MAT2](https://0xacab.org/jvoisin/mat2)
+- { .twemoji } [ExifCleaner](https://exifcleaner.com/)
+- { .twemoji } [Scrambled Exif (Android)](https://gitlab.com/juanitobananas/scrambled-exif)
+- { .twemoji } [Imagepipe (Android)](https://codeberg.org/Starfish/Imagepipe)
+- { .twemoji } [Metapho (iOS)](https://zininworks.com/metapho)
+- { .twemoji } [Exiftool (CLI)](https://exiftool.org/)
+
+
+
+[Learn more...](metadata-removal-tools.md)
+
+### Password Managers
+
+
+
+- { .twemoji } [KeepassXC](https://keepassxc.org/)
+- { .twemoji } [KeepassDX (Android)](https://www.keepassdx.com/)
+- { .twemoji } [Bitwarden](https://bitwarden.com/)
+- { .twemoji } [Psono](https://psono.com/)
+- { .twemoji } [pass](https://www.passwordstore.org/)
+- { .twemoji } [gopass](https://www.gopass.pw/)
+- { .twemoji }{ .twemoji } [VaultWarden (Bitwarden Server)](https://github.com/dani-garcia/vaultwarden)
+
+
+
+[Learn more...](passwords.md)
+
+### Productivity Tools
+
+
+
+- { .twemoji } [LibreOffice](https://www.libreoffice.org/)
+- { .twemoji } [OnlyOffice](https://www.onlyoffice.com/)
+- { .twemoji } [Framadate (Appointment Planning)](https://framadate.org/)
+- { .twemoji } [PrivateBin (Pastebin)](https://privatebin.info/)
+- { .twemoji } [CryptPad](https://cryptpad.fr/)
+- { .twemoji }{ .twemoji } [Write.as (Blogging Platform)](https://write.as/)
+- { .twemoji } [VSCodium (Source-Code Editor)](https://vscodium.com/)
+
+
+
+[Learn more...](productivity.md)
+
+### Real-Time Communication
+
+
+
+- { .twemoji } [Signal](https://signal.org/)
+- { .twemoji } [Element](https://element.io/)
+- { .twemoji } [Briar (Android)](https://briarproject.org/)
+- { .twemoji } [Session](https://getsession.org/)
+
+
+
+[Learn more...](real-time-communication.md)
+
+### Self-Contained Networks
+
+
+
+- { .twemoji } [Tor](https://www.torproject.org/)
+- { .twemoji } [I2P](https://geti2p.net/)
+- { .twemoji } [Freenet](https://freenetproject.org/)
+
+
+
+[Learn more...](self-contained-networks.md)
+
+### Video Streaming Clients
+
+
+
+- { .twemoji } [FreeTube (YouTube, Desktop)](https://freetubeapp.io/)
+- { .twemoji } [LBRY](https://lbry.com/)
+- { .twemoji } [NewPipe (YouTube, Android)](https://newpipe.net/)
+- { .twemoji } [NewPipe x Sponsorblock](https://github.com/polymorphicshade/NewPipe)
+- { .twemoji }{ .twemoji } [Invidious (YouTube, Web)](https://invidious.io/)
+- { .twemoji } [Piped (YouTube, Web)](https://piped.kavin.rocks/)
+
+
+
+[Learn more...](video-streaming.md)
diff --git a/mkdocs.yml b/mkdocs.yml
index af7885c4..aebf9841 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -24,13 +24,13 @@ nav:
- 'Multi-Factor Authentication': 'multi-factor-authentication.md'
- 'Recommendations':
- 'Privacy Tools': 'tools.md'
+ - 'Browsers':
+ - 'Web Browsers': 'browsers.md'
- 'Operating Systems':
- 'Android': 'android.md'
- 'Linux Desktop': 'linux-desktop.md'
- 'QubesOS': 'qubes.md'
- 'Router Firmware': 'router.md'
- - 'Browsers':
- - 'Web Browsers': 'browsers.md'
- 'Providers':
- 'Cloud Storage': 'cloud.md'
- 'DNS Servers': 'dns.md'
@@ -80,7 +80,6 @@ theme:
features:
- navigation.tracking
- navigation.tabs
- - navigation.tabs.sticky
- navigation.sections
palette:
- media: "(prefers-color-scheme: light)"
diff --git a/theme/overrides/blog.html b/theme/overrides/blog.html
index 84eb0394..205fe06a 100644
--- a/theme/overrides/blog.html
+++ b/theme/overrides/blog.html
@@ -2,7 +2,7 @@
{% block extrahead %}
diff --git a/theme/overrides/home.html b/theme/overrides/home.html
index 8e97553e..0389e3b6 100644
--- a/theme/overrides/home.html
+++ b/theme/overrides/home.html
@@ -2,7 +2,7 @@
{% block extrahead %}