diff --git a/content/activism/legal/_index.md b/content/activism/legal/_index.md
new file mode 100644
index 000000000..2eeb895a9
--- /dev/null
+++ b/content/activism/legal/_index.md
@@ -0,0 +1,6 @@
+---
+title: Legal Resources
+build:
+  list: local
+  render: link
+---
diff --git a/content/activism/legal/dpa-directory/index.md b/content/activism/legal/dpa-directory/index.md
index 3e10d6900..9d7c4a4c7 100644
--- a/content/activism/legal/dpa-directory/index.md
+++ b/content/activism/legal/dpa-directory/index.md
@@ -1,10 +1,18 @@
 ---
 title: "Data Protection Authorities"
 description: The DPA Directory is a tool to help you find the principal consumer privacy law in your region, the authority mandated to enforce it, and how to report violations.
-sidebar:
-  hide: true
+# sidebar:
+#   hide: true
+aliases:
+  - /activism/legal
 ---
 
+<style>
+nav.hextra-toc.hx\:order-last.hx\:hidden.hx\:w-64.hx\:shrink-0.hx\:xl\:block.hx\:print\:hidden.hx\:px-4 {
+  display: none;
+}
+</style>
+
 The **Data Protection Authority** (DPA) **Directory** is a tool to help you find the main consumer privacy law in your region, and the authority mandated to enforce the law.
 
 Additionally, this table provides information about each law, authority, contact information for questions, and a link to place a complaint for violation of the law with each authority.
diff --git a/content/tools/advanced/_index.md b/content/tools/advanced/_index.md
index 7060424f9..f6dfc6cfc 100644
--- a/content/tools/advanced/_index.md
+++ b/content/tools/advanced/_index.md
@@ -2,25 +2,7 @@
 title: Advanced
 description: Specialized tools for anonymity networks, censorship circumvention, and device integrity checks.
 weight: 70
+build:
+  list: local
+  render: link
 ---
-
-## Alternative Networks
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="alternative-networks/index.md#tor" title="Tor" image="alternative-networks/tor.svg" subtitle="The Tor network is a group of volunteer-operated servers that allows you to connect for free and improve your privacy and security on the Internet. Individuals and organizations can also share information over the Tor network with “.onion hidden services” without compromising their privacy." >}}
-  {{< card link="alternative-networks/index.md#orbot" title="Orbot" image="alternative-networks/orbot.svg" subtitle="Orbot is a mobile application which routes traffic from any app on your device through the Tor network." >}}
-  {{< card link="alternative-networks/index.md#snowflake" title="Snowflake" image="alternative-networks/snowflake.svg" subtitle="Snowflake allows you to donate bandwidth to the Tor Project by operating a “Snowflake proxy” within your browser." >}}
-  {{< card link="alternative-networks/index.md#i2p-the-invisible-internet-project" title="I2P" image="alternative-networks/i2p.svg" subtitle="I2P is a network layer which encrypts your connections and routes them via a network of computers distributed around the world. It is mainly focused on creating an alternative, privacy-protecting network rather than making regular internet connections anonymous." >}}
-{{< /cards >}}
-</div>
-
-## Device Integrity Verification
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="device-integrity/index.md#mobile-verification-toolkit" title="MVT" image="device-integrity/mvt.webp" subtitle="Mobile Verification Toolkit (MVT) is a collection of utilities which simplifies and automates the process of scanning mobile devices for potential traces of targeting or infection by known spyware campaigns. MVT was developed by Amnesty International and released in 2021 in the context of the Pegasus Project." >}}
-  {{< card link="device-integrity/index.md#imazing-ios" title="iMazing" image="device-integrity/imazing.png" subtitle="iMazing provides a free spyware analyzer tool for iOS devices which acts as a GUI-wrapper for MVT. This can be much easier to run compared to MVT itself, which is a command-line tool designed for technologists and forensic investigators." >}}
-  {{< card link="device-integrity/index.md#auditor-android" title="Auditor" image="device-integrity/auditor.svg" subtitle="Auditor is an app which leverages hardware security features to provide device integrity monitoring by actively validating the identity of a device and the integrity of its operating system. Currently, it only works with GrapheneOS or the stock operating system for supported devices." >}}
-{{< /cards >}}
-</div>
diff --git a/content/tools/advanced/alternative-networks/index.md b/content/tools/advanced/alternative-networks/index.md
index 7bde795fe..7acd6c320 100644
--- a/content/tools/advanced/alternative-networks/index.md
+++ b/content/tools/advanced/alternative-networks/index.md
@@ -1,6 +1,8 @@
 ---
 title: "Alternative Networks"
 description: These tools allow you to access networks other than the World Wide Web.
+aliases:
+- /tools/advanced
 ---
 <small>Protects against the following threat(s):</small>
 [{{< badge content="Service Providers" color="indigo" >}}](../../../wiki/basics/common-threats/index.md#privacy-from-service-providers)
diff --git a/content/tools/all/index.md b/content/tools/all/index.md
index 14ec4e360..2d3902da5 100644
--- a/content/tools/all/index.md
+++ b/content/tools/all/index.md
@@ -392,6 +392,8 @@ We [**recommend**](../services/dns/index.md#recommended-providers) a number of e
   {{< card link="../os/router-firmware/#opnsense" title="OPNsense" image="../os/router-firmware/opnsense.svg" subtitle="OPNsense is an open-source, FreeBSD-based firewall and routing platform which incorporates many advanced features such as traffic shaping, load balancing, and VPN capabilities, with many more features available in the form of plugins." >}}
 {{< /cards >}}
 
+## Advanced
+
 ### Alternative Networks
 
 {{< cards >}}
diff --git a/content/tools/hardware/_index.md b/content/tools/hardware/_index.md
index 139f88820..95d57b108 100644
--- a/content/tools/hardware/_index.md
+++ b/content/tools/hardware/_index.md
@@ -2,22 +2,7 @@
 title: Hardware
 description: Privacy-focused hardware we recommend, from phones to security keys.
 weight: 40
+build:
+  list: local
+  render: link
 ---
-
-## Mobile Phones
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="mobile-phones/index.md#google-pixel" title="Google Pixel" image="mobile-phones/google-pixel.png" subtitle="Google Pixel phones are the only devices we recommend for purchase. Pixel phones have stronger hardware security than any other Android devices currently on the market, due to proper AVB support for third-party operating systems and Google’s custom Titan security chips acting as the Secure Element." >}}
-{{< /cards >}}
-</div>
-
-## Security Keys
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="security-keys/index.md#yubico-security-key" title="Yubico Security Key" image="security-keys/yubico-security-key.webp" subtitle="The Yubico Security Key series is the most cost-effective hardware security key with FIDO Level 2 certification. It supports FIDO2/WebAuthn and FIDO Universal 2nd Factor (U2F), and works out of the box with most services that support a security key as a second factor, as well as many password managers." >}}
-  {{< card link="security-keys/index.md#yubikey" title="YubiKey" image="security-keys/yubikey.png" subtitle="The YubiKey series from Yubico are among the most popular security keys with FIDO Level 2 Certification. The YubiKey 5 Series has a wide range of features such as FIDO2/WebAuthn and FIDO U2F, TOTP and HOTP authentication, Personal Identity Verification (PIV), and OpenPGP." >}}
-  {{< card link="security-keys/index.md#nitrokey" title="Nitrokey" image="security-keys/nitrokey-square.svg" subtitle="Nitrokey has a cost-effective security key capable of FIDO2/WebAuthn and FIDO U2F called the Nitrokey Passkey. For support for features such as PIV, OpenPGP, and TOTP and HOTP authentication, you need to purchase one of their other keys like the Nitrokey 3. Currently, only the Nitrokey 3A Mini has FIDO Level 1 Certification." >}}
-{{< /cards >}}
-</div>
diff --git a/content/tools/hardware/mobile-phones/index.md b/content/tools/hardware/mobile-phones/index.md
index a2fc72bb6..4750bb0bb 100644
--- a/content/tools/hardware/mobile-phones/index.md
+++ b/content/tools/hardware/mobile-phones/index.md
@@ -1,6 +1,8 @@
 ---
 title: Mobile Phones
 description: These mobile devices provide the best hardware security support for custom Android operating systems.
+aliases:
+- /tools/hardware
 ---
 <small>Protects against the following threat(s):</small>
 [{{< badge content="Targeted Attacks" color="red" >}}](../../../wiki/basics/common-threats/index.md#attacks-against-specific-individuals)
diff --git a/content/tools/os/_index.md b/content/tools/os/_index.md
index e35f91dc8..f6433429b 100644
--- a/content/tools/os/_index.md
+++ b/content/tools/os/_index.md
@@ -2,59 +2,7 @@
 title: Operating Systems
 description: Privacy-hardened operating systems and firmware for phones, desktops, and routers.
 weight: 50
+build:
+  list: local
+  render: link
 ---
-
-## Custom Android Distributions
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="android/distributions/index.md#grapheneos" title="GrapheneOS" image="android/distributions/grapheneos.svg" subtitle="GrapheneOS hardens the Android stack on supported Pixels with verified boot, firmware updates, and sandboxed Play." >}}
-{{< /cards >}}
-</div>
-
-## Android General Apps
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="android/general-apps/index.md#shelter" title="Shelter" image="android/general-apps/shelter.svg" subtitle="Shelter uses a managed work profile to isolate or duplicate apps with optional cross-profile controls." >}}
-  {{< card link="android/general-apps/index.md#secure-camera" title="Secure Camera" image="android/general-apps/secure_camera.svg" subtitle="Secure Camera captures media with minimal metadata and modern Android storage APIs." >}}
-  {{< card link="android/general-apps/index.md#secure-pdf-viewer" title="Secure PDF Viewer" image="android/general-apps/secure_pdf_viewer.svg" subtitle="Secure PDF Viewer renders PDFs in a sandboxed WebView without broad file permissions." >}}
-{{< /cards >}}
-</div>
-
-## Obtaining Android Apps
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="android/obtaining-apps/index.md#obtainium" title="Obtainium" image="android/obtaining-apps/obtainium.svg" subtitle="Obtainium is an app manager which allows you to install and update apps directly from the developer’s own releases page (i.e. GitHub, GitLab, the developer’s website, etc.), rather than a centralized app store/repository." >}}
-  {{< card link="android/obtaining-apps/index.md#grapheneos-app-store" title="GrapheneOS App Store" subtitle="GrapheneOS’s app store is available on GitHub. It supports Android 12 and above and is capable of updating itself. The app store has standalone applications built by the GrapheneOS project such as the Auditor, Camera, and PDF Viewer." >}}
-  {{< card link="android/obtaining-apps/index.md#aurora-store" title="Aurora Store" image="android/obtaining-apps/aurora-store.webp" subtitle="Aurora Store is a Google Play Store client which does not require a Google account, Google Play Services, or microG to download apps." >}}
-  {{< card link="android/obtaining-apps/index.md#f-droid" title="F-Droid" image="android/obtaining-apps/f-droid.svg" subtitle="We only recommend F-Droid as a way to obtain apps which cannot be obtained via the means above. F-Droid is often recommended as an alternative to Google Play, particularly within the privacy community. The option to add third-party repositories and not be confined to Google’s walled garden has led to its popularity." >}}
-{{< /cards >}}
-</div>
-
-## Desktop/PC
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="desktop/index.md#fedora-linux" title="Fedora Linux" image="desktop/fedora.svg" subtitle="Fedora Linux is our recommended desktop distribution for people new to Linux. Fedora generally adopts newer technologies (e.g., Wayland and PipeWire) before other distributions. These new technologies often come with improvements in security, privacy, and usability in general." >}}
-  {{< card link="desktop/index.md#opensuse-tumbleweed" title="openSUSE Tumbleweed" image="desktop/opensuse-tumbleweed.svg" subtitle="openSUSE Tumbleweed is a stable rolling release distribution. openSUSE Tumbleweed uses Btrfs and Snapper to ensure that snapshots can be rolled back should there be a problem." >}}
-  {{< card link="desktop/index.md#arch-linux" title="Arch Linux" image="desktop/archlinux.svg" subtitle="Arch Linux is a lightweight, do-it-yourself (DIY) distribution, meaning that you only get what you install. For more information see their FAQ." >}}
-  {{< card link="desktop/index.md#fedora-atomic-desktops" title="Fedora Atomic Desktops" image="desktop/fedora.svg" subtitle="Fedora Atomic Desktops are variants of Fedora which use the rpm-ostree package manager and have a strong focus on containerized workflows and Flatpak for desktop applications. All of these variants follow the same release schedule as Fedora Workstation, benefiting from the same fast updates and staying very close to upstream." >}}
-  {{< card link="desktop/index.md#nixos" title="NixOS" image="desktop/nixos.svg" subtitle="NixOS is an independent distribution based on the Nix package manager with a focus on reproducibility and reliability." >}}
-  {{< card link="desktop/index.md#whonix" title="Whonix" image="desktop/whonix.svg" subtitle="Whonix is based on Kicksecure, a security-focused fork of Debian. It aims to provide privacy, security, and anonymity on the internet. Whonix is best used in conjunction with Qubes OS." >}}
-  {{< card link="desktop/index.md#tails" title="Tails" image="desktop/tails.svg" subtitle="Tails is a live operating system based on Debian that routes all communications through Tor, which can boot on on almost any computer from a DVD, USB stick, or SD card installation. It uses Tor to preserve privacy and anonymity while circumventing censorship, and it leaves no trace of itself on the computer it is used on after it is powered off." >}}
-  {{< card link="desktop/index.md#qubes-os" title="Qubes OS" image="desktop/qubes_os.svg" subtitle="Qubes OS is an open-source operating system designed to provide strong security for desktop computing through secure virtual machines (or “qubes”). Qubes is based on Xen, the X Window System, and Linux. It can run most Linux applications and use most of the Linux drivers." >}}
-  {{< card link="desktop/index.md#secureblue" title="Secureblue" image="desktop/secureblue.svg" subtitle="Secureblue is a security-focused operating system based on Fedora Atomic Desktops. It includes a number of security features intended to proactively defend against the exploitation of both known and unknown vulnerabilities, and ships with Trivalent, their hardened, Chromium-based web browser." >}}
-  {{< card link="desktop/index.md#kicksecure" title="Kicksecure" image="desktop/kicksecure.svg" subtitle="Kicksecure—in oversimplified terms—is a set of scripts, configurations, and packages that substantially reduce the attack surface of Debian. It covers a lot of privacy and hardening recommendations by default. It also serves as the base OS for Whonix." >}}
-{{< /cards >}}
-</div>
-
-## Router Firmware
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="router-firmware/index.md#openwrt" title="OpenWrt" image="router-firmware/openwrt.svg" subtitle="OpenWrt is a Linux-based operating system; it’s primarily used on embedded devices to route network traffic. It includes util-linux, uClibc, and BusyBox. All the components have been optimized for home routers." >}}
-  {{< card link="router-firmware/index.md#opnsense" title="OPNsense" image="router-firmware/opnsense.svg" subtitle="OPNsense is an open-source, FreeBSD-based firewall and routing platform which incorporates many advanced features such as traffic shaping, load balancing, and VPN capabilities, with many more features available in the form of plugins." >}}
-{{< /cards >}}
-</div>
diff --git a/content/tools/os/android/_index.md b/content/tools/os/android/_index.md
index cc101a3af..71b96041d 100644
--- a/content/tools/os/android/_index.md
+++ b/content/tools/os/android/_index.md
@@ -1,6 +1,8 @@
 ---
 title: "Android"
 description: Our advice for replacing privacy-invasive default Android features with private and secure alternatives.
+aliases:
+- /tools/os
 ---
 <style>
   .pg-width-120 {
diff --git a/content/tools/self-hosting/_index.md b/content/tools/self-hosting/_index.md
index 771626204..c73e75dec 100644
--- a/content/tools/self-hosting/_index.md
+++ b/content/tools/self-hosting/_index.md
@@ -2,74 +2,7 @@
 title: Self-Hosting
 description: For our more technical readers, self-hosting software and services can provide additional privacy assurances since you have maximum control over your data.
 weight: 60
+build:
+  list: local
+  render: link
 ---
-<small>Protects against the following threat(s):</small>
-[{{< badge content="Service Providers" color="indigo" >}}](../../wiki/basics/common-threats/index.md#privacy-from-service-providers)
-
-**Self-hosting** software and services can be a way to achieve a higher level of privacy through digital sovereignty, particularly independence from cloud servers controlled by product developers or vendors. By self-hosting, we mean hosting applications and data on your own hardware.
-
-Self-hosting your own solutions requires advanced technical knowledge and a deep understanding of the associated risks. By becoming the host for yourself and possibly others, you take on responsibilities you might not otherwise have. Self-hosting privacy software improperly can leave you worse off than using e.g. an end-to-end encrypted service provider, so it is best avoided if you are not already comfortable doing so.
-
-## DNS Filtering
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="dns-filtering/index.md#adguard-home" title="AdGuard Home" image="dns-filtering/adguard-home.svg" subtitle="AdGuard Home is an open-source DNS sinkhole which features a polished web interface to view insights and manage blocked content." >}}
-  {{< card link="dns-filtering/index.md#pi-hole" title="Pi-hole" image="dns-filtering/pi-hole.svg" subtitle="Pi-hole is an open-source DNS sinkhole which features a friendly web interface to view insights and manage blocked content. Pi-hole is designed to be hosted on a Raspberry Pi, but it is not limited to such hardware." >}}
-{{< /cards >}}
-</div>
-
-## Email Servers
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="email-servers/index.md#stalwart" title="Stalwart" image="email-servers/stalwart.svg" subtitle="Stalwart is a newer mail server written in Rust which supports JMAP in addition to the standard IMAP, POP3, and SMTP. It has a wide variety of configuration options, but also defaults to very reasonable settings in terms of both security and features, making it easy to use immediately." >}}
-  {{< card link="email-servers/index.md#mailcow" title="Mailcow" image="email-servers/mailcow.svg" subtitle="Mailcow is an advanced mail server perfect for those with Linux experience. It has everything you need in a Docker container: a mail server with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support." >}}
-  {{< card link="email-servers/index.md#mail-in-a-box" title="Mail-in-a-Box" image="email-servers/mail-in-a-box.svg" subtitle="Mail-in-a-Box is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for people to set up their own mail server." >}}
-{{< /cards >}}
-</div>
-
-## File Management
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="file-management/index.md#photoprism" title="PhotoPrism" image="file-management/photoprism.svg" subtitle="PhotoPrism is a platform for managing photos. It supports album syncing and sharing as well as a variety of other features. It does not include end-to-end encryption, so it’s best hosted on a server that you trust and is under your control." >}}
-  {{< card link="file-management/index.md#freedombox" title="FreedomBox" image="file-management/freedombox.svg" subtitle="FreedomBox is an operating system designed to be run on a single-board computer (SBC). The purpose is to make it easy to set up server applications for use cases like sharing files." >}}
-  {{< card link="file-management/index.md#nextcloud" title="Nextcloud" image="file-management/nextcloud.svg" subtitle="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control." >}}
-{{< /cards >}}
-</div>
-
-## Password Sync
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="passwords/index.md#vaultwarden" title="Vaultwarden" image="passwords/vaultwarden.svg" subtitle="Vaultwarden is an alternative implementation of Bitwarden's sync server written in Rust and compatible with official Bitwarden clients, perfect for self-hosted deployment where running the resource-heavy, official service might not be ideal." >}}
-{{< /cards >}}
-</div>
-
-## More Tools
-
-These recommendations live in other tools categories (software and services) but also support self-hosting when you are comfortable operating them yourself.
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="../services/cloud/index.md#peergos" title="Peergos" image="../services/cloud/peergos.svg" subtitle="Peergos is a decentralized protocol and open-source platform for storage, social media, and applications. It provides a secure and private space where users can store, share, view, and edit their photos, videos, documents, etc." >}}
-  {{< card link="../services/email-aliasing/index.md#addyio" title="Addy.io" image="../services/email-aliasing/addy.svg" subtitle="Addy.io lets you create 10 domain aliases on a shared domain for free, or unlimited standard aliases. The number of shared aliases (which end in a shared domain like @addy.io) that you can create depends on the plan you are subscribed to." >}}
-  {{< card link="../services/email-aliasing/index.md#simplelogin" title="SimpleLogin" image="../services/email-aliasing/simplelogin.svg" subtitle="SimpleLogin is a free service which provides email aliases on a variety of shared domain names, and optionally provides paid features like unlimited aliases and custom domains." >}}
-  {{< card link="../services/messengers/index.md#simplex-chat" title="SimpleX Chat" image="../services/messengers/simplex.svg" subtitle="SimpleX Chat is an instant messenger that doesn't depend on any unique identifiers such as phone numbers or usernames. Its decentralized network makes SimpleX Chat an effective tool against censorship." >}}
-  {{< card link="../services/photo-backups/index.md#ente-photos" title="Ente Photos" image="../services/photo-backups/ente.svg" subtitle="Ente Photos is an end-to-end encrypted photo backup service which supports automatic backups on iOS and Android. Their code is fully open source, both on the client side and on the server side." >}}
-  {{< card link="../software/document-collaboration/index.md#cryptpad" title="CryptPad" image="../software/document-collaboration/cryptpad.svg" subtitle="CryptPad is a private-by-design alternative to popular, full-fledged office suites. All content on this web service is E2EE and can be shared with other users easily." >}}
-  {{< card link="../software/file-sharing/index.md#send" title="Send" image="../software/file-sharing/send.svg" subtitle="Send is a fork of Mozilla's discontinued Firefox Send service which allows you to send files to others with a link. Files are encrypted on your device so that they cannot be read by the server, and they can be optionally password-protected as well." >}}
-  {{< card link="../software/frontends/index.md#invidious" title="Invidious" image="../software/frontends/invidious.svg" subtitle="Invidious is a free and open-source frontend for YouTube that is also self-hostable." >}}
-  {{< card link="../software/frontends/index.md#piped" title="Piped" image="../software/frontends/piped.svg" subtitle="Piped is a free and open-source frontend for YouTube that is also self-hostable." >}}
-  {{< card link="../software/frontends/index.md#proxitok" title="ProxiTok" image="../software/frontends/proxitok.svg" subtitle="ProxiTok is an open-source frontend to the TikTok website that is also self-hostable." >}}
-  {{< card link="../software/frontends/index.md#redlib" title="Redlib" image="../software/frontends/redlib.svg" subtitle="Redlib is an open-source frontend to the Reddit website that is also self-hostable. You can access Redlib through a number of public instances." >}}
-  {{< card link="../software/language-tools/index.md#libretranslate" title="LibreTranslate" image="../software/language-tools/libretranslate.png" subtitle="LibreTranslate is a free and open-source machine translation web interface and API server. It uses Argos Translate models on the backend for translations." >}}
-  {{< card link="../software/news-aggregators/index.md#miniflux" title="Miniflux" image="../software/news-aggregators/miniflux.svg" subtitle="Miniflux is a web-based news aggregator that you can self-host." >}}
-  {{< card link="../software/notebooks/index.md#standard-notes" title="Standard Notes" image="../software/notebooks/standard-notes.svg" subtitle="Standard Notes is a simple and private notes app that features cross-platform sync for seamless use. It features E2EE on every platform, and a powerful desktop experience with themes and custom editors." >}}
-  {{< card link="../software/pastebins/index.md#paaster" title="Paaster" image="../software/pastebins/paaster.svg" subtitle="Paaster is a secure and user-friendly pastebin application that prioritizes privacy and simplicity. With end-to-end encryption and paste history, Paaster ensures that your pasted code remains confidential and accessible." >}}
-  {{< card link="../software/pastebins/index.md#privatebin" title="PrivateBin" image="../software/pastebins/privatebin.svg" subtitle="PrivateBin is a minimalist, open-source, online pastebin where the server cannot decrypt and read any pasted data you submit. Data is encrypted/decrypted in the browser using 256-bit AES." >}}
-  {{< card link="../software/social-networks/index.md#element" title="Element" image="../software/social-networks/element.svg" subtitle="Element is the flagship client for the Matrix protocol, an open standard that enables decentralized communication by way of federated chat rooms. Users can exist on different homeservers but still communicate with each other." >}}
-  {{< card link="../software/social-networks/index.md#mastodon" title="Mastodon" image="../software/social-networks/mastodon.svg" subtitle="Mastodon is a social network based on open web protocols and free, open-source software. It uses the ActivityPub protocol, which is decentralized like email: Users can exist on different servers or even different platforms but still communicate with each other." >}}
-{{< /cards >}}
-</div>
diff --git a/content/tools/self-hosting/dns-filtering/index.md b/content/tools/self-hosting/dns-filtering/index.md
index 8e97384f5..765c5df35 100644
--- a/content/tools/self-hosting/dns-filtering/index.md
+++ b/content/tools/self-hosting/dns-filtering/index.md
@@ -1,6 +1,8 @@
 ---
 title: DNS Filtering
 description: For our more technical readers, self-hosting a DNS solution can provide filtering for devices not covered by cloud-based DNS solutions.
+aliases:
+- /tools/self-hosting
 ---
 <small>Protects against the following threat(s):</small>
 [{{< badge content="Service Providers" color="indigo" >}}](../../../wiki/basics/common-threats/index.md#privacy-from-service-providers)
diff --git a/content/tools/services/_index.md b/content/tools/services/_index.md
index cb5b15b07..2bc61fad9 100644
--- a/content/tools/services/_index.md
+++ b/content/tools/services/_index.md
@@ -2,123 +2,7 @@
 title: Services
 description: Privacy-respecting hosted services we recommend for email, DNS, VPN, search, and more.
 weight: 20
+build:
+  list: local
+  render: link
 ---
-
-## Calendar Sync
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="calendar/index.md#tuta" title="Tuta" image="email/tuta.svg" subtitle="Tuta offers a free and encrypted calendar across their supported platforms. Features include automatic E2EE of all data, sharing features, import/export functionality, multifactor authentication, and more." >}}
-  {{< card link="calendar/index.md#proton-calendar" title="Proton Calendar" image="calendar/proton-calendar.svg" subtitle="Proton Calendar is an encrypted calendar service available to Proton members via its web or mobile clients. Features include automatic E2EE of all data, sharing features, import/export functionality, and more." >}}
-{{< /cards >}}
-</div>
-
-## Cloud Storage
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="cloud/index.md#proton-drive" title="Proton Drive" image="cloud/protondrive.svg" subtitle="Proton Drive is an encrypted cloud storage provider from the popular encrypted email provider Proton Mail. The initial free storage is limited to 2 GB, but with the completion of certain steps, additional storage can be obtained up to 5 GB." >}}
-  {{< card link="cloud/index.md#tresorit" title="Tresorit" image="cloud/tresorit.svg" subtitle="Tresorit is a Swiss-Hungarian encrypted cloud storage provider founded in 2011. Tresorit is owned by the Swiss Post, the national postal service of Switzerland." >}}
-  {{< card link="cloud/index.md#peergos" title="Peergos" image="cloud/peergos.svg" subtitle="Peergos is a decentralized protocol and open-source platform for storage, social media, and applications. It provides a secure and private space where users can store, share, view, and edit their photos, videos, documents, etc." >}}
-{{< /cards >}}
-</div>
-
-## Data Removal Services
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="data-broker-removals/index.md#easyoptouts-paid" title="EasyOptOuts" image="data-broker-removals/easyoptouts.svg" subtitle="EasyOptOuts is a $20/year service which will search a number of different data broker sites and automatically submit opt-out requests on your behalf. They will perform the first search and removal process immediately, and then re-run the process every 4 months in case your data shows up on new sites over time." >}}
-  {{< card link="data-broker-removals/index.md#google-results-about-you-free" title="Google Results about you" image="data-broker-removals/google.svg" subtitle="Results about you is a free tool which helps you discover whether your personal contact information, including your home address, phone number, and email address, appears in Google search results. If any personal information is found, you can request its removal." >}}
-{{< /cards >}}
-</div>
-
-## DNS
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="dns/index.md#control-d" title="Control D" image="dns/control-d.svg" subtitle="Control D is a customizable DNS service which lets you block security threats, unwanted content, and advertisements on a DNS level. In addition to their paid plans, they offer a number of preconfigured DNS resolvers you can use for free." >}}
-  {{< card link="dns/index.md#nextdns" title="NextDNS" image="dns/nextdns.svg" subtitle="NextDNS is a customizable DNS service which lets you block security threats, unwanted content, and advertisements on a DNS level. They offer a fully functional free plan for limited use." >}}
-  {{< card link="dns/index.md#rethinkdns" title="RethinkDNS" image="dns/rethinkdns.svg" subtitle="RethinkDNS is an open-source Android client that supports DoH, DoT, DNSCrypt and DNS Proxy. It also provides additional functionality such as caching DNS responses, locally logging DNS queries, and using the app as a firewall." >}}
-  {{< card link="dns/index.md#dnscrypt-proxy" title="DNSCrypt-Proxy" image="dns/dnscrypt-proxy.svg" subtitle="DNSCrypt-Proxy is a DNS proxy with support for DNSCrypt, DoH, and Anonymized DNS." >}}
-{{< /cards >}}
-</div>
-
-## Email Providers
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="email/index.md#proton-mail" title="Proton Mail" image="email/protonmail.svg" subtitle="Proton Mail is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since 2013. Proton AG is based in Geneva, Switzerland." >}}
-  {{< card link="email/index.md#mailbox-mail" title="Mailbox Mail" image="email/mailbox-mail.svg" subtitle="Mailbox Mail (formerly Mailbox.org) is an email service with a focus on being secure, ad-free, and powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox Mail is based in Berlin, Germany." >}}
-  {{< card link="email/index.md#tuta" title="Tuta" image="email/tuta.svg" subtitle="Tuta (formerly Tutanota) is an email service with a focus on security and privacy through the use of encryption. Tuta has been in operation since 2011 and is based in Hanover, Germany." >}}
-{{< /cards >}}
-</div>
-
-## Email Aliasing Services
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="email-aliasing/index.md#addyio" title="Addy.io" image="email-aliasing/addy.svg" subtitle="Addy.io lets you create 10 domain aliases on a shared domain for free, or unlimited standard aliases. The number of shared aliases (which end in a shared domain like @addy.io) that you can create depends on the plan you are subscribed to." >}}
-  {{< card link="email-aliasing/index.md#simplelogin" title="SimpleLogin" image="email-aliasing/simplelogin.svg" subtitle="SimpleLogin is a free service which provides email aliases on a variety of shared domain names, and optionally provides paid features like unlimited aliases and custom domains." >}}
-{{< /cards >}}
-</div>
-
-## Financial Services
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="financial-services/index.md#privacycom-us" title="Privacy.com (US)" image="financial-services/privacy_com.svg" subtitle="Privacy.com's free plan allows you to create up to 12 virtual cards per month, set spend limits on those cards, and shut off cards instantly. Their paid plans provide higher limits on the number of cards that can be created each month." >}}
-  {{< card link="financial-services/index.md#mysudo-us-paid" title="MySudo (US, Paid)" image="financial-services/mysudo.svg" subtitle="MySudo provides up to 9 virtual cards depending on the plan you purchase. Their paid plans additionally include functionality which may be useful for making purchases privately, such as virtual phone numbers and email addresses, although we typically recommend other email aliasing providers for extensive email aliasing use." >}}
-  {{< card link="financial-services/index.md#coincards" title="Coincards" image="financial-services/coincards.svg" subtitle="Coincards allows you to purchase gift cards for a large variety of merchants. Their homepage has a complete listing of the various countries where their service is available." >}}
-{{< /cards >}}
-</div>
-
-## Instant Messengers
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="messengers/index.md#signal" title="Signal" image="messengers/signal.svg" subtitle="Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging and calls secured with the Signal protocol, an extremely secure encryption protocol which supports forward secrecy and post-compromise security." >}}
-  {{< card link="messengers/index.md#molly-android" title="Molly (Android)" image="messengers/molly.svg" subtitle="If you use Android and your threat model requires protecting against targeted attacks you may consider using this alternative app, which features a number of security and usability improvements, to access the Signal network. Molly is an alternative Signal client for Android which allows you to encrypt the local database with a passphrase at rest, to have unused RAM data securely shredded, to route your connection via Tor, and more." >}}
-  {{< card link="messengers/index.md#simplex-chat" title="SimpleX Chat" image="messengers/simplex.svg" subtitle="SimpleX Chat is an instant messenger that doesn't depend on any unique identifiers such as phone numbers or usernames. Its decentralized network makes SimpleX Chat an effective tool against censorship." >}}
-  {{< card link="messengers/index.md#briar" title="Briar" image="messengers/briar.svg" subtitle="Briar is an encrypted instant messenger that connects to other clients using the Tor network, making it an effective tool at circumventing censorship. Briar can also connect via Wi-Fi or Bluetooth when in local proximity." >}}
-{{< /cards >}}
-</div>
-
-## Password Managers
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="passwords/index.md#bitwarden" title="Bitwarden" image="passwords/bitwarden.svg" subtitle="Bitwarden is a free and open-source password and passkey manager. It aims to solve password management problems for individuals, teams, and business organizations." >}}
-  {{< card link="passwords/index.md#proton-pass" title="Proton Pass" image="passwords/protonpass.svg" subtitle="Proton Pass is an open-source, end-to-end encrypted password manager developed by Proton, the team behind Proton Mail. It securely stores your login credentials, generates unique email aliases, and supports and stores passkeys." >}}
-  {{< card link="passwords/index.md#1password" title="1Password" image="passwords/1password.svg" subtitle="1Password is a password manager with a strong focus on security and ease-of-use that allows you to store passwords, passkeys, credit cards, software licenses, and any other sensitive information in a secure digital vault. Your vault is hosted on 1Password's servers for a monthly fee." >}}
-  {{< card link="passwords/index.md#psono" title="Psono" image="passwords/psono.svg" subtitle="Psono is a free and open-source password manager from Germany, with a focus on password management for teams. Psono supports secure sharing of passwords, files, bookmarks, and emails." >}}
-{{< /cards >}}
-</div>
-
-## Photo Backups
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="photo-backups/index.md#ente-photos" title="Ente Photos" image="photo-backups/ente.svg" subtitle="Ente Photos is an end-to-end encrypted photo backup service which supports automatic backups on iOS and Android. Their code is fully open source, both on the client side and on the server side." >}}
-{{< /cards >}}
-</div>
-
-## Search Engines
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="search-engines/index.md#brave-search" title="Brave Search" image="search-engines/brave-search.svg" subtitle="Brave Search is a search engine developed by Brave. It includes unique features such as Discussions, which highlights conversation-focused results such as forum posts." >}}
-  {{< card link="search-engines/index.md#duckduckgo" title="DuckDuckGo" image="search-engines/duckduckgo.svg" subtitle="DuckDuckGo is one of the more mainstream private search engine options. Notable DuckDuckGo search features include bangs and a variety of instant answers." >}}
-  {{< card link="search-engines/index.md#startpage" title="Startpage" image="search-engines/startpage.svg" subtitle="Startpage is a private search engine. One of Startpage's unique features is the Anonymous View, which puts forth efforts to standardize user activity to make it more difficult to be uniquely identified." >}}
-  {{< card link="search-engines/index.md#searxng" title="SearXNG" image="search-engines/searxng.svg" subtitle="SearXNG is an open-source, self-hostable, metasearch engine. It is an actively maintained fork of SearX." >}}
-{{< /cards >}}
-</div>
-
-## VPN Providers
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="vpn/index.md#proton-vpn" title="Proton VPN" image="vpn/protonvpn.svg" subtitle="Proton VPN is a strong contender in the VPN space, and they have been in operation since 2016. Proton AG is based in Switzerland and offers a limited free tier, as well as a more featured premium option." >}}
-  {{< card link="vpn/index.md#ivpn" title="IVPN" image="vpn/ivpn.svg" subtitle="IVPN is another premium VPN provider, and they have been in operation since 2009. IVPN is based in Gibraltar and does not offer a free trial." >}}
-  {{< card link="vpn/index.md#mullvad" title="Mullvad" image="vpn/mullvad.svg" subtitle="Mullvad is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since 2009. Mullvad is based in Sweden and offers a 14-day money-back guarantee for payment methods that allow it." >}}
-{{< /cards >}}
-</div>
diff --git a/content/tools/services/calendar/index.md b/content/tools/services/calendar/index.md
index 7d0fbd615..24d666b61 100644
--- a/content/tools/services/calendar/index.md
+++ b/content/tools/services/calendar/index.md
@@ -1,6 +1,8 @@
 ---
 title: Calendar Sync
 description: Calendars contain some of your most sensitive data; use products that implement encryption at rest.
+aliases:
+- /tools/services
 ---
 
 <small>Protects against the following threat(s):</small>
diff --git a/content/tools/software/_index.md b/content/tools/software/_index.md
index 6463c23ec..9a8166e24 100644
--- a/content/tools/software/_index.md
+++ b/content/tools/software/_index.md
@@ -2,238 +2,7 @@
 title: Software
 description: Privacy-respecting desktop and mobile apps for browsing, encryption, passwords, notes, and more.
 weight: 30
+build:
+  list: local
+  render: link
 ---
-
-## AI Chat
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="ai-chat/index.md#koboldcpp" title="Kobold.cpp" image="ai-chat/kobold.png" subtitle="Kobold.cpp is an AI client that runs locally on your Windows, Mac, or Linux computer. It's an excellent choice if you are looking for heavy customization and tweaking, such as for role-playing purposes." >}}
-  {{< card link="ai-chat/index.md#ollama-cli" title="Ollama" image="ai-chat/ollama.png" subtitle="Ollama is a command-line AI assistant that is available on macOS, Linux, and Windows. Ollama is a great choice if you're looking for an AI client that's easy-to-use, widely compatible, and fast due to its use of inference and other techniques." >}}
-  {{< card link="ai-chat/index.md#llamafile" title="Llamafile" image="ai-chat/llamafile.webp" subtitle="Llamafile is a lightweight, single-file executable that allows users to run LLMs locally on their own computers without any setup involved. It is backed by Mozilla and available on Linux, macOS, and Windows." >}}
-{{< /cards >}}
-</div>
-
-## Browser Extensions
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="browser-extensions/index.md#ublock-origin" title="uBlock Origin" image="browser-extensions/ublock_origin.svg" subtitle="uBlock Origin is a popular content blocker that could help you block ads, trackers, and fingerprinting scripts." >}}
-  {{< card link="browser-extensions/index.md#ublock-origin-lite" title="uBlock Origin Lite" image="browser-extensions/ublock_origin_lite.svg" subtitle="uBlock Origin Lite is a Manifest V3 compatible content blocker. Compared to the original uBlock Origin, this extension does not require broad read/modify data permissions to function, which lowers the risk of Passive Attacks on your browser if a malicious rule is added to a filter list." >}}
-  {{< card link="browser-extensions/index.md#adguard" title="AdGuard for iOS" image="browser-extensions/adguard.svg" subtitle="AdGuard for iOS is a free and open-source content-blocking extension for Safari that uses the native Content Blocker API." >}}
-{{< /cards >}}
-</div>
-
-## Cryptocurrency
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="cryptocurrency/index.md#monero" title="Monero" image="cryptocurrency/monero.svg" subtitle="Monero uses a blockchain with privacy-enhancing technologies that obfuscate transactions to achieve Anonymity. Every Monero transaction hides the transaction amount, sending and receiving addresses, and source of funds without any hoops to jump through, making it an ideal choice for cryptocurrency novices." >}}
-{{< /cards >}}
-</div>
-
-## Data and Metadata Redaction
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="data-redaction/index.md#mat2" title="MAT2" image="data-redaction/mat2.svg" subtitle="MAT2 is free, cross-platform software which allows you to remove metadata from image, audio, torrent, and document file types. It provides both a command line tool and a graphical user interface via an extension for Dolphin, the default file manager of KDE." >}}
-  {{< card link="data-redaction/index.md#exiferaser-android" title="ExifEraser" image="data-redaction/exiferaser.svg" subtitle="ExifEraser is a modern, permissionless image metadata erasing application for Android." >}}
-  {{< card link="data-redaction/index.md#exiftool-cli" title="ExifTool" image="data-redaction/exiftool.png" subtitle="ExifTool is the original Perl library and command-line application for reading, writing, and editing meta information (Exif, IPTC, XMP, and more) in a wide variety of file formats (JPEG, TIFF, PNG, PDF, RAW, and more)." >}}
-{{< /cards >}}
-</div>
-
-## Desktop Browsers
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="desktop-browsers/index.md#mullvad-browser" title="Mullvad Browser" image="desktop-browsers/mullvad_browser.svg" subtitle="Mullvad Browser is a version of Tor Browser with Tor network integrations removed. It aims to provide to VPN users Tor Browser's anti-fingerprinting browser technologies, which are key protections against Mass Surveillance." >}}
-  {{< card link="desktop-browsers/index.md#firefox" title="Firefox" image="desktop-browsers/firefox.svg" subtitle="Firefox provides strong privacy settings such as Enhanced Tracking Protection, which can help block various types of tracking." >}}
-  {{< card link="desktop-browsers/index.md#brave" title="Brave" image="desktop-browsers/brave.svg" subtitle="Brave Browser includes a built-in content blocker and privacy features, many of which are enabled by default. Brave is built upon the Chromium web browser project, so it should feel familiar and have minimal website compatibility issues." >}}
-{{< /cards >}}
-</div>
-
-## Document Collaboration
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="document-collaboration/index.md#cryptpad" title="CryptPad" image="document-collaboration/cryptpad.svg" subtitle="CryptPad is a private-by-design alternative to popular, full-fledged office suites. All content on this web service is E2EE and can be shared with other users easily." >}}
-{{< /cards >}}
-</div>
-
-## Email Clients
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="email-clients/index.md#thunderbird" title="Thunderbird" image="email-clients/thunderbird.svg" subtitle="Thunderbird is a free, open-source, cross-platform email, newsgroup, news feed, and chat (XMPP, IRC, Matrix) client developed by the Thunderbird community, and previously by the Mozilla Foundation." >}}
-  {{< card link="email-clients/index.md#apple-mail-macos" title="Apple Mail" image="email-clients/applemail.png" subtitle="Apple Mail is included in macOS and can be extended to have OpenPGP support with GPG Suite, which adds the ability to send PGP-encrypted email." >}}
-  {{< card link="email-clients/index.md#fairemail-android" title="FairEmail" image="email-clients/fairemail.svg" subtitle="FairEmail is a minimal, open-source email app which uses open standards (IMAP, SMTP, OpenPGP) and minimizes data and battery usage." >}}
-  {{< card link="email-clients/index.md#gnome-evolution-gnome" title="GNOME Evolution" image="email-clients/evolution.svg" subtitle="Evolution is a personal information management application that provides integrated mail, calendaring, and address book functionality. Evolution has extensive documentation to help you get started." >}}
-  {{< card link="email-clients/index.md#kontact-kde" title="Kontact" image="email-clients/kontact.svg" subtitle="Kontact is a personal information manager (PIM) application from the KDE project. It provides a mail client, address book, RSS client, and an organizer." >}}
-  {{< card link="email-clients/index.md#mailvelope-browser" title="Mailvelope" image="email-clients/mailvelope.svg" subtitle="Mailvelope is a browser extension that enables the exchange of encrypted emails following the OpenPGP encryption standard." >}}
-  {{< card link="email-clients/index.md#neomutt-cli" title="NeoMutt" image="email-clients/mutt.svg" subtitle="NeoMutt is an open-source command line email reader for Linux and BSD. It's a fork of Mutt) with added features." >}}
-{{< /cards >}}
-</div>
-
-## Encryption Software
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="encryption/index.md#cryptomator-cloud" title="Cryptomator" image="encryption/cryptomator.svg" subtitle="Cryptomator is an encryption solution designed for privately saving files to any cloud Service Provider, eliminating the need to trust that they won't access your files. It allows you to create vaults that are stored on a virtual drive, the contents of which are encrypted and synced with your cloud storage provider." >}}
-  {{< card link="encryption/index.md#veracrypt-disk" title="VeraCrypt" image="encryption/veracrypt.svg" subtitle="VeraCrypt is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file, encrypt a partition, or encrypt the entire storage device with pre-boot authentication." >}}
-  {{< card link="encryption/index.md#bitlocker" title="BitLocker" image="encryption/bitlocker.png" subtitle="BitLocker is the full volume encryption solution bundled with Microsoft Windows that uses the Trusted Platform Module (TPM) for hardware-based security." >}}
-  {{< card link="encryption/index.md#filevault" title="FileVault" image="encryption/filevault.png" subtitle="FileVault is the on-the-fly volume encryption solution built into macOS. FileVault takes advantage of the hardware security capabilities present on an Apple Silicon SoC or T2 Security Chip." >}}
-  {{< card link="encryption/index.md#linux-unified-key-setup" title="LUKS" image="encryption/luks.png" subtitle="LUKS is the default FDE method for Linux. It can be used to encrypt full volumes, partitions, or create encrypted containers." >}}
-  {{< card link="encryption/index.md#kryptor" title="Kryptor" image="encryption/kryptor.png" subtitle="Kryptor is a free and open-source file encryption and signing tool that makes use of modern and secure cryptographic algorithms. It aims to be a better version of age and Minisign to provide a simple, easier alternative to GPG." >}}
-  {{< card link="encryption/index.md#tomb" title="Tomb" image="encryption/tomb.png" subtitle="Tomb is a command-line shell wrapper for LUKS. It supports steganography via third-party tools." >}}
-  {{< card link="encryption/index.md#gnu-privacy-guard" title="GnuPG" image="encryption/gnupg.svg" subtitle="GnuPG is a GPL-licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF specification of OpenPGP." >}}
-  {{< card link="encryption/index.md#gpg4win" title="GPG4win" image="encryption/gpg4win.svg" subtitle="GPG4win is a package for Windows from Intevation and g10 Code. It includes various tools that can assist you in using GPG on Microsoft Windows." >}}
-  {{< card link="encryption/index.md#gpg-suite" title="GPG Suite" image="encryption/gpgsuite.png" subtitle="GPG Suite provides OpenPGP support for Apple Mail and other email clients on macOS." >}}
-  {{< card link="encryption/index.md#openkeychain" title="OpenKeychain" image="encryption/openkeychain.svg" subtitle="OpenKeychain is an implementation of GnuPG for Android. It's commonly required by mail clients such as Thunderbird, FairEmail, and other Android apps to provide encryption support." >}}
-{{< /cards >}}
-</div>
-
-## File Sharing and Sync
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="file-sharing/index.md#send" title="Send" image="file-sharing/send.svg" subtitle="Send is a fork of Mozilla's discontinued Firefox Send service which allows you to send files to others with a link. Files are encrypted on your device so that they cannot be read by the server, and they can be optionally password-protected as well." >}}
-  {{< card link="file-sharing/index.md#onionshare" title="OnionShare" image="file-sharing/onionshare.svg" subtitle="OnionShare is an open-source tool that lets you securely and anonymously share a file of any size. It works by starting a web server accessible as a Tor onion service, with an unguessable URL that you can share with the recipients to download or send files." >}}
-  {{< card link="file-sharing/index.md#syncthing-p2p" title="Syncthing" image="file-sharing/syncthing.svg" subtitle="Syncthing is an open-source peer-to-peer continuous file synchronization utility. It is used to synchronize files between two or more devices over the local network or the internet." >}}
-{{< /cards >}}
-</div>
-
-## Frontends
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="frontends/index.md#redlib" title="Redlib" image="frontends/redlib.svg" subtitle="Redlib is an open-source frontend to the Reddit website that is also self-hostable. You can access Redlib through a number of public instances." >}}
-  {{< card link="frontends/index.md#proxitok" title="ProxiTok" image="frontends/proxitok.svg" subtitle="ProxiTok is an open-source frontend to the TikTok website that is also self-hostable." >}}
-  {{< card link="frontends/index.md#invidious" title="Invidious" image="frontends/invidious.svg" subtitle="Invidious is a free and open-source frontend for YouTube that is also self-hostable." >}}
-  {{< card link="frontends/index.md#piped" title="Piped" image="frontends/piped.svg" subtitle="Piped is a free and open-source frontend for YouTube that is also self-hostable." >}}
-  {{< card link="frontends/index.md#freetube" title="FreeTube" image="frontends/freetube.svg" subtitle="FreeTube is a free and open-source desktop application for YouTube. FreeTube extracts data from YouTube using its built-in API based on YouTube.js or the Invidious API." >}}
-  {{< card link="frontends/index.md#libretube-android" title="LibreTube" image="frontends/libretube.svg" subtitle="LibreTube is a free and open-source Android application for YouTube which uses the Piped API." >}}
-  {{< card link="frontends/index.md#newpipe-android" title="NewPipe" image="frontends/newpipe.svg" subtitle="NewPipe is a free and open-source Android application for YouTube, SoundCloud, media.ccc.de, Bandcamp, and PeerTube (1)." >}}
-{{< /cards >}}
-</div>
-
-## Health and Wellness Apps
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="health-and-wellness/index.md#drip" title="Drip" image="health-and-wellness/drip.png" subtitle="Drip is a gender-inclusive and open source menstrual cycle tracker available on all mobile platforms. It relies on the 'sympto-thermal method' to predict ovulation." >}}
-  {{< card link="health-and-wellness/index.md#euki" title="Euki" image="health-and-wellness/euki.svg" subtitle="Euki is a nonprofit-backed menstrual cycle tracker that also doubles as a medication tracker and sexual wellness knowledge base. It allows you to schedule the automatic deletion of your personal data in the app." >}}
-  {{< card link="health-and-wellness/index.md#apple-health" title="Apple Health" image="health-and-wellness/apple-health.webp" subtitle="Apple Health is one of the default apps installed on iOS devices. It includes many health and wellness features (see Health Records), including menstrual cycle tracking." >}}
-  {{< card link="health-and-wellness/index.md#apple-fitness" title="Apple Fitness" image="health-and-wellness/apple-fitness.webp" subtitle="Apple Fitness is the default fitness app for iOS. Apple Fitness always uses end-to-end encryption when syncing across multiple devices." >}}
-  {{< card link="health-and-wellness/index.md#gadgetbridge" title="Gadgetbridge" image="health-and-wellness/gadgetbridge.svg" subtitle="Gadgetbridge is an open-source Android application which allows you to pair and manage your Bluetooth device without relying on the vendor’s application. When paired with a compatible smartwatch, it can mimic the health and wellness functionality of these watches without third-party data collection." >}}
-  {{< card link="health-and-wellness/index.md#apple-health-records" title="Apple Health Records" image="health-and-wellness/apple-health.webp" subtitle="Apple Health Records is a built-in feature within Apple Health that allows you to view, store, and share your health records." >}}
-  {{< card link="health-and-wellness/index.md#commonhealth" title="CommonHealth" image="health-and-wellness/commonhealth.png" subtitle="CommonHealth is a privacy-respecting Android app that allows people to access their electronic health records and securely share it to providers. All health data is stored on your device and can be protected with a passcode or biometric authentication." >}}
-{{< /cards >}}
-</div>
-
-## Language Tools
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="language-tools/index.md#languagetool" title="LanguageTool" image="language-tools/languagetool.svg" subtitle="LanguageTool is a multilingual grammar, style, and spell checker that supports more than 20 languages. According to their privacy policy, they do not store any content sent to their service for review, but for higher assurance the software is self-hostable." >}}
-  {{< card link="language-tools/index.md#libretranslate" title="LibreTranslate" image="language-tools/libretranslate.png" subtitle="LibreTranslate is a free and open-source machine translation web interface and API server. It uses Argos Translate models on the backend for translations." >}}
-{{< /cards >}}
-</div>
-
-## Maps and Navigation
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="maps/index.md#organic-maps" title="Organic Maps" image="maps/organic-maps.svg" subtitle="Organic Maps is an open-source, community-developed map display and satnav-style navigation app for walkers, drivers, and cyclists. The app offers worldwide, offline maps based on OpenStreetMap data, and navigation with privacy — no location tracking, no data collection, and no ads." >}}
-  {{< card link="maps/index.md#osmand" title="OsmAnd" image="maps/osmand.svg" subtitle="OsmAnd is an open-source, offline map and navigation application based on OpenStreetMap that offers turn-by-turn navigation for walking, cycling, driving, as well as public transport. You can find a detailed overview of OsmAnd's supported features on the OpenStreet Map Wiki." >}}
-{{< /cards >}}
-</div>
-
-## Mobile Browsers
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="mobile-browsers/index.md#brave" title="Brave" image="mobile-browsers/brave.svg" subtitle="Brave Browser includes a built-in content blocker and privacy features, many of which are enabled by default. Brave is built upon the Chromium web browser project, so it should feel familiar and have minimal website compatibility issues." >}}
-  {{< card link="mobile-browsers/index.md#safari-ios" title="Safari (iOS)" image="mobile-browsers/safari.svg" subtitle="On iOS, any app that can browse the web is restricted to using an Apple-provided WebKit framework, so a browser like Brave does not use the Blink engine (the core component of Chromium) like its counterparts on other operating systems. Safari is the default browser in iOS." >}}
-{{< /cards >}}
-</div>
-
-## Multifactor Authentication
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="multi-factor-authentication/index.md#ente-auth" title="Ente Auth" image="multi-factor-authentication/ente-auth.svg" subtitle="Ente Auth is a free and open-source app which stores and generates TOTP tokens. It can be used with an online account to back up and sync your tokens across your devices (and access them via a web interface) in a secure, end-to-end encrypted fashion." >}}
-  {{< card link="multi-factor-authentication/index.md#aegis-authenticator-android" title="Aegis Authenticator" image="multi-factor-authentication/aegis.png" subtitle="Aegis Authenticator is a free and open-source app for Android to manage your 2-step verification tokens for your online services. Aegis Authenticator operates completely offline/locally, but includes the option to export your tokens for backup unlike many alternatives." >}}
-{{< /cards >}}
-</div>
-
-## News Aggregators
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="news-aggregators/index.md#akregator" title="Akregator" image="news-aggregators/akregator.svg" subtitle="Akregator is a news feed reader that is a part of the KDE project. It comes with a fast search, advanced archiving functionality, and an internal browser for easy news reading." >}}
-  {{< card link="news-aggregators/index.md#newsflash" title="NewsFlash" image="news-aggregators/newsflash.png" subtitle="NewsFlash is an open-source, modern, and easy-to-use news feed reader for Linux. It can be used offline or with services like Inoreader or Nextcloud News." >}}
-  {{< card link="news-aggregators/index.md#feeder" title="Feeder" image="news-aggregators/feeder.png" subtitle="Feeder is a modern RSS client for Android that has many features and works well with folders of RSS feeds." >}}
-  {{< card link="news-aggregators/index.md#miniflux" title="Miniflux" image="news-aggregators/miniflux.svg" subtitle="Miniflux is a web-based news aggregator that you can self-host." >}}
-  {{< card link="news-aggregators/index.md#netnewswire" title="NetNewsWire" image="news-aggregators/netnewswire.png" subtitle="NetNewsWire is a free and open-source feed reader for macOS and iOS with a focus on a native design and feature set." >}}
-  {{< card link="news-aggregators/index.md#newsboat" title="Newsboat" image="news-aggregators/newsboat.svg" subtitle="Newsboat is an RSS/Atom feed reader for the text console. It's an actively maintained fork of Newsbeuter." >}}
-{{< /cards >}}
-</div>
-
-## Notebooks
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="notebooks/index.md#standard-notes" title="Standard Notes" image="notebooks/standard-notes.svg" subtitle="Standard Notes is a simple and private notes app that features cross-platform sync for seamless use. It features E2EE on every platform, and a powerful desktop experience with themes and custom editors." >}}
-  {{< card link="notebooks/index.md#notesnook" title="Notesnook" image="notebooks/notesnook.svg" subtitle="Notesnook is a free (as in speech), open-source, and easy-to-use E2EE note-taking app focused on user privacy." >}}
-  {{< card link="notebooks/index.md#joplin" title="Joplin" image="notebooks/joplin.svg" subtitle="Joplin is a free, open-source, and fully-featured E2EE note-taking and to-do application which can handle numerous Markdown notes organized into notebooks and tags." >}}
-  {{< card link="notebooks/index.md#cryptee" title="Cryptee" image="notebooks/cryptee.svg" subtitle="Cryptee is an open-source, web-based E2EE document editor and photo storage application." >}}
-  {{< card link="notebooks/index.md#org-mode" title="Org-mode" image="notebooks/org-mode.svg" subtitle="Org-mode is a major mode for GNU Emacs. Org-mode is for keeping notes, maintaining to-do lists, planning projects, and authoring documents with a fast and effective plain-text system." >}}
-{{< /cards >}}
-</div>
-
-## Office Suites
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="office-suites/index.md#libreoffice" title="LibreOffice" image="office-suites/libreoffice.svg" subtitle="LibreOffice is a free and open-source office suite with extensive functionality." >}}
-  {{< card link="office-suites/index.md#onlyoffice" title="OnlyOffice" image="office-suites/onlyoffice.svg" subtitle="OnlyOffice is a cloud-based free and open-source office suite with extensive functionality, including integration with Nextcloud." >}}
-{{< /cards >}}
-</div>
-
-## Password Managers
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="passwords/index.md#keepassxc" title="KeePassXC" image="passwords/keepassxc.svg" subtitle="KeePassXC is a community fork of KeePassX, a native cross-platform port of KeePass Password Safe, with the goal of extending and improving it with new features and bug fixes to provide a feature-rich, cross-platform, and modern open-source password manager." >}}
-  {{< card link="passwords/index.md#keepassdx-android" title="KeePassDX" image="passwords/keepassdx.svg" subtitle="KeePassDX is a lightweight password manager for Android; it allows for editing encrypted data in a single file in KeePass format and can fill in forms securely." >}}
-  {{< card link="passwords/index.md#keepassium-ios-macos" title="KeePassium" image="passwords/keepassium.svg" subtitle="KeePassium is a commercial, open-source password manager made by KeePassium Labs that's compatible with other KeePass applications. It provides autofill support, passkey management, automatic two-way synchronization through most cloud storage providers, and more." >}}
-  {{< card link="passwords/index.md#gopass-cli" title="Gopass" image="passwords/gopass.svg" subtitle="Gopass is a minimal password manager for the command line written in Go. It can be used within scripting applications and works on all major desktop and server operating systems." >}}
-{{< /cards >}}
-</div>
-
-## Pastebins
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="pastebins/index.md#privatebin" title="PrivateBin" image="pastebins/privatebin.svg" subtitle="PrivateBin is a minimalist, open-source, online pastebin where the server cannot decrypt and read any pasted data you submit. Data is encrypted/decrypted in the browser using 256-bit AES." >}}
-  {{< card link="pastebins/index.md#paaster" title="Paaster" image="pastebins/paaster.svg" subtitle="Paaster is a secure and user-friendly pastebin application that prioritizes privacy and simplicity. With end-to-end encryption and paste history, Paaster ensures that your pasted code remains confidential and accessible." >}}
-{{< /cards >}}
-</div>
-
-## Social Networks
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="social-networks/index.md#mastodon" title="Mastodon" image="social-networks/mastodon.svg" subtitle="Mastodon is a social network based on open web protocols and free, open-source software. It uses the ActivityPub protocol, which is decentralized like email: Users can exist on different servers or even different platforms but still communicate with each other." >}}
-  {{< card link="social-networks/index.md#element" title="Element" image="social-networks/element.svg" subtitle="Element is the flagship client for the Matrix protocol, an open standard that enables decentralized communication by way of federated chat rooms. Users can exist on different homeservers but still communicate with each other." >}}
-{{< /cards >}}
-</div>
-
-## Tor Browser
-
-<div class="pg-card-logos">
-{{< cards >}}
-  {{< card link="tor/index.md#tor-browser" title="Tor Browser" image="tor/tor.svg" subtitle="Tor Browser is the top choice if you need anonymity, as it provides you with access to the Tor network and bridges, and it includes default settings and extensions that are automatically configured by the default security levels: *Standard*, *Safer* and *Safest*." >}}
-  {{< card link="tor/index.md#onion-browser-ios" title="Onion Browser" image="tor/onion_browser.svg" subtitle="Onion Browser is an open-source browser that lets you browse the web anonymously over the Tor network on iOS devices and is endorsed by the Tor Project." >}}
-{{< /cards >}}
-</div>
diff --git a/content/tools/software/ai-chat/index.md b/content/tools/software/ai-chat/index.md
index f3d99b96e..8b27b8c84 100755
--- a/content/tools/software/ai-chat/index.md
+++ b/content/tools/software/ai-chat/index.md
@@ -1,6 +1,8 @@
 ---
 title: "AI Chat"
 description: Unlike OpenAI's ChatGPT and its Big Tech competitors, these AI tools run locally so your data never leaves your desktop device.
+aliases:
+- /tools/software
 ---
 <small>Protects against the following threat(s):</small>
 [{{< badge content="Service Providers" color="indigo" >}}](../../../wiki/basics/common-threats/index.md#privacy-from-service-providers)
diff --git a/content/wiki/advanced/_index.md b/content/wiki/advanced/_index.md
index 57e7373e3..3a86b31b3 100644
--- a/content/wiki/advanced/_index.md
+++ b/content/wiki/advanced/_index.md
@@ -1,15 +1,7 @@
 ---
 title: Advanced Topics
 weight: 20
+build:
+  list: local
+  render: link
 ---
-
-We're moving on to more advanced topics! We have a few recommended pages below, or you can browse the left sidebar for the information you're looking for. If you have any questions, feel free to ask in our [community forum](https://discuss.privacyguides.net/).
-
-{{< cards >}}
-  {{< card link="advanced/tor-overview" title="Tor Overview" subtitle="Tor is a free to use, decentralized network designed for using the internet with as much privacy as possible. If used properly, the network enables private and anonymous browsing and communications. Because Tor traffic is difficult to block and trace, Tor is an effective censorship circumvention tool." >}}
-  {{< card link="advanced/payments" title="Private Payments" subtitle="Data about your buying habits is considered the holy grail of ad targeting: Your purchases can leak a veritable treasure trove of data about you. Unfortunately, the current financial system is anti-privacy by design, enabling banks, other companies, and governments to easily trace transactions. Nevertheless, you have plenty of options when it comes to making payments privately." >}}
-{{< /cards >}}
-
-## Recently Updated
-
-{{< last-edited "/wiki/advanced/" >}}
diff --git a/content/wiki/advanced/dns-overview/index.md b/content/wiki/advanced/dns-overview/index.md
index b09d7bd4a..d38dcd39c 100644
--- a/content/wiki/advanced/dns-overview/index.md
+++ b/content/wiki/advanced/dns-overview/index.md
@@ -2,6 +2,8 @@
 title: "DNS Overview"
 weight: 10
 description: The Domain Name System is the "phonebook of the internet," helping your browser find the website it's looking for.
+aliases:
+- /wiki/advanced
 ---
 
 The [Domain Name System](https://en.wikipedia.org/wiki/Domain_Name_System) is the 'phone book of the Internet'. DNS translates domain names to IP addresses so browsers and other services can load Internet resources, through a decentralized network of servers.
diff --git a/content/wiki/basics/_index.md b/content/wiki/basics/_index.md
index 5a288b5e2..40bc252bd 100644
--- a/content/wiki/basics/_index.md
+++ b/content/wiki/basics/_index.md
@@ -1,15 +1,7 @@
 ---
 title: The Basics
 weight: 10
+build:
+  list: local
+  render: link
 ---
-
-These are the basics of digital privacy. If you're new to the topic, this is a good place to start. We have a few recommended pages below, or you can browse the left sidebar for the information you're looking for. If you have any questions, feel free to ask in our [community forum](https://discuss.privacyguides.net/).
-
-{{< cards >}}
-  {{< card link="basics/why-privacy-matters" title="Why Privacy Matters" subtitle="In the modern age of digital data exploitation, your privacy has never been more critical, and yet many believe it is already a lost cause. It is not. Your privacy is up for grabs, and you need to care about it. Privacy is about power, and it is so important that this power ends up in the right hands." >}}
-  {{< card link="basics/threat-modeling" title="Threat Modeling" subtitle="Balancing security, privacy, and usability is one of the first and most difficult tasks you’ll face on your privacy journey. Everything is a trade-off: The more secure something is, the more restricting or inconvenient it generally is, etc. Often, people find that the problem with the tools they see recommended is that they’re just too hard to start using!" >}}
-{{< /cards >}}
-
-## Recently Updated
-
-{{< last-edited "/wiki/basics/" >}}
diff --git a/content/wiki/basics/why-privacy-matters/index.md b/content/wiki/basics/why-privacy-matters/index.md
index c8c3321b9..cccf2beae 100644
--- a/content/wiki/basics/why-privacy-matters/index.md
+++ b/content/wiki/basics/why-privacy-matters/index.md
@@ -2,6 +2,8 @@
 title: "Why Privacy Matters"
 weight: 10
 description: In the modern age of digital data exploitation, your privacy has never been more critical, and yet many believe it is already a lost cause. It is not.
+aliases:
+- /wiki/basics
 ---
 In the modern age of digital data exploitation, your privacy has never been more critical, and yet many believe it is already a lost cause. It is not. <mark>Your privacy is up for grabs</mark>, and you need to care about it. Privacy is about power, and it is so important that this power ends up in the right hands.
 
diff --git a/content/wiki/os/_index.md b/content/wiki/os/_index.md
index 39baf5f3b..9ea28fd96 100644
--- a/content/wiki/os/_index.md
+++ b/content/wiki/os/_index.md
@@ -1,24 +1,7 @@
 ---
 title: Operating Systems
 description: An overview of our operating system-related recommendations for all major computing hardware.
+build:
+  list: local
+  render: link
 ---
-We publish configuration guides for the major operating systems, because you can generally improve the amount of data that is collected about you on any option, especially if you use privacy tools like our [recommended web browsers](../../tools/software/desktop-browsers/index.md) in place of native tools where appropriate. However, some operating systems will be more privacy-respecting inherently, and it will be much harder to achieve an equivalent level of privacy on other choices.
-
-> [!TIP]
-> You may also wish to explore our [recommended linux distros](../../tools/os/desktop/index.md) and [recommended Android distros](../../tools/os/android/distributions/index.md).
-
-## Mobile Operating Systems
-
-{{< cards >}}
-  {{< card link="os/android" title="Android Overview" subtitle="The Android Open Source Project is a secure mobile operating system featuring strong app sandboxing, Verified Boot (AVB), and a robust permission control system." tag="featured" >}}
-  {{< card link="os/ios" title="iOS Overview" subtitle="iOS and iPadOS are proprietary mobile operating systems developed by Apple for their iPhone and iPad products, respectively. If you have an Apple mobile device, you can increase your privacy by disabling some built-in telemetry features, and hardening some privacy and security settings which are built in to the system." >}}
-{{< /cards >}}
-
-## Desktop Operating Systems
-
-{{< cards >}}
-  {{< card link="os/linux" title="Linux Overview" subtitle="Linux is an open-source, privacy-focused desktop operating system alternative. In the face of pervasive telemetry and other privacy-encroaching technologies in mainstream operating systems, desktop Linux has remained the clear choice for people looking for total control over their computers from the ground up." tag="featured" >}}
-  {{< card link="os/qubes" title="Qubes Overview" subtitle="Qubes OS is an open-source operating system which uses the Xen hypervisor to provide strong security for desktop computing through isolated qubes, (which are Virtual Machines). You can assign each qube a level of trust based on its purpose. Qubes OS provides security by using isolation. It only permits actions on a per-case basis and therefore is the opposite of badness enumeration." >}}
-  {{< card link="os/macos" title="macOS Overview" subtitle="macOS is a Unix operating system developed by Apple for their Mac computers. To enhance privacy on macOS, you can disable telemetry features and harden existing privacy and security settings." >}}
-  {{< card link="os/windows" title="Windows Overview" subtitle="Microsoft Windows is a common OS shipped with many PCs by default. The following guides aim to provide some ways to improve privacy and reduce the default telemetry and data stored by disabling some unnecessary features. Over time, Microsoft adds features to the OS which can sometimes rely on cloud-based services. These features will often require certain types of optional data that is sometimes sent to remote servers for processing." >}}
-{{< /cards >}}
diff --git a/content/wiki/os/android/index.md b/content/wiki/os/android/index.md
index 5bcb63598..0d3f13c9f 100644
--- a/content/wiki/os/android/index.md
+++ b/content/wiki/os/android/index.md
@@ -3,6 +3,8 @@ title: Android Overview
 icon: simple/android
 description: Android is an open-source operating system with strong security protections, which makes it our top choice for phones.
 robots: nofollow, max-snippet:-1, max-image-preview:large
+aliases:
+- /wiki/os
 ---
 ![Android logo](android.svg)
 { .pg:image:right }