diff --git a/i18n/ar/email.md b/i18n/ar/email.md
index 0c389cd6..9ca78bf8 100644
--- a/i18n/ar/email.md
+++ b/i18n/ar/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/ar/self-hosting/email-servers.md b/i18n/ar/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/ar/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/ar/self-hosting/index.md b/i18n/ar/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/ar/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/ar/tools.md b/i18n/ar/tools.md
index 312bb06e..914cd521 100644
--- a/i18n/ar/tools.md
+++ b/i18n/ar/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/bn-IN/email.md b/i18n/bn-IN/email.md
index ae8b4023..84dfe7b0 100644
--- a/i18n/bn-IN/email.md
+++ b/i18n/bn-IN/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/bn-IN/self-hosting/email-servers.md b/i18n/bn-IN/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/bn-IN/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/bn-IN/self-hosting/index.md b/i18n/bn-IN/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/bn-IN/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/bn-IN/tools.md b/i18n/bn-IN/tools.md
index 326613a4..ced3968d 100644
--- a/i18n/bn-IN/tools.md
+++ b/i18n/bn-IN/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/bn/email.md b/i18n/bn/email.md
index ae8b4023..84dfe7b0 100644
--- a/i18n/bn/email.md
+++ b/i18n/bn/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/bn/self-hosting/email-servers.md b/i18n/bn/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/bn/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/bn/self-hosting/index.md b/i18n/bn/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/bn/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/bn/tools.md b/i18n/bn/tools.md
index 326613a4..ced3968d 100644
--- a/i18n/bn/tools.md
+++ b/i18n/bn/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/cs/email.md b/i18n/cs/email.md
index ae8b4023..84dfe7b0 100644
--- a/i18n/cs/email.md
+++ b/i18n/cs/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/cs/self-hosting/email-servers.md b/i18n/cs/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/cs/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/cs/self-hosting/index.md b/i18n/cs/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/cs/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/cs/tools.md b/i18n/cs/tools.md
index 326613a4..ced3968d 100644
--- a/i18n/cs/tools.md
+++ b/i18n/cs/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/de/email.md b/i18n/de/email.md
index 04c1a6ff..f0cd3b35 100644
--- a/i18n/de/email.md
+++ b/i18n/de/email.md
@@ -254,61 +254,6 @@ Tuta [löscht inaktive kostenlose Konten](https://tuta.com/support#inactive-acco
Tuta bietet die Business-Version von [Tuta für gemeinnützige Organisationen](https://tuta.com/blog/secure-email-for-non-profit) kostenlos oder mit einem starken Rabatt.
-## E-Mail Selbst Hosten
-
-Fortgeschrittene Systemadministratoren können die Einrichtung eines eigenen E-Mail-Servers in Erwägung ziehen. Mailserver erfordern Aufmerksamkeit und ständige Wartung, um die Sicherheit und die Zuverlässigkeit der Mailzustellung zu gewährleisten. Zusätzlich zu den unten aufgeführten "All-in-One"-Lösungen haben wir einige Artikel herausgesucht, die einen eher manuellen Ansatz behandeln:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**Stalwart** ist ein neuerer Mail-Server, der in Rust geschrieben ist und neben den Standards IMAP, POP3, und SMTP auch JMAP unterstützt. Es verfügt über eine Vielzahl von Konfigurationsoptionen, aber ist auch standardmäßig auf sehr vernünftige Einstellungen (sowohl in Bezug auf Sicherheit als auch Features) gesetzt. So ist es sofort einfach zu benutzen. Es ermöglicht eine webbasierte Verwaltung mit TOTP 2FA-Unterstützung, sowie die Eingabe deines öffentlichen PGP-Schlüssels um **alle** eingehenden Nachrichten zu verschlüsseln.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Dokumentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Quellcode" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Unterstützen" }
-
-
-
-Die [PGP-Implementierung](https://stalw.art/docs/encryption/overview) von Stalwart ist einzigartig unter den von uns empfohlenen selbst gehosteten Lösungen und ermöglicht den Betrieb deines eigenen Mailservers mit Zero-Knowledge-Nachrichtenspeicherung. Wenn du zusätzlich Web Key Directory auf deiner Domain konfigurierst und einen E-Mail-Client verwendest, der PGP und Web Key Directory für ausgehende E-Mails unterstützt (wie Thunderbird), dann ist dies der einfachste Weg, um selbst gehostete E2EE-Kompatibilität mit allen [Proton Mail-Benutzern](#proton-mail) zu erreichen.
-
-Stalwart verfügt **nicht** über integriertes Webmail, sodass du es mit einem [speziellen E-Mail-Client](email-clients.md) verwenden musst (oder ein Open-Source-Webmail zum Selbsthosten finden, wie die Mail-App von Nextcloud). Wir verwenden Stalwart für unsere eigenen internen E-Mails hier bei *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** ist ein fortgeschrittener Mailserver, perfekt für diejenigen mit ein wenig mehr Linux-Erfahrung. Es vereinigt alles, was du brauchst in einem Docker-Container: Einen Mailserver mit DKIM-Unterstützung, Virenschutz und Spam-Überwachung, Webmail und ActiveSync mit SOGo, sowie eine webbasierte Verwaltung mit 2FA-Unterstützung.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Dokumentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Quellcode" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Mitwirken" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** ist ein automatisches Setup-Skript für die Einrichtung eines Mailservers unter Ubuntu. Sein Ziel ist es, die Einrichtung eines eigenen Mailservers zu erleichtern.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Dokumentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Quellcode" }
-
-
-
## Kriterien
**Bitte beachte, dass wir mit keinem der von uns empfohlenen Anbieter verbunden sind.** Zusätzlich zu [unseren Standardkriterien](about/criteria.md)haben wir eine Reihe klarer Anforderungen für jeden E-Mail-Anbieter entwickelt, der empfohlen werden möchte, darunter die Umsetzung branchenweit bewährter Verfahren, moderne Technologien und weiteres. Wir empfehlen, sich mit dieser Liste vertraut zu machen, bevor du dich für einen E-Mail-Anbieter entscheidest, und deine eigenen Nachforschungen anzustellst, um sicherzustellen, dass der gewählte E-Mail-Anbieter die richtige Wahl für dich ist.
diff --git a/i18n/de/self-hosting/email-servers.md b/i18n/de/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/de/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/de/self-hosting/index.md b/i18n/de/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/de/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/de/tools.md b/i18n/de/tools.md
index 2fa38d57..c4790351 100644
--- a/i18n/de/tools.md
+++ b/i18n/de/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/el/email.md b/i18n/el/email.md
index 249d9c05..752e36d7 100644
--- a/i18n/el/email.md
+++ b/i18n/el/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/el/self-hosting/email-servers.md b/i18n/el/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/el/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/el/self-hosting/index.md b/i18n/el/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/el/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/el/tools.md b/i18n/el/tools.md
index 105be7f5..183569e9 100644
--- a/i18n/el/tools.md
+++ b/i18n/el/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/eo/email.md b/i18n/eo/email.md
index 8700ecbc..c2ff5112 100644
--- a/i18n/eo/email.md
+++ b/i18n/eo/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/eo/self-hosting/email-servers.md b/i18n/eo/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/eo/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/eo/self-hosting/index.md b/i18n/eo/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/eo/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/eo/tools.md b/i18n/eo/tools.md
index 326613a4..ced3968d 100644
--- a/i18n/eo/tools.md
+++ b/i18n/eo/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/es/email.md b/i18n/es/email.md
index 7ec8c461..fbe0650d 100644
--- a/i18n/es/email.md
+++ b/i18n/es/email.md
@@ -254,61 +254,6 @@ Tuta [elimina las cuentas gratuitas inactivas](https://tuta.com/support#inactive
Tuta ofrece una versión empresarial para [organizaciones sin fines de lucro](https://tuta.com/blog/secure-email-for-non-profit) de manera gratuita o con un importante descuento.
-## Correo de auto-alojamiento
-
-Los administradores de sistemas avanzados pueden plantearse crear su propio servidor de correo electrónico. Los servidores de correo requieren atención y un mantenimiento continuo para mantener la seguridad y la fiabilidad de la entrega del correo. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Configuración de un servidor de correo con OpenSMTPD, Dovecot y Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** es un servidor de correo más avanzado perfecto para aquellos con un poco más de experiencia en Linux. Tiene todo lo que necesitas en un contenedor Docker: un servidor de correo con soporte DKIM, antivirus y monitorización de spam, webmail y ActiveSync con SOGo, y administración basada en web con soporte 2FA.
-
-[:octicons-home-16: Página Principal](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentación" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Código Fuente" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribuir" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** es un script de configuración automatizada para desplegar un servidor de correo en Ubuntu. Su objetivo es facilitar a los usuarios la instalación de su propio servidor de correo.
-
-[:octicons-home-16: Página Principal](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentación" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Código Fuente" }
-
-
-
## Criterios
**Por favor, ten en cuenta que no estamos afiliados con ninguno de los proveedores que recomendamos.** Además de [nuestros criterios estándar](about/criteria.md), hemos desarrollado un claro conjunto de requisitos para cualquier proveedor de correo electrónico que desee ser recomendado, incluyendo la implementación de las mejores prácticas de la industria, tecnología moderna y más. Sugerimos que te familiarices con esta lista antes de elegir un proveedor de correo electrónico, y que realices tu propia investigación para asegurarte de que el proveedor de correo electrónico que elijas sea la opción adecuada para ti.
diff --git a/i18n/es/self-hosting/email-servers.md b/i18n/es/self-hosting/email-servers.md
new file mode 100644
index 00000000..07d27c7f
--- /dev/null
+++ b/i18n/es/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protege contra la(s) siguiente(s) amenaza(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/es/self-hosting/index.md b/i18n/es/self-hosting/index.md
new file mode 100644
index 00000000..b3b641cb
--- /dev/null
+++ b/i18n/es/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protege contra la(s) siguiente(s) amenaza(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. Debes tener cuidado con dónde y cómo alojas, ya que el uso de otras personas estará vinculado a tu alojamiento.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/es/tools.md b/i18n/es/tools.md
index f5105820..9e66616c 100644
--- a/i18n/es/tools.md
+++ b/i18n/es/tools.md
@@ -9,7 +9,29 @@ description: Una lista completa de herramientas, servicios, software y hardware
Si está buscando una solución específica para algo, estas son las herramientas de hardware y software que recomendamos en una variedad de categorías. Nuestras herramientas de privacidad recomendadas se eligen principalmente en función de sus características de seguridad, con un énfasis adicional en las herramientas descentralizadas y de código abierto. Son aplicables a una variedad de modelos de amenazas que van desde la protección contra los programas de vigilancia masiva global y la evasión de las grandes empresas tecnológicas hasta la mitigación de ataques, pero solo usted puede determinar lo que funcionará mejor según sus necesidades.
-[Proveedores de VPN](vpn.md ""){.md-button} [Administradores de Contraseñas](passwords.md ""){.md-button} [Proveedores de Correo Electrónico](email.md ""){.md-button} [Extensiones de Navegador](browser-extensions.md ""){.md-button} [Servidores DNS](dns.md ""){.md-button} [Servicios de Alias de Correo Electrónico](email-aliasing.md ""){.md-button} [Herramientas de Organización de Fotografías](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Autoalojamiento de Correo Electrónico
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -481,9 +492,9 @@ Para cifrar su unidad de SO, normalmente recomendamos utilizar la herramienta de
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/fa/email.md b/i18n/fa/email.md
index 7645fd87..1d862404 100644
--- a/i18n/fa/email.md
+++ b/i18n/fa/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## خودمیزبانی ایمیل (Self-Hosting)
-
-ادمینهای سیستم پیشرفته ممکن است راه اندازی سرور ایمیل خود را در نظر بگیرند. سرورهای ایمیل برای ایمن نگه داشتن چیزها و قابل اعتماد بودن تحویل ایمیل نیاز به توجه و نگهداری مداوم دارند. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
- **Mailcow** سرور ایمیل پیشرفتهتری است که برای کسانی که تجربه لینوکس به نسبت بالایی دارند عالی است. 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** یک اسکریپت تنظیم خودکار برای پیادهسازی یک سرور ایمیل در اوبونتو است. هدف آن این است که راه اندازی سرور ایمیل شخصی را برای افراد آسانتر کند.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## معیار
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/fa/self-hosting/email-servers.md b/i18n/fa/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/fa/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/fa/self-hosting/index.md b/i18n/fa/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/fa/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/fa/tools.md b/i18n/fa/tools.md
index 5af3e4c5..0de599d7 100644
--- a/i18n/fa/tools.md
+++ b/i18n/fa/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/fr/email.md b/i18n/fr/email.md
index de82d2c9..da714667 100644
--- a/i18n/fr/email.md
+++ b/i18n/fr/email.md
@@ -254,61 +254,6 @@ Tuta supprimera [les comptes gratuits inactifs](https://tuta.com/support#inactiv
Tuta offre la version professionnelle de [Tuta aux organisations à but non lucratif](https://tuta.com/blog/secure-email-for-non-profit) gratuitement ou avec une forte réduction.
-## E-mail auto-hébergé
-
-Les administrateurs système peuvent envisager de mettre en place leur propre serveur d'e-mail. Les serveurs d'e-mail requièrent une attention et une maintenance permanente afin de garantir la sécurité et la fiabilité de la distribution des e-mails. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Mise en place d'un serveur mail avec OpenSMTPD, Dovecot et Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** est un serveur d'e-mail plus avancé, parfait pour ceux qui ont un peu plus d'expérience de Linux. 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** est un script de configuration automatisé pour le déploiement d'un serveur d'e-mail sur Ubuntu. Son objectif est de faciliter la mise en place de son propre serveur d'e-mail.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Critères
**Veuillez noter que nous ne sommes affiliés à aucun des fournisseurs que nous recommandons.** En plus de [nos critères de base](about/criteria.md), nous avons développé un ensemble d'exigences claires pour tout fournisseur d'e-mail souhaitant être recommandé, y compris la mise en place des bonnes pratiques du secteur, une technologie moderne et bien plus. Nous vous suggérons de vous familiariser avec cette liste avant de choisir un fournisseur d'e-mail, et de mener vos propres recherches pour vous assurer que le fournisseur d'e-mail que vous choisissez est le bon choix pour vous.
diff --git a/i18n/fr/self-hosting/email-servers.md b/i18n/fr/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/fr/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/fr/self-hosting/index.md b/i18n/fr/self-hosting/index.md
new file mode 100644
index 00000000..91958cb0
--- /dev/null
+++ b/i18n/fr/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. Vous devriez faire attention à l'endroit et à la manière dont vous hébergez, car l'utilisation par d'autres personnes sera liée à votre hébergement.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/fr/tools.md b/i18n/fr/tools.md
index 8121cffc..a607aba3 100644
--- a/i18n/fr/tools.md
+++ b/i18n/fr/tools.md
@@ -9,7 +9,29 @@ description: Liste complète des outils, services, logiciels et matériels de pr
Si vous cherchez une solution spécifique à un problème, voici pour diverses catégories les outils matériels et logiciels que nous vous recommandons. Les outils de protection de la vie privée que nous recommandons sont principalement choisis pour leurs fonctionnalités de sécurité, avec une attention particulière pour les outils décentralisés et open source. Ils sont adaptés à divers modèles menaces, que vous cherchiez à vous protéger contre les programmes de surveillance de masse mondiaux et à éviter les grandes entreprises du numérique, voire à mitiger les attaques. Toutefois, vous seul êtes en mesure de déterminer ce qui répondra le mieux à vos besoins.
-[Fournisseurs de VPN](vpn.md ""){.md-button} [Gestionnaires de mots de passe](passwords.md ""){.md-button} [Fournisseurs d'e-mail](email.md ""){.md-button} [Extensions de navigateur](browser-extensions.md ""){.md-button} [Serveurs DNS](dns.md ""){.md-button} [Services d'alias d'e-mail](email-aliasing.md ""){.md-button} [Outils d'organisation de photos](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -474,9 +485,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/he/email.md b/i18n/he/email.md
index 0807151c..54093db0 100644
--- a/i18n/he/email.md
+++ b/i18n/he/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## אימייל לאירוח עצמי
-
-מנהלי מערכת מתקדמים עשויים לשקול הגדרת שרת דואר אלקטרוני משלהם. שרתי דואר דורשים תשומת לב ותחזוקה שוטפת על מנת לשמור על דברים מאובטחים ועל משלוח דואר אמין. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** הוא שרת דואר מתקדם יותר המושלם עבור אלה עם קצת יותר ניסיון בלינוקס. 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** הוא סקריפט התקנה אוטומטי לפריסת שרת דואר באובונטו. מטרתו היא להקל על אנשים להגדיר שרת דואר משלהם.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## קריטריונים
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/he/self-hosting/email-servers.md b/i18n/he/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/he/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/he/self-hosting/index.md b/i18n/he/self-hosting/index.md
new file mode 100644
index 00000000..e9e44adc
--- /dev/null
+++ b/i18n/he/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. אתה צריך להיות זהיר עם היכן וכיצד אתה מארח, מכיוון שהשימוש של אנשים אחרים יהיה מקושר לאירוח שלך.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/he/tools.md b/i18n/he/tools.md
index 596eea4e..fe5b09e3 100644
--- a/i18n/he/tools.md
+++ b/i18n/he/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
אם אתם מחפשים פתרון ספציפי למשהו, אלו הם כלי החומרה והתוכנה שאנו ממליצים עליהם במגוון קטגוריות. כלי הפרטיות המומלצים שלנו נבחרים בעיקר על סמך תכונות אבטחה, עם דגש נוסף על כלים מבוזרים וקוד פתוח. הם ישימים למגוון מודלים של איומים, החל מהגנה מפני תוכניות מעקב המוני גלובליות והימנעות מחברות טכנולוגיה גדולות ועד למיתון התקפות, אבל רק אתה יכול לקבוע מה יעבוד הכי טוב עבור הצרכים שלך.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/hi/email.md b/i18n/hi/email.md
index ae8b4023..84dfe7b0 100644
--- a/i18n/hi/email.md
+++ b/i18n/hi/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/hi/self-hosting/email-servers.md b/i18n/hi/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/hi/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/hi/self-hosting/index.md b/i18n/hi/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/hi/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/hi/tools.md b/i18n/hi/tools.md
index 326613a4..ced3968d 100644
--- a/i18n/hi/tools.md
+++ b/i18n/hi/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/hu/email.md b/i18n/hu/email.md
index f0049ca2..29f85352 100644
--- a/i18n/hu/email.md
+++ b/i18n/hu/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Saját üzemeltetésű email
-
-A haladó rendszergazdák fontolóra vehetik saját e-mail szerver felállítását. A levelezőszerverek figyelmet és folyamatos karbantartást igényelnek a biztonság és a megbízható levélkézbesítés fenntartása érdekében. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Levelezőszerver beállítása OpenSMTPD, Dovecot és Rspamd segítségével](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-A **Mailcow** egy fejlettebb levelezőszerver, amely tökéletes azok számára, akik kicsit több Linux-tapasztalattal rendelkeznek. 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-A **Mail-in-a-Box** egy automatizált beállítási szkript egy levelezőszerver telepítéséhez Ubuntun. Célja, hogy megkönnyítse az emberek számára saját levelezőszerverük beállítását.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Követelmények
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/hu/self-hosting/email-servers.md b/i18n/hu/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/hu/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/hu/self-hosting/index.md b/i18n/hu/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/hu/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/hu/tools.md b/i18n/hu/tools.md
index f863dfe5..76b19dbf 100644
--- a/i18n/hu/tools.md
+++ b/i18n/hu/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
Ha valamilyen konkrét megoldást keresel, ezek a hardver- és szoftvereszközök amiket ajánlunk, különböző kategóriákban. Az általunk ajánlott adatvédelmi eszközöket elsősorban biztonsági funkciók alapján választottuk ki, további hangsúlyt fektetve a decentralizált és nyílt forráskódú eszközökre. Ezek számos védelmi modellre alkalmazhatók, globális tömeges megfigyelési programok elleni védelemtől kezdve, big tech cégek elkerüléstől, támadások enyhítéséig, de csak te tudod meghatározni, hogy a te igényeidek mi felel meg a legjobban.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/id/email.md b/i18n/id/email.md
index 20e2eb98..8290353b 100644
--- a/i18n/id/email.md
+++ b/i18n/id/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Email Hosting Mandiri
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Kriteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/id/self-hosting/email-servers.md b/i18n/id/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/id/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/id/self-hosting/index.md b/i18n/id/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/id/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/id/tools.md b/i18n/id/tools.md
index 235f85fa..8ce238c9 100644
--- a/i18n/id/tools.md
+++ b/i18n/id/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
Jika Anda mencari solusi spesifik untuk sesuatu, berikut ini adalah perangkat keras dan perangkat lunak yang kami rekomendasikan dalam berbagai kategori. Perangkat privasi yang kami rekomendasikan terutama dipilih berdasarkan fitur keamanan, dengan penekanan tambahan pada perangkat yang terdesentralisasi dan bersumber terbuka. Mereka dapat diterapkan pada berbagai model ancaman mulai dari perlindungan terhadap program pengawasan massal global dan menghindari perusahaan teknologi besar hingga memitigasi serangan, tetapi hanya Anda yang dapat menentukan mana yang paling sesuai dengan kebutuhan Anda.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/it/email.md b/i18n/it/email.md
index e0aa7ca0..f6265979 100644
--- a/i18n/it/email.md
+++ b/i18n/it/email.md
@@ -254,61 +254,6 @@ Tuta cancellerà gli [account gratuiti](https://tuta.com/support#inactive-accou
Tuta offre la versione business di [Tuta alle organizzazioni non profit](https://tuta.com/blog/secure-email-for-non-profit) gratuitamente o con un enorme sconto.
-## Auto-Hosting Email
-
-Gli amministratori di sistema avanzati potrebbero considerare la configurazione del proprio server email. I server email richiedono attenzione e manutenzione continua, per mantenere tutto in sicurezza e la consegna delle email affidabile. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Configurazione di un server di posta con OpenSMTPD, Dovecot e Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** è un server email più avanzato, perfetto per chi ha un po' più d'esperienza con Linux. 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** è uno script di configurazione automatica per la distribuzione di un server email su Ubuntu. Il suo obiettivo è semplificare la configurazione del proprio server email alle persone.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteri
**Si noti che non siamo affiliati a nessuno dei provider che raccomandiamo.** Oltre ai [nostri criteri standard](about/criteria.md), abbiamo sviluppato una serie di requisiti chiari per qualsiasi provider di posta elettronica che desideri essere raccomandato, tra cui l'implementazione delle migliori pratiche del settore, tecnologia moderna e altro ancora. Vi suggeriamo di familiarizzare con questo elenco prima di scegliere un provider di posta elettronica e di condurre le vostre ricerche per assicurarvi che il provider scelto sia la scelta giusta per voi.
diff --git a/i18n/it/self-hosting/email-servers.md b/i18n/it/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/it/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/it/self-hosting/index.md b/i18n/it/self-hosting/index.md
new file mode 100644
index 00000000..4b677392
--- /dev/null
+++ b/i18n/it/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. Dovresti stare attento a dove e come ospiti, poiché l'utilizzo di altre persone sarà collegato al tuo hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/it/tools.md b/i18n/it/tools.md
index cbfe0d2f..11db9246 100644
--- a/i18n/it/tools.md
+++ b/i18n/it/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
Se stai cercando una soluzione specifica per qualcosa, ecco gli strumenti hardware e software che consigliamo, in svariate categorie. I nostri strumenti per la privacy consigliati, sono scelti principalmente secondo le funzionalità di sicurezza, con maggiore enfasi sugli strumenti decentralizzati e open source. Sono applicabili a svariati modelli di minaccia, dalla protezione dai programmi di sorveglianza di massa e l'evitare le grandi società inserzionistiche, alla mitigazione degli attacchi; tuttavia, soltanto tu puoi determinare cosa funzionerà meglio per le tue esigenze.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/ja/email.md b/i18n/ja/email.md
index 8ec04c2f..331b622d 100644
--- a/i18n/ja/email.md
+++ b/i18n/ja/email.md
@@ -254,61 +254,6 @@ Tutaは6ヶ月間[アクティブではないフリープランのアカウン
Tutaは[非営利団体](https://tuta.com/blog/secure-email-for-non-profit)向けに無料もしくは大幅な割引価格でビジネス版Tutaを提供しています。
-## セルフホストメール
-
-システム管理に詳しいのであれば、自前のメールサーバーの構築を検討することも一つの手段です。 安全性とメール配信の信頼性を維持するには、メールサーバーへの注意と継続的なメンテンナンスが必要になります。 以下の「オールインワン」な方法に加え、手動で設定するための記事を取り上げました：
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019年)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (2017年8月)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**Stalwart**はRustで書かれた新しいメールサーバーで、標準的なIMAP、POP3やSMTPに加え、JMAPにも対応しています。 様々な設定は用意されていますが、デフォルトでも（セキュリティと機能の両方で）適切な設定となっているため、すぐに使い始めることができます。 TOTP二要素認証に対応するウェブベースの管理機能があり、PGP公開鍵で**すべての**受信メッセージを暗号化することができます。
-
-[:octicons-home-16: ウェブページ](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="ドキュメント" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="ソースコード" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwartの[PGP実装](https://stalw.art/docs/encryption/overview)は推奨するセルフホスティングEメールの中でもユニークで、前提知識なしにメッセージストレージのある自前のメールサーバーを運用することができます。 独自ドメインにWeb Key Directoryを設定し、送信メールがPGPとWeb Key Directoryに対応したクライアント（Thunderbirdなど）を使うことで、すべての[Proton Mail](#proton-mail)に対応するセルフホスティングE2EE互換性を最も簡単に得ることができます。
-
-Stalwartにはウェブメールが**ない**ため、[専用のEメールクライアント](email-clients.md)（もしくはNextCloudのメールアプリのようなオープンソースのウェブメールをセルフホスティングする）を使う必要があります。 *Privacy Guides*ではStalwartを内部のEメールサーバーで使用しています。
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** はLinuxの経験がある方に最適な、より高度なメールサーバーです。 DKIMに対応したメールサーバー、アンチウイルスやスパム監視、SOGoによるウェブメールとActiveSync、二要素認証に対応したウェブベースの管理機能など、Dockerコンテナに必要なものがすべて含まれています。
-
-[:octicons-home-16: ウェブページ](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="ドキュメント" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="ソースコード" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** はUbuntu上にメールサーバーをデプロイするための自動セットアップスクリプトです。 自前のメールサーバーを簡単に立ち上げることを目的としています。
-
-[:octicons-home-16: ウェブページ](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="ドキュメント" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="ソースコード" }
-
-
-
## 規準
**推奨するプロバイダーとは提携していないことに注意してください。**[標準的な基準](about/criteria.md)に加え、業界におけるベストプラクティスの実施や新しい技術の採用などを含む、推奨するために必要なEメールプロバイダーへの明確な要件を定めています。 Eメールプロバイダーを選ぶ前に以下のリストを理解し、どのEメールプロバイダーが適切であるかを調べ、確認してください。
diff --git a/i18n/ja/self-hosting/email-servers.md b/i18n/ja/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/ja/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/ja/self-hosting/index.md b/i18n/ja/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/ja/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/ja/tools.md b/i18n/ja/tools.md
index 0b0b75d1..7d8a7271 100644
--- a/i18n/ja/tools.md
+++ b/i18n/ja/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
何か特定のソリューションをお探しなら、様々なカテゴリーでおすすめのハードウェアとソフトウェアのツールをご紹介します。 私たちがおすすめするプライバシーツールは、主にセキュリティ機能に基づいて選択されており、さらに分散型やオープンソースのツールに重点を置いています。 これらは、世界的な大規模監視プログラムからの保護や大手ハイテク企業の回避から攻撃の緩和まで、さまざまな脅威モデルに適用できます。しかし、あなただけがあなたのニーズに最適であるかを判断できます。
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/ko/email.md b/i18n/ko/email.md
index a4d6d1a9..94efc080 100644
--- a/i18n/ko/email.md
+++ b/i18n/ko/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## 자체 호스팅 이메일
-
-고급 시스템 관리자는 자체 이메일 서버를 구축하는 것도 고려할 수 있습니다. 메일 서버는 보안과 메일 전달 역할을 신뢰성 있고 안정적으로 유지하기 위해 지속적인 주의 및 유지 관리가 필요합니다. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow**는 Linux 사용 경험이 많은 분에게 적합한 고급 메일 서버입니다. 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box**는 Ubuntu 위에 메일 서버를 배포하는 자동화 설정 스크립트입니다. 사람들이 자신만의 메일 서버를 쉽게 구축할 수 있도록 만드는 것을 목표로 하는 프로젝트입니다.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## 평가 기준
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/ko/self-hosting/email-servers.md b/i18n/ko/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/ko/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/ko/self-hosting/index.md b/i18n/ko/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/ko/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/ko/tools.md b/i18n/ko/tools.md
index bbe7fc20..53cd5e10 100644
--- a/i18n/ko/tools.md
+++ b/i18n/ko/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/ku-IQ/email.md b/i18n/ku-IQ/email.md
index df8f7b08..1a7ca733 100644
--- a/i18n/ku-IQ/email.md
+++ b/i18n/ku-IQ/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/ku-IQ/self-hosting/email-servers.md b/i18n/ku-IQ/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/ku-IQ/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/ku-IQ/self-hosting/index.md b/i18n/ku-IQ/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/ku-IQ/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/ku-IQ/tools.md b/i18n/ku-IQ/tools.md
index 9181196a..909641f3 100644
--- a/i18n/ku-IQ/tools.md
+++ b/i18n/ku-IQ/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/nl/email.md b/i18n/nl/email.md
index 927080dd..1be3a13c 100644
--- a/i18n/nl/email.md
+++ b/i18n/nl/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Onze criteria
-
-Gevorderde systeembeheerders kunnen overwegen hun eigen e-mailserver op te zetten. Mailservers vereisen aandacht en voortdurend onderhoud om de zaken veilig te houden en de mailbezorging betrouwbaar. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is een meer geavanceerde mailserver, perfect voor mensen met wat meer Linux ervaring. 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** is een geautomatiseerd setup script voor het implementeren van een mailserver op Ubuntu. Het doel ervan is om het voor mensen gemakkelijker te maken om hun eigen mailserver op te zetten.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/nl/self-hosting/email-servers.md b/i18n/nl/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/nl/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/nl/self-hosting/index.md b/i18n/nl/self-hosting/index.md
new file mode 100644
index 00000000..8f357923
--- /dev/null
+++ b/i18n/nl/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. Je moet voorzichtig zijn met waar en hoe je host, omdat het gebruik van andere mensen zal worden gekoppeld aan jouw hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/nl/tools.md b/i18n/nl/tools.md
index e845207e..b682fee1 100644
--- a/i18n/nl/tools.md
+++ b/i18n/nl/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
Als je op zoek bent naar een specifieke oplossing voor iets, dan zijn dit de hardware en software tools die wij aanbevelen in verschillende categorieën. Onze aanbevolen privacytools zijn in de eerste plaats gekozen op basis van beveiligingskenmerken, met extra nadruk op gedecentraliseerde en open-source tools. Ze zijn van toepassing op een verscheidenheid aan dreigingsmodellen, variërend van bescherming tegen wereldwijde massasurveillanceprogramma's en het vermijden van grote technologiebedrijven tot het beperken van aanvallen, maar alleen jij kunt bepalen wat het beste werkt voor jouw behoeften.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/pl/email.md b/i18n/pl/email.md
index 475caab8..446d3a55 100644
--- a/i18n/pl/email.md
+++ b/i18n/pl/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/pl/self-hosting/email-servers.md b/i18n/pl/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/pl/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/pl/self-hosting/index.md b/i18n/pl/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/pl/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/pl/tools.md b/i18n/pl/tools.md
index c3ef0a39..60006084 100644
--- a/i18n/pl/tools.md
+++ b/i18n/pl/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
Jeśli szukasz konkretnego rozwiązania, oto polecane przez nas narzędzia oraz oprogramowanie w różnych kategoriach. Polecane przez nas narzędzia zostały wybrane głównie na podstawie funkcji zabezpieczeń z dodatkowym naciskiem na te o zdecentralizowane i o otwartym kodzie żródłowym. 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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/pt-BR/email.md b/i18n/pt-BR/email.md
index a6d68f7c..0845cacd 100644
--- a/i18n/pt-BR/email.md
+++ b/i18n/pt-BR/email.md
@@ -254,61 +254,6 @@ A Tuta excluirá [as contas gratuitas inativas](https://tuta.com/support#inactiv
Tuta oferece a versão comercial do [Tuta para organizações sem fins lucrativos](https://tuta.com/blog/secure-email-for-non-profit) de graça ou com desconto.
-## Email Auto-Hospedado
-
-Administratores de sistema avançados podem considerar a possibilidade de configurar seu próprio servidor de e-mail. Os servidores de e-mail exigem atenção e manutenção contínua para manter a segurança e a confiabilidade da entrega de e-mails. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Configuração de um servidor de correio eletrônico com OpenSMTPD, Dovecot e Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** é um servidor de correio mais avançado, perfeito para aqueles com mais experiência no Linux. Ele tem tudo o que você precisa em um contêiner Docker: um servidor de e-mail com suporte a DKIM, antivírus e monitoramento de spam, webmail e ActiveSync com SOGo, e administração baseada na web com suporte a 2FA.
-
-[:octicons-home-16: Página inicial](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentação" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Código fonte" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribuir" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** é um script de configuração automatizado para implementar um servidor de correio no Ubuntu. Seu objetivo é facilitar a configuração de seu próprio servidor de e-mail.
-
-[:octicons-home-16: Página inicial](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentação" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Código fonte" }
-
-
-
## Requisitos
**Por favor, note que não somos afiliados a nenhum dos provedores que recomendamos.** Além de [nosso critério básico](about/criteria.md), desenvolvemos um conjunto claro de requisitos para qualquer provedor de e-mail que queira ser mencionado, incluindo a implementação de melhores práticas do setor, tecnologia moderna e muito mais. Sugerimos que você se familiarize com esta lista antes de escolher um provedor de e-mail e faça sua própria pesquisa para garantir que o provedor de e-mail escolhido seja a opção certa para você.
diff --git a/i18n/pt-BR/self-hosting/email-servers.md b/i18n/pt-BR/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/pt-BR/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/pt-BR/self-hosting/index.md b/i18n/pt-BR/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/pt-BR/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/pt-BR/tools.md b/i18n/pt-BR/tools.md
index 2afbdddc..e6277c9c 100644
--- a/i18n/pt-BR/tools.md
+++ b/i18n/pt-BR/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
Se você está procurando uma solução específica para algo, estas são as ferramentas de hardware e software que recomendamos em uma variedade de categorias. Nossas ferramentas de privacidade recomendadas são principalmente escolhidas com base em recursos de segurança, com ênfase adicional em ferramentas descentralizadas e de código aberto. São aplicáveis a uma variedade de modelos de ameaça que vão desde a proteção contra programas globais de vigilância em massa e evitar grandes empresas de tecnologia, até à atenuação de ataques, mas só você pode determinar o que funcionará melhor para as suas necessidades.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/pt/email.md b/i18n/pt/email.md
index fb42ae21..47709166 100644
--- a/i18n/pt/email.md
+++ b/i18n/pt/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## E-mail auto-hospedado
-
-Os administradores de sistemas avançados podem considerar a possibilidade de configurar o seu próprio servidor de e-mail. Os servidores de e-mail requerem atenção e manutenção contínua para se manterem seguros e para que a entrega de e-mail seja fiável. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** é um servidor de e-mail mais avançado, perfeito para quem tem um pouco mais de experiência em Linux. 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** é um script de configuração automatizado para implementar um servidor de e-mail no Ubuntu. O seu objetivo é facilitar a criação do seu próprio servidor de e-mail.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Critérios
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/pt/self-hosting/email-servers.md b/i18n/pt/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/pt/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/pt/self-hosting/index.md b/i18n/pt/self-hosting/index.md
new file mode 100644
index 00000000..9d3855ee
--- /dev/null
+++ b/i18n/pt/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. Deve ter cuidado com o local e a forma como aloja, uma vez que a utilização por outras pessoas estará associada ao seu alojamento.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/pt/tools.md b/i18n/pt/tools.md
index 25d6272a..81abda31 100644
--- a/i18n/pt/tools.md
+++ b/i18n/pt/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
Se estiver à procura de uma solução específica para algo, estas são as ferramentas de hardware e software que recomendamos, numa variedade de categorias. As nossas ferramentas de privacidade recomendadas são escolhidas principalmente com base em características de segurança, com ênfase adicional em ferramentas descentralizadas e de código aberto. São aplicáveis a uma variedade de modelos de ameaças, desde a proteção contra programas globais de vigilância em massa efetuada por grandes empresas tecnológicas até à atenuação de ataques, mas só o utilizador poderá determinar o que melhor se adequa às suas necessidades.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/ru/email.md b/i18n/ru/email.md
index 5fcfc70a..ac34c85e 100644
--- a/i18n/ru/email.md
+++ b/i18n/ru/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Электронная почта для самостоятельного хостинга
-
-Продвинутые системные администраторы могут рассмотреть возможность создания собственного сервера электронной почты. Почтовые серверы требуют внимания и постоянного обслуживания, чтобы поддерживать безопасность и надежность доставки почты. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** - это более продвинутый почтовый сервер, идеально подходящий для тех, у кого есть опыт работы с Linux. 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** - это скрипт автоматической настройки для запуска почтового сервера на Ubuntu. Его цель - облегчить людям создание собственного почтового сервера.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Критерии
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/ru/self-hosting/email-servers.md b/i18n/ru/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/ru/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/ru/self-hosting/index.md b/i18n/ru/self-hosting/index.md
new file mode 100644
index 00000000..8f63eaaa
--- /dev/null
+++ b/i18n/ru/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. Вы должны быть осторожны с тем, где и как вы размещаете хостинг, поскольку активность других людей будет связана с вашим хостингом.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/ru/tools.md b/i18n/ru/tools.md
index 8283340c..2c4b4728 100644
--- a/i18n/ru/tools.md
+++ b/i18n/ru/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
Если вы ищете какое-либо решение, то в этом списке все аппаратные и программные средства, которые мы рекомендуем. Рекомендуемые инструменты для обеспечения приватности/конфиденциальности выбираются в первую очередь на основе функций безопасности с дополнительным акцентом на децентрализованные инструменты с открытым исходным кодом. Эти инструменты можно использовать с различными моделями угроз: например, для защиты от массовой слежки или избегания big-tech компаний, — но только вы сможете определить, что необходимо именно в вашем случае.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/sv/email.md b/i18n/sv/email.md
index c98c48ca..e26afaaf 100644
--- a/i18n/sv/email.md
+++ b/i18n/sv/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Självhanterande e-post
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Kriterier
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/sv/self-hosting/email-servers.md b/i18n/sv/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/sv/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/sv/self-hosting/index.md b/i18n/sv/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/sv/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/sv/tools.md b/i18n/sv/tools.md
index d2628b12..6a0d5f90 100644
--- a/i18n/sv/tools.md
+++ b/i18n/sv/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
Om du letar efter en specifik lösning på något är det här hård- och mjukvaruverktyg som vi rekommenderar i olika kategorier. Våra rekommenderade verktyg för integritetsskydd är i första hand valda utifrån säkerhetsfunktioner, med ytterligare betoning på decentraliserade verktyg och verktyg med öppen källkod. De kan tillämpas på en mängd olika hotmodeller, från skydd mot globala massövervakningsprogram och undvikande av stora teknikföretag till begränsning av attacker, men det är bara du som kan avgöra vad som fungerar bäst för dina behov.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/tr/email.md b/i18n/tr/email.md
index ebd9d558..cba66edc 100644
--- a/i18n/tr/email.md
+++ b/i18n/tr/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Kriter
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/tr/self-hosting/email-servers.md b/i18n/tr/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/tr/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/tr/self-hosting/index.md b/i18n/tr/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/tr/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/tr/tools.md b/i18n/tr/tools.md
index c92d67a0..cf882cb4 100644
--- a/i18n/tr/tools.md
+++ b/i18n/tr/tools.md
@@ -9,7 +9,29 @@ description: Privacy Guides topluluğu tarafından önerilen gizlilik araçları
Bir konuda belirli bir çözüm arıyorsanız, çeşitli kategorilerde önerdiğimiz donanım ve yazılım araçları bunlardır. Tavsiye edilen gizlilik araçlarımız öncelikle güvenlik özelliklerine göre seçilmiş olup, merkezi olmayan ve açık kaynaklı araçlara ek vurgu yapılmaktadır. Bunlar, küresel kitlesel gözetleme programlarına karşı korunmadan büyük teknoloji şirketlerinden kaçınmaya ve saldırıları hafifletmeye kadar çeşitli tehdit modellerine uygulanabilir, ancak ihtiyaçlarınız için neyin en iyi sonucu vereceğini yalnızca siz belirleyebilirsiniz.
-[VPN Sağlayıcıları](vpn.md ""){.md-button} [Parola Yöneticileri](passwords.md ""){.md-button} [E-posta Sağlayıcıları](email.md ""){.md-button} [Tarayıcı Uzantıları](browser-extensions.md ""){.md-button} [DNS Sunucuları](dns.md ""){.md-button} [E-posta Takma Adlandırma Hizmetleri](email-aliasing.md ""){.md-button} [Fotoğraf Düzenleme Araçları](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Kendi Kendini Barındıran E-posta
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -476,9 +487,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/uk/email.md b/i18n/uk/email.md
index 0a0197a9..7a326e69 100644
--- a/i18n/uk/email.md
+++ b/i18n/uk/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Самостійний хостинг електронної пошти
-
-Досвідчені системні адміністратори можуть розглянути можливість створення власного поштового сервера. Поштові сервери потребують уваги та постійного обслуговування, щоб забезпечити безпеку та надійність доставки пошти. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** — це більш просунутий поштовий сервер, який ідеально підходить для тих, хто має трохи більше досвіду роботи з Linux. 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** — це автоматизований скрипт для розгортання поштового сервера на Ubuntu. Його мета — полегшити людям створення власного поштового сервера.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Критерії
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/uk/self-hosting/email-servers.md b/i18n/uk/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/uk/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/uk/self-hosting/index.md b/i18n/uk/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/uk/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/uk/tools.md b/i18n/uk/tools.md
index dfa0f1e6..c9e971c0 100644
--- a/i18n/uk/tools.md
+++ b/i18n/uk/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/vi/email.md b/i18n/vi/email.md
index 65666220..9c0618b4 100644
--- a/i18n/vi/email.md
+++ b/i18n/vi/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Framadate
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/vi/self-hosting/email-servers.md b/i18n/vi/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/vi/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/vi/self-hosting/index.md b/i18n/vi/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/vi/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/vi/tools.md b/i18n/vi/tools.md
index a9554be7..00abe24d 100644
--- a/i18n/vi/tools.md
+++ b/i18n/vi/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/zh-Hant/email.md b/i18n/zh-Hant/email.md
index d00234dc..ba81cfcc 100644
--- a/i18n/zh-Hant/email.md
+++ b/i18n/zh-Hant/email.md
@@ -254,61 +254,6 @@ Tuta [刪除六個月未登入使用的免費帳戶](https://tuta.com/support#in
Tuta 向非營利組織提供免費 [商業版本](https://tuta.com/blog/secure-email-for-non-profit) 或大幅折扣。
-## 自主託管電子郵件
-
-進階系統管理員可以考慮設定自己的電子郵件伺服器。 郵件伺服器需要注意和持續維護，以確保安全性和郵件傳遞的可靠性。 In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [使用 OpenSMTPD、Dovecot 和 Rspamd 設定郵件伺服器](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (英文版網站，2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** 是一個更先進的郵件伺服器，非常適合有豐富 Linux 經驗者。 它在 Docker 容器中提供您所需的一切：支援 DKIM 的郵件伺服器、防毒與垃圾郵件監控、Webmail 與 SOGo 的 ActiveSync，以及支援 2FA 的網頁式管理。
-
-[:octicons-home-16: 首頁](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="說明文件" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="原始碼" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="貢獻" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align = right }
-
-**Mail-in-a-Box** 是部署 Ubuntu 郵件伺服器的自動設定腳本。 它的目標是讓人們更容易建立自己的郵件伺服器。
-
-[:octicons-home-16: 首頁](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="說明文件" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="原始碼" }
-
-
-
## 標準
**請注意，我們與以下推薦的任何供應商並無瓜葛。** 除了 [我們的條件標準](about/criteria.md)外，我們還為任何希望獲得推薦的電子郵件供應商制定了一套明確要求，包括實施業界最佳做法，現代技術等。 我們建議您在選擇電子郵件提供商之前熟悉此列表，並進行自己的研究，以確保您選擇的電子郵件提供商是您的正確選擇。
diff --git a/i18n/zh-Hant/self-hosting/email-servers.md b/i18n/zh-Hant/self-hosting/email-servers.md
new file mode 100644
index 00000000..014ac9b3
--- /dev/null
+++ b/i18n/zh-Hant/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+防護下列威脅：
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/zh-Hant/self-hosting/index.md b/i18n/zh-Hant/self-hosting/index.md
new file mode 100644
index 00000000..2c780cdf
--- /dev/null
+++ b/i18n/zh-Hant/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+防護下列威脅：
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** 是基於開放網路通訊協定和自由及開放原始碼軟體的社交網路。 It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. 您應該謹慎處理託管的地點和方式，因為其他人如何使用將會影響到您的託管。
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/zh-Hant/tools.md b/i18n/zh-Hant/tools.md
index ec25cd8a..0062c532 100644
--- a/i18n/zh-Hant/tools.md
+++ b/i18n/zh-Hant/tools.md
@@ -9,7 +9,29 @@ description: Privacy Guides 社群所推薦的隱私工具、服務、軟體及
如果您正在尋找特定的解決方案，這些是我們在各種類別中推薦的硬體和軟體工具。 我們推薦的隱私工具主要是基於安全功能而選擇的，並特別強調去中心化和開源工具。 它們適用於各種威脅模型，從防止全球大規模監控計劃，避免大型科技公司到減輕攻擊，但只有您才能確定哪些最適合您的需求。
-[VPN 供應商](vpn.md ""){.md-button} [密碼管理器](passwords.md ""){.md-button} [電子郵件供應商](email.md ""){.md-button} [瀏覽器擴充套件](browser-extensions.md ""){.md-button} [DNS 伺服器](dns.md ""){.md-button} [電子郵件別名服務](email-aliasing.md ""){.md-button} [照片管理工具](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### 自行託管電子郵件
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/i18n/zh/email.md b/i18n/zh/email.md
index 468b60e6..5047f2a5 100644
--- a/i18n/zh/email.md
+++ b/i18n/zh/email.md
@@ -254,61 +254,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**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 it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more 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.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**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.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/i18n/zh/self-hosting/email-servers.md b/i18n/zh/self-hosting/email-servers.md
new file mode 100644
index 00000000..60c99e07
--- /dev/null
+++ b/i18n/zh/self-hosting/email-servers.md
@@ -0,0 +1,66 @@
+---
+title: Email Servers
+meta_title: Self-Hosted Email - Privacy Guides
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**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. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at _Privacy Guides_.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**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.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/i18n/zh/self-hosting/index.md b/i18n/zh/self-hosting/index.md
new file mode 100644
index 00000000..25260650
--- /dev/null
+++ b/i18n/zh/self-hosting/index.md
@@ -0,0 +1,170 @@
+---
+title: Self-Hosting
+meta_title: Self-Hosted Software and Services - Privacy Guides
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted 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.
+
+## :material-email: Email Servers
+
+
+
+- { .twemoji loading=lazy } [Stalwart](email-servers.md#stalwart)
+- { .twemoji loading=lazy } [Mailcow](email-servers.md#mailcow)
+- { .twemoji loading=lazy } [Mail-in-a-Box](email-servers.md#mail-in-a-box)
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+- { .lg .middle .twemoji } [**Redlib (Reddit)**](../frontends.md#redlib)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/redlib-org/redlib#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/redlib-org/redlib){ .card-link title="Source Code" }
+
+- { .lg .middle .twemoji } [**ProxiTok (TikTok)**](../frontends.md#proxitok)
+
+ ---
+
+ [:octicons-info-16:](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/pablouser1/ProxiTok){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Invidious (YouTube)**](../frontends.md#invidious)
+
+ ---
+
+ [:octicons-home-16:](https://invidious.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.invidious.io/installation){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/iv-org/invidious){ .card-link title="Source Code" }
+
+- { .twemoji } [**Piped (YouTube)**](../frontends.md#piped)
+
+ ---
+
+ [:octicons-info-16:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
+
+- { .twemoji } [**Addy.io**](../email-aliasing.md#addyio)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleLogin**](../email-aliasing.md#simplelogin)
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji } [**CryptPad**](../document-collaboration.md#cryptpad)
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } [**Miniflux**](../news-aggregators.md#miniflux)
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } [**Standard Notes**](../notebooks.md#standard-notes)
+
+ ---
+
+ [:octicons-home-16:](https://standardnotes.com){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://standardnotes.com/help/47/can-i-self-host-standard-notes){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+
+- { .twemoji } [**PrivateBin**](../pastebins.md#privatebin)
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } [**Paaster**](../pastebins.md#paaster)
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } [**SimpleX Chat**](../real-time-communication.md#simplex-chat)
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-16:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+
diff --git a/i18n/zh/tools.md b/i18n/zh/tools.md
index 17b845ec..a46aa71b 100644
--- a/i18n/zh/tools.md
+++ b/i18n/zh/tools.md
@@ -9,7 +9,29 @@ description: A complete list of the privacy tools, services, software, and hardw
如果你正在寻找某项具体解决方案，这里是一些我们推荐的各种类别的软硬件工具。 我们推荐的隐私工具主要依据它们的安全功能来选择，另外还强调了去中心化和开源。 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 needs.
-[VPN Providers](vpn.md ""){.md-button} [Password Managers](passwords.md ""){.md-button} [Email Providers](email.md ""){.md-button} [Browser Extensions](browser-extensions.md ""){.md-button} [DNS Servers](dns.md ""){.md-button} [Email Aliasing Services](email-aliasing.md ""){.md-button} [Photo Organization Tools](photo-management.md ""){.md-button}
+
+
+
+[VPN Providers](vpn.md){ .md-button }
+[Password Managers](passwords.md){ .md-button }
+[Email Providers](email.md){ .md-button }
+[Browser Extensions](browser-extensions.md){ .md-button }
+[DNS Servers](dns.md){ .md-button }
+[Email Aliasing Services](email-aliasing.md){ .md-button }
+[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
-### Self-Hosting Email
-
-
-
-- { .twemoji loading=lazy } [Stalwart](email.md#stalwart)
-- { .twemoji loading=lazy } [Mailcow](email.md#mailcow)
-- { .twemoji loading=lazy } [Mail-in-a-Box](email.md#mail-in-a-box)
-
-
@@ -480,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)