Merge remote-tracking branch 'first_repo/master' into main

2024-07-11 13:51:56 +00:00 · 2020-12-03 22:25:50 -06:00 · 2020-12-03 22:25:50 -06:00 · 9dc1727097
commit 9dc1727097
parent df625d6dcc 5142ef18ab
633 changed files with 41531 additions and 1 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -0,0 +1,32 @@
+# Editorial Team
+*.md @privacytools/editorial
+/assets/ @privacytools/editorial
+/pages/ @privacytools/editorial
+/_includes/sections/ @privacytools/editorial
+/index.html @privacytools/editorial
+/font/ @dawidpotocki
+
+# Administration Related Files
+/pages/donate.html @JonahAragon @BurungHantu1605
+/pages/notices.md @JonahAragon
+/pages/sponsors.html @JonahAragon
+/_includes/sponsors/ @JonahAragon
+/assets/img/svg/3rd-party/sponsors/ @JonahAragon
+/README.md @JonahAragon @BurungHantu1605
+/assets/js/redirects.js @JonahAragon
+/.well-known/ @JonahAragon
+/404.html @JonahAragon
+/.github/CODEOWNERS @JonahAragon @BurungHantu1605
+/.github/FUNDING.yml @JonahAragon @BurungHantu1605
+/LICENSE.txt @JonahAragon @BurungHantu1605
+/.travis.yml @JonahAragon @Shifterovich @nitrohorse
+/CNAME @JonahAragon
+/nginx/ @JonahAragon
+
+# WKD
+/.well-known/openpgpkey/hu/mrobfoimg5wz876m7kp6spyu66941weo @Mikaela
+/.well-known/openpgpkey/hu/nqspr7yd4bgs8ry43zbzpjd45p4iug5b @dawidpotocki
+/.well-known/openpgpkey/hu/dnrefmbtd6i58w8xfy4imj94cmbw3u3h @dngray
+/.well-known/openpgpkey/hu/rse6m7dxfdjo86qhyj6wqs1hcdcp7em4 @danarel
+/.well-known/openpgpkey/hu/zt71pstaerw1jpa5ru3borqmfsnbwnf6 @nitrohorse
+/.well-known/openpgpkey/hu/omn8s4nziz8zmyz6f756asto39gefr63 @JonahAragon
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -0,0 +1,118 @@
+# Contributing Guidelines
+
+Please read this document in full before contributing.
+
+- [Rules](#rules)
+- [Quality over Quantity](#quality-over-quantity)
+- [Software Criteria](#software-criteria)
+  - [Main (All Software)](#main)
+  - [Providers](#providers)
+    - [DNS](#dns)
+    - [VPN](#vpn)
+    - [Email](#email)
+  - [Hardware](#hardware)
+  - [Software](#software)
+  - [Encryption](#encryption)
+  - [Operating Systems](#operating-systems)
+- [Images](#images)
+- [Licensing](#licensing)
+- [Contributing via email](#contributing-via-email)
+
+## Rules
+
+- Be nice and respectful.
+- English only.
+- Be constructive.
+- Please feel free to *review changes* in the *files changed* tab of any
+  pull request at any time.
+- See also our [Code of Conduct](https://github.com/privacytools/.github/blob/master/CODE_OF_CONDUCT.md)
+
+## Quality over Quantity
+
+We're trying to keep it simple and promote the best tools, not all of them.
+
+## Software Criteria
+
+### Main
+
+- Easy to use. Could your mother use that tool or service? Usability is most important.
+- Cross-platform / Accessible.
+- Privacy respecting.
+- Open Source / Free Software is preferred but not required.
+- Prioritize Products without Vendor Lock-in (decentralized/self-hostable) or data interoperability.
+
+There can be exceptions if no software is available that meet the criteria.
+
+Note: This criteria applies to all of the PrivacyTools website and recommendations.
+
+### Providers
+
+- Prioritize Products by privacy respecting nationality.
+
+### DNS
+
+- Supports DoH or DoT (We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it).
+- Supports DNSSEC (https://dnssec.vs.uni-due.de/ can test your current DNS provider).
+- Doesn't log IP addresses during normal operation (If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs).
+- Preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10)
+
+### VPN
+
+See https://www.privacytools.io/providers/vpn/#criteria for more details.
+
+- Prioritize Products by privacy respecting nationality.
+- Cannot be based in USA or UK.
+- Must be accessible via Open Source Software (e.g. OpenVPN, WireGuard)
+- Use Encryption
+- Accept Cryptocurrency
+- No logging policy
+
+### Email
+
+- Outside of USA
+- Support SMTP SSL
+- Accessible Using Open Source Software (e.g. allows IMAP)
+
+### Hardware
+
+- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or equivalent (if applicable)
+- Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when available.
+- Cannot lock users to a particular platform.
+
+### Software
+
+- Must be able to download over encrypted network (can be a mirror)
+- Must be Open Source Software
+
+### Encryption
+
+- Only verifiable encryption is to be trusted
+
+### Operating Systems
+
+- Must state if recommends, depends on, or offers non-free software (contrib)
+- No Tracking Policy (opt-in analytics is ok)
+
+## Images
+
+- SVG file format is strongly preferred. PNG files can be used as a fallback if images are too complex or otherwise unsuitable as a vector format.
+- We like to optimize all SVGs we add to the site. [This](https://github.com/privacytools/privacytools.io/pull/1968#issuecomment-652773633) is a helpful guide as to how we do it with [Inkscape](https://inkscape.org/)
+  - Some SVGs generated by Illustrator or Sketch are broken, therefore copying the SVG content to a new canvas is sometimes required. (We found this with the Mailcow logo). Looked fine in local builds but was wrong once rendered through netlify preview etc.
+- We only have SVGs that have a canvas size of 128x128px or 384x128px.
+- Provider logo dimensions are 384px x 128px ([example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg))
+- Tool logo dimensions are 128px x 128px ([SVG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/png/3rd-party/claws_mail.png))
+
+
+## Licensing
+
+The content and original technology of this website is made available under the Creative Commons Zero v1.0 Universal license text. Some files or folders may include works from other projects with separate licenses, and will be marked as such. **By contributing to this repository, contributors do not necessarily agree to sign a CLA or legally transfer their copyright to the project, but they do at a minimum agree to license their work under the current license of this repository: In this case, the Creative Commons Zero v1.0 Universal.**
+
+## Contributing via email
+
+If you have a GitHub account, or are able to create a GitHub account, we ask that you do not submit issues via email.
+
+If you do not have a GitHub account, you may submit software recommendations or other issues via email without creating a GitHub account by emailing `privacytools@fire.fundersclub.com`. The subject line of your email will become the issue title. Your name will be included in the posted issue.
+
+This repository uses [@fire-bot](https://github.com/fire-bot), [a service](https://fire.fundersclub.com) from FundersClub that converts incoming emails to GitHub issues. By sending a message to the email address above, you will be sharing your email address and message content with FundersClub. FundersClub has a privacy policy at [https://fundersclub.com/catalyst-privacy-policy/](https://fundersclub.com/catalyst-privacy-policy/) you should review before using this service. Any attachments you send via this service may be stored indefinitely by FundersClub for the purpose of making them available within the submitted GitHub issue.
+
+You can view an example of the created issues' format at [#1444](https://github.com/privacytools/privacytools.io/issues/1444).
--- a/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
+++ b/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
@ -0,0 +1,27 @@
+---
+name: "🆕 Software Suggestion"
+about: Suggest new software that enhances privacy.
+title: "🆕 Software Suggestion | "
+labels: 🆕 software suggestion
+---
+
+## Basic Information
+
+**Name:**
+**Category:**
+**URL:**
+
+## Description
+
+
+
+## Why I am making the suggestion
+
+<!-- Anything you would like to tell us about the software? -->
+
+
+## My connection with the software
+
+<!-- Are you the author? Enthustiastic or early adopter? Friends with the author or requested by them to open the isue? An employee of the software maker? -->
+
+- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.
--- a/.github/ISSUE_TEMPLATE/2_Software_Removal.md
+++ b/.github/ISSUE_TEMPLATE/2_Software_Removal.md
@ -0,0 +1,21 @@
+---
+name: "❌ Software Removal"
+about: Suggest the removal of outdated, insecure, or otherwise bad software.
+title: "❌ Software Removal | "
+labels: ❌ software removal
+---
+
+## Description
+
+
+
+## Why I am making the suggestion
+
+<!-- Anything you would like to tell us about the software? -->
+
+
+## My connection with the software
+
+<!-- Are you the author? Competitor? Just hating the software with passsion for some reason? -->
+
+- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.
--- a/.github/ISSUE_TEMPLATE/3_Feature_Suggestion.md
+++ b/.github/ISSUE_TEMPLATE/3_Feature_Suggestion.md
@ -0,0 +1,8 @@
+---
+name: "✨ Feature Suggestion"
+about: Suggest a new feature/section/page for the website.
+title: "✨ Feature Suggestion | "
+labels: ✨ enhancement
+---
+
+## Description
--- a/.github/ISSUE_TEMPLATE/4_Content_Correction.md
+++ b/.github/ISSUE_TEMPLATE/4_Content_Correction.md
@ -0,0 +1,21 @@
+---
+name: "📝 Content Correction"
+about: Report any inaccurate, incorrect, or outdated information on the website.
+title: "📝 Correction | "
+labels: 📝 correction
+---
+
+## Description
+
+
+
+## Why I am making the suggestion
+
+<!-- Anything you would like to tell us about the software? -->
+
+
+## My connection with the software
+
+<!-- Are you the author? Competitor? Just hating the software with passsion for some reason? -->
+
+- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.
--- a/.github/ISSUE_TEMPLATE/5_Website_Issues.md
+++ b/.github/ISSUE_TEMPLATE/5_Website_Issues.md
@ -0,0 +1,23 @@
+---
+name: "🌐 Website Issue"
+about: Report a bug with the website. (NO CONTENT ISSUES)
+title: "🌐 Website Issue | "
+labels: 🌐 website issue
+---
+
+<!--
+
+READ ME FIRST:
+This is NOT the place to request changes to the content of the website.
+This is NOT the place to report issues with our services. (That is https://github.com/privacytools/services/issues/new)
+This is ONLY for reporting bugs or technical issues with www.privacytools.io.
+
+-->
+
+## Description
+
+<!--
+## Screenshots
+
+Please add screenshots if applicable
+-->
--- a/.github/ISSUE_TEMPLATE/6_Translation_Issues.md
+++ b/.github/ISSUE_TEMPLATE/6_Translation_Issues.md
@ -0,0 +1,21 @@
+---
+name: "🇦🇶 Translation Issue"
+about: Report any issue with a translated site.
+title: "🇦🇶 Translated Site Issue | "
+labels: 🌐 website issue, 🇦🇶 translations
+---
+
+## Site Affected
+
+**Domain:**
+
+<!-- Add an x to the box below if true [x] -->
+- [ ] This site is listed as a translated version of the site in the privacytools.io navbar.
+
+## Description
+
+<!--
+## Screenshots
+
+Please add screenshots if applicable
+-->
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -0,0 +1,7 @@
+contact_links:
+  - name: Services issues
+    url: https://github.com/privacytools/services/issues/new/choose
+    about: Open any issues/bug reports/requests related to our services (Mastodon, Matrix, etc) here.
+  - name: PrivacyTools Community
+    url: https://forum.privacytools.io/
+    about: Please ask any generic questions on our forum.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -0,0 +1,17 @@
+<!-- PLEASE READ OUR CODE OF CONDUCT (https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct) AND CONTRIBUTING GUIDELINES (https://github.com/privacytools/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
+
+## Description
+
+Resolves: #none <!-- A link to the (discussion) issue resolved by this pull request. There must be a discussion issue here at GitHub, before a pull request of software/service suggestion can be considered for merging. -->
+
+#### Check List <!-- Please add an x in each box below, like so: [x] -->
+
+- [ ] I understand that by not opening an issue about a software/service/similar addition/removal, this pull request will be closed without merging.
+
+- [ ] I have read and understand [the contributing guidelines](https://github.com/privacytools/privacytools.io/blob/master/.github/CONTRIBUTING.md).
+
+- [ ] The project is [Free Libre](https://en.wikipedia.org/wiki/Free_software) and/or [Open Source](https://en.wikipedia.org/wiki/Open-source_software) Software
+
+* Netlify preview for the mainly edited page: <!-- link or Non Applicable? Edit this in afterwards -->
+
+* Code repository of the project (if applicable):
--- a/.github/stale.yml
+++ b/.github/stale.yml
@ -0,0 +1,16 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - approved
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,10 @@
+_site/
+.sass-cache/
+.jekyll-metadata
+.DS_Store
+font/assets/
+font/_sass/
+font/.fontcustom-manifest.json
+assets/webfonts/ptio-font-preview.html
+vendor
+.bundle
--- a/.well-known/keybase.txt
+++ b/.well-known/keybase.txt
@ -0,0 +1,113 @@
+==================================================================
+https://keybase.io/privacytools
+--------------------------------------------------------------------
+
+I hereby claim:
+
+  * I am an admin of https://privacytools.io
+  * I am privacytools (https://keybase.io/privacytools) on keybase.
+  * I have a public key ASAkK34bChwgcSbs249aVEhWUYhfn9PYB0yx8y5hZEdLIAo
+
+To do so, I am signing this object:
+
+{
+  "body": {
+    "key": {
+      "eldest_kid": "0120242b7e1b0a1c207126ecdb8f5a54485651885f9fd3d8074cb1f32e6164474b200a",
+      "host": "keybase.io",
+      "kid": "0120242b7e1b0a1c207126ecdb8f5a54485651885f9fd3d8074cb1f32e6164474b200a",
+      "uid": "81b38301543203013da707b866f13619",
+      "username": "privacytools"
+    },
+    "merkle_root": {
+      "ctime": 1554941326,
+      "hash": "398a76706f68401cae4b733ff7c2bd7ad2fb40598604dd10f49a1f04db1173b26caf1c0bd480689d3d5f30c6b60190a69edc76e62d7ad1c16e19e0432c16b21e",
+      "hash_meta": "ee549365960473d4eec7331ecf3de0e38340c44a4ee61898ca542940b2e2d765",
+      "seqno": 5139256
+    },
+    "service": {
+      "entropy": "mEBRbFG3gU9gRt24VacvKVGm",
+      "hostname": "privacytools.io",
+      "protocol": "https:"
+    },
+    "type": "web_service_binding",
+    "version": 2
+  },
+  "client": {
+    "name": "keybase.io go client",
+    "version": "3.2.1"
+  },
+  "ctime": 1554941350,
+  "expire_in": 504576000,
+  "prev": "9947a42be64540ab809b87df765f3139cedbada82ae04012e97c94060fbed4f8",
+  "seqno": 20,
+  "tag": "signature"
+}
+
+which yields the signature:
+
+hKRib2R5hqhkZXRhY2hlZMOpaGFzaF90eXBlCqNrZXnEIwEgJCt+GwocIHEm7NuPWlRIVlGIX5/T2AdMsfMuYWRHSyAKp3BheWxvYWTESpcCFMQgmUekK+ZFQKuAm4ffdl8xOc7bragq4EAS6XyUBg++1PjEIDwvpOGptD6jbBIm52/LR9l4T2xslWcgKtq6zH2HvOGKAgHCo3NpZ8RAeFaHjsUF7kqDas46rMXC1KDIJE520BD57OMws6dnJxbMmJf8O3rRNrLCineR5vpetxjtxGYrhmTWPtgSyYQhD6hzaWdfdHlwZSCkaGFzaIKkdHlwZQildmFsdWXEIGJSitnvAgdVMG+AyewIHT4cBbbWjGh4/cesl/uzqfQZo3RhZ80CAqd2ZXJzaW9uAQ==
+
+And finally, I am proving ownership of this host by posting or
+appending to this document.
+
+View my publicly-auditable identity here: https://keybase.io/privacytools
+
+==================================================================
+
+==================================================================
+https://keybase.io/jonaharagon
+--------------------------------------------------------------------
+
+I hereby claim:
+
+  * I am an admin of https://privacytools.io
+  * I am jonaharagon (https://keybase.io/jonaharagon) on keybase.
+  * I have a public key ASBD2KZniUf0KM-4GzlgrMnnJzEg54hDvlsnGRExgP2IfAo
+
+To do so, I am signing this object:
+
+{
+  "body": {
+    "key": {
+      "eldest_kid": "01014354fcf62ba0752c5ceb6175fbecef4205b22adc102cb9f4963546960039f9c20a",
+      "host": "keybase.io",
+      "kid": "012043d8a6678947f428cfb81b3960acc9e7273120e78843be5b2719113180fd887c0a",
+      "uid": "3164c4d37d2d2bea011091787d7bc119",
+      "username": "jonaharagon"
+    },
+    "merkle_root": {
+      "ctime": 1554921408,
+      "hash": "3e5c007341d4b02dbe29217419189fa111e0dda3c3e9749540f98e85d769fdc7f0587228446bebc9d114535e75c7fbe2d81dbf1d6a9998add9a9b661eabccffa",
+      "hash_meta": "d346ffeac7eb4a94ff2cd518a27ed5cb745933316b4a9e91f102fd0c01118a63",
+      "seqno": 5137134
+    },
+    "service": {
+      "entropy": "3MGOPdt1pbQJ3jJphywjT9e9",
+      "hostname": "privacytools.io",
+      "protocol": "https:"
+    },
+    "type": "web_service_binding",
+    "version": 2
+  },
+  "client": {
+    "name": "keybase.io go client",
+    "version": "3.2.1"
+  },
+  "ctime": 1554921422,
+  "expire_in": 504576000,
+  "prev": "0c6f534ada5683036a1cd98291a995386925a572742e1aa43b2eb20394879ae3",
+  "seqno": 159,
+  "tag": "signature"
+}
+
+which yields the signature:
+
+hKRib2R5hqhkZXRhY2hlZMOpaGFzaF90eXBlCqNrZXnEIwEgQ9imZ4lH9CjPuBs5YKzJ5ycxIOeIQ75bJxkRMYD9iHwKp3BheWxvYWTES5cCzJ/EIAxvU0raVoMDahzZgpGplThpJaVydC4apDsusgOUh5rjxCBbnzb214v7MAMQHsGX2UxkYOPGr+WPD0WitCcDTTHkbQIBwqNzaWfEQByeB7GH1rHDvmFL8OZTS7xZ7oq8nbt/ZKJK8mFYoV0rym4akSdPiuzwP013lSH9msC3PhzpWSSTCmZk7OITtQGoc2lnX3R5cGUgpGhhc2iCpHR5cGUIpXZhbHVlxCBSTSnkhCA3soIAlMBA5R2DIINdDx0mk1xlj07KqwrwIKN0YWfNAgKndmVyc2lvbgE=
+
+And finally, I am proving ownership of this host by posting or
+appending to this document.
+
+View my publicly-auditable identity here: https://keybase.io/jonaharagon
+
+==================================================================
--- a/.well-known/librehost.json
+++ b/.well-known/librehost.json
@ -0,0 +1,19 @@
+{
+    "@context" : "http://schema.org",
+    "@type" : "Organization",
+    "organizationType" : "Informal collective",
+    "name" : "PrivacyTools",
+    "tagLine" : "Private Services: No Ads, No Google Analytics, No Affiliates, and No Cross-Site Requests",
+    "homeUrl" : "https://www.privacytools.io/",
+    "logo" : "https://www.privacytools.io/assets/img/layout/shield.svg",
+    "description": "PrivacyTools is a socially motivated website that provides information and services for protecting your security and privacy online. No Ads, No Google Analytics, No Affiliates, and No Cross-Site Requests.",
+    "communicationLanguages": ["en"],
+    "contactUrl": "https://www.privacytools.io/contact/",
+    "privacyPolicyUrl" : "https://www.privacytools.io/privacy/",
+    "termsOfServiceUrl" : "-",
+    "isServiceProvider" : true,
+    "foundingDate": "2015",
+    "version": "0.0.1",
+    "dateCreated": "2019-05-02T16:25:00Z",
+    "dateModified": "2019-05-02T16:25:00Z"
+}
--- a/.well-known/matrix/client
+++ b/.well-known/matrix/client
@ -0,0 +1,8 @@
+{
+    "m.homeserver": {
+        "base_url": "https://chat.privacytools.io"
+    },
+    "m.identity_server": {
+        "base_url": "https://chat.privacytools.io"
+    }
+}
--- a/.well-known/matrix/server
+++ b/.well-known/matrix/server
@ -0,0 +1,3 @@
+{
+    "m.server": "chat.privacytools.io:8448"
+}
--- a/.well-known/openpgpkey/hu/dnrefmbtd6i58w8xfy4imj94cmbw3u3h
+++ b/.well-known/openpgpkey/hu/dnrefmbtd6i58w8xfy4imj94cmbw3u3h
--- a/.well-known/openpgpkey/hu/mrobfoimg5wz876m7kp6spyu66941weo
+++ b/.well-known/openpgpkey/hu/mrobfoimg5wz876m7kp6spyu66941weo
--- a/.well-known/openpgpkey/hu/nqspr7yd4bgs8ry43zbzpjd45p4iug5b
+++ b/.well-known/openpgpkey/hu/nqspr7yd4bgs8ry43zbzpjd45p4iug5b
--- a/.well-known/openpgpkey/hu/omn8s4nziz8zmyz6f756asto39gefr63
+++ b/.well-known/openpgpkey/hu/omn8s4nziz8zmyz6f756asto39gefr63
--- a/.well-known/openpgpkey/hu/rse6m7dxfdjo86qhyj6wqs1hcdcp7em4
+++ b/.well-known/openpgpkey/hu/rse6m7dxfdjo86qhyj6wqs1hcdcp7em4
--- a/.well-known/openpgpkey/hu/zt71pstaerw1jpa5ru3borqmfsnbwnf6
+++ b/.well-known/openpgpkey/hu/zt71pstaerw1jpa5ru3borqmfsnbwnf6
--- a/.well-known/openpgpkey/policy
+++ b/.well-known/openpgpkey/policy
--- a/.well-known/security.txt
+++ b/.well-known/security.txt
@ -0,0 +1,5 @@
+Contact: admin@privacytools.io
+Encryption: https://www.jonaharagon.com/keys/
+Preferred-Languages: en
+Canonical: https://www.privacytools.io/.well-known/security.txt
+Policy: https://github.com/privacytools/privacytools.io/security/policy
--- a/404.html
+++ b/404.html
@ -0,0 +1,23 @@
+---
+layout: minimal
+active_page: 404
+---
+
+<div class="container text-center">
+  <h1 class="header-404">404</h1>
+  <p><strong>We couldn't find that :(</strong></p>
+  <p>Maybe you were looking for one of these pages?</p>
+  <div class="row">
+    <div class="col-md-6 offset-md-3">
+      <div class="card card-list">
+        <ul class="list-group list-group-flush">
+          <li class="list-group-item"><a href="/"><i class="fas fa-home"></i> Back to our Homepage</a></li>
+          <li class="list-group-item"><a href="/providers/"><i class="fas fa-server"></i> Privacy Focused Service Providers</a></li>
+          <li class="list-group-item"><a href="/browsers/"><i class="fas fa-compass"></i> Privacy Protecting Web Browsers</a></li>
+          <li class="list-group-item"><a href="/software/"><i class="fas fa-window-restore"></i> Privacy-Centric Software</a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+  <p class="text-danger text-center"><i class="fas fa-exclamation-circle"></i> If you believe you reached this page in error, please <a href="/contact/">contact us</a>!</p>
+</div>
--- a/1
+++ b/1
@ -0,0 +1 @@
+www.privacytools.io
--- a/16
+++ b/16
@ -0,0 +1,16 @@
+source "https://rubygems.org"
+
+# Install github-pages gem (https://jekyllrb.com/docs/github-pages/)
+gem "github-pages", group: :jekyll_plugins
+
+# Plugins
+group :jekyll_plugins do
+  # example: gem "jekyll-feed", "~> 0.6"
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.0" if Gem.win_platform?
+
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -0,0 +1,249 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.11.1)
+    colorator (1.1.0)
+    commonmarker (0.17.13)
+      ruby-enum (~> 0.5)
+    concurrent-ruby (1.1.5)
+    dnsruby (1.61.3)
+      addressable (~> 2.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    eventmachine (1.2.7)
+    execjs (2.7.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.11.1)
+    forwardable-extended (2.6.0)
+    gemoji (3.0.1)
+    github-pages (198)
+      activesupport (= 4.2.11.1)
+      github-pages-health-check (= 1.16.1)
+      jekyll (= 3.8.5)
+      jekyll-avatar (= 0.6.0)
+      jekyll-coffeescript (= 1.1.1)
+      jekyll-commonmark-ghpages (= 0.1.5)
+      jekyll-default-layout (= 0.1.4)
+      jekyll-feed (= 0.11.0)
+      jekyll-gist (= 1.5.0)
+      jekyll-github-metadata (= 2.12.1)
+      jekyll-mentions (= 1.4.1)
+      jekyll-optional-front-matter (= 0.3.0)
+      jekyll-paginate (= 1.1.0)
+      jekyll-readme-index (= 0.2.0)
+      jekyll-redirect-from (= 0.14.0)
+      jekyll-relative-links (= 0.6.0)
+      jekyll-remote-theme (= 0.3.1)
+      jekyll-sass-converter (= 1.5.2)
+      jekyll-seo-tag (= 2.5.0)
+      jekyll-sitemap (= 1.2.0)
+      jekyll-swiss (= 0.4.0)
+      jekyll-theme-architect (= 0.1.1)
+      jekyll-theme-cayman (= 0.1.1)
+      jekyll-theme-dinky (= 0.1.1)
+      jekyll-theme-hacker (= 0.1.1)
+      jekyll-theme-leap-day (= 0.1.1)
+      jekyll-theme-merlot (= 0.1.1)
+      jekyll-theme-midnight (= 0.1.1)
+      jekyll-theme-minimal (= 0.1.1)
+      jekyll-theme-modernist (= 0.1.1)
+      jekyll-theme-primer (= 0.5.3)
+      jekyll-theme-slate (= 0.1.1)
+      jekyll-theme-tactile (= 0.1.1)
+      jekyll-theme-time-machine (= 0.1.1)
+      jekyll-titles-from-headings (= 0.5.1)
+      jemoji (= 0.10.2)
+      kramdown (= 1.17.0)
+      liquid (= 4.0.0)
+      listen (= 3.1.5)
+      mercenary (~> 0.3)
+      minima (= 2.5.0)
+      nokogiri (>= 1.8.5, < 2.0)
+      rouge (= 2.2.1)
+      terminal-table (~> 1.4)
+    github-pages-health-check (1.16.1)
+      addressable (~> 2.3)
+      dnsruby (~> 1.60)
+      octokit (~> 4.0)
+      public_suffix (~> 3.0)
+      typhoeus (~> 1.3)
+    html-pipeline (2.12.0)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
+    http_parser.rb (0.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.8.5)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
+      liquid (~> 4.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (>= 1.7, < 4)
+      safe_yaml (~> 1.0)
+    jekyll-avatar (0.6.0)
+      jekyll (~> 3.0)
+    jekyll-coffeescript (1.1.1)
+      coffee-script (~> 2.2)
+      coffee-script-source (~> 1.11.1)
+    jekyll-commonmark (1.3.1)
+      commonmarker (~> 0.14)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-commonmark-ghpages (0.1.5)
+      commonmarker (~> 0.17.6)
+      jekyll-commonmark (~> 1)
+      rouge (~> 2)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
+    jekyll-feed (0.11.0)
+      jekyll (~> 3.3)
+    jekyll-gist (1.5.0)
+      octokit (~> 4.2)
+    jekyll-github-metadata (2.12.1)
+      jekyll (~> 3.4)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-mentions (1.4.1)
+      html-pipeline (~> 2.3)
+      jekyll (~> 3.0)
+    jekyll-optional-front-matter (0.3.0)
+      jekyll (~> 3.0)
+    jekyll-paginate (1.1.0)
+    jekyll-readme-index (0.2.0)
+      jekyll (~> 3.0)
+    jekyll-redirect-from (0.14.0)
+      jekyll (~> 3.3)
+    jekyll-relative-links (0.6.0)
+      jekyll (~> 3.3)
+    jekyll-remote-theme (0.3.1)
+      jekyll (~> 3.5)
+      rubyzip (>= 1.2.1, < 3.0)
+    jekyll-sass-converter (1.5.2)
+      sass (~> 3.4)
+    jekyll-seo-tag (2.5.0)
+      jekyll (~> 3.3)
+    jekyll-sitemap (1.2.0)
+      jekyll (~> 3.3)
+    jekyll-swiss (0.4.0)
+    jekyll-theme-architect (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-cayman (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-dinky (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-hacker (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-leap-day (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-merlot (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-midnight (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-minimal (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-modernist (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-primer (0.5.3)
+      jekyll (~> 3.5)
+      jekyll-github-metadata (~> 2.9)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-slate (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-tactile (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-time-machine (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-titles-from-headings (0.5.1)
+      jekyll (~> 3.3)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    jemoji (0.10.2)
+      gemoji (~> 3.0)
+      html-pipeline (~> 2.2)
+      jekyll (~> 3.0)
+    kramdown (1.17.0)
+    liquid (4.0.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    mercenary (0.3.6)
+    mini_portile2 (2.4.0)
+    minima (2.5.0)
+      jekyll (~> 3.5)
+      jekyll-feed (~> 0.9)
+      jekyll-seo-tag (~> 2.1)
+    minitest (5.11.3)
+    multipart-post (2.1.1)
+    nokogiri (1.10.8)
+      mini_portile2 (~> 2.4.0)
+    octokit (4.14.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (3.1.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rouge (2.2.1)
+    ruby-enum (0.7.2)
+      i18n
+    ruby_dep (1.5.0)
+    rubyzip (2.0.0)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  github-pages
+  tzinfo-data
+
+BUNDLED WITH
+   2.0.1
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -0,0 +1,116 @@
+CC0 1.0 Universal
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator and
+subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
+purpose of contributing to a commons of creative, cultural and scientific
+works ("Commons") that the public can reliably and without fear of later
+claims of infringement build upon, modify, incorporate in other works, reuse
+and redistribute as freely as possible in any form whatsoever and for any
+purposes, including without limitation commercial purposes. These owners may
+contribute to the Commons to promote the ideal of a free culture and the
+further production of creative, cultural and scientific works, or to gain
+reputation or greater distribution for their Work in part through the use and
+efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation
+of additional consideration or compensation, the person associating CC0 with a
+Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
+and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
+and publicly distribute the Work under its terms, with knowledge of his or her
+Copyright and Related Rights in the Work and the meaning and intended legal
+effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not limited
+to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display, communicate,
+  and translate a Work;
+
+  ii. moral rights retained by the original author(s) and/or performer(s);
+
+  iii. publicity and privacy rights pertaining to a person's image or likeness
+  depicted in a Work;
+
+  iv. rights protecting against unfair competition in regards to a Work,
+  subject to the limitations in paragraph 4(a), below;
+
+  v. rights protecting the extraction, dissemination, use and reuse of data in
+  a Work;
+
+  vi. database rights (such as those arising under Directive 96/9/EC of the
+  European Parliament and of the Council of 11 March 1996 on the legal
+  protection of databases, and under any national implementation thereof,
+  including any amended or successor version of such directive); and
+
+  vii. other similar, equivalent or corresponding rights throughout the world
+  based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
+applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
+and Related Rights and associated claims and causes of action, whether now
+known or unknown (including existing as well as future claims and causes of
+action), in the Work (i) in all territories worldwide, (ii) for the maximum
+duration provided by applicable law or treaty (including future time
+extensions), (iii) in any current or future medium and for any number of
+copies, and (iv) for any purpose whatsoever, including without limitation
+commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
+the Waiver for the benefit of each member of the public at large and to the
+detriment of Affirmer's heirs and successors, fully intending that such Waiver
+shall not be subject to revocation, rescission, cancellation, termination, or
+any other legal or equitable action to disrupt the quiet enjoyment of the Work
+by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be
+judged legally invalid or ineffective under applicable law, then the Waiver
+shall be preserved to the maximum extent permitted taking into account
+Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
+is so judged Affirmer hereby grants to each affected person a royalty-free,
+non transferable, non sublicensable, non exclusive, irrevocable and
+unconditional license to exercise Affirmer's Copyright and Related Rights in
+the Work (i) in all territories worldwide, (ii) for the maximum duration
+provided by applicable law or treaty (including future time extensions), (iii)
+in any current or future medium and for any number of copies, and (iv) for any
+purpose whatsoever, including without limitation commercial, advertising or
+promotional purposes (the "License"). The License shall be deemed effective as
+of the date CC0 was applied by Affirmer to the Work. Should any part of the
+License for any reason be judged legally invalid or ineffective under
+applicable law, such partial invalidity or ineffectiveness shall not
+invalidate the remainder of the License, and in such case Affirmer hereby
+affirms that he or she will not (i) exercise any of his or her remaining
+Copyright and Related Rights in the Work or (ii) assert any associated claims
+and causes of action with respect to the Work, in either case contrary to
+Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+  a. No trademark or patent rights held by Affirmer are waived, abandoned,
+  surrendered, licensed or otherwise affected by this document.
+
+  b. Affirmer offers the Work as-is and makes no representations or warranties
+  of any kind concerning the Work, express, implied, statutory or otherwise,
+  including without limitation warranties of title, merchantability, fitness
+  for a particular purpose, non infringement, or the absence of latent or
+  other defects, accuracy, or the present or absence of errors, whether or not
+  discoverable, all to the greatest extent permissible under applicable law.
+
+  c. Affirmer disclaims responsibility for clearing rights of other persons
+  that may apply to the Work or any use thereof, including without limitation
+  any person's Copyright and Related Rights in the Work. Further, Affirmer
+  disclaims responsibility for obtaining any necessary consents, permissions
+  or other rights required for any use of the Work.
+
+  d. Affirmer understands and acknowledges that Creative Commons is not a
+  party to this document and has no duty or obligation with respect to this
+  CC0 or use of the Work.
+
+For more information, please see
+<http://creativecommons.org/publicdomain/zero/1.0/>
--- a/README.md
+++ b/README.md
@ -1 +1,68 @@
-# Privacy Guides
+<div align="center">
+<a href="https://www.privacytools.io">
+	<img src="assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="PrivacyTools" />
+</a>
+<p>
+	<em>Encryption Against Global Mass Surveillance.</em>
+</p>
+<a href="https://opencollective.com/privacytools#support">
+	<img src="https://opencollective.com/privacytools/tiers/badge.svg">
+</a>
+<a href="https://app.netlify.com/sites/privacytools-io/deploys">
+	<img src="https://api.netlify.com/api/v1/badges/afd98777-c205-4928-a301-f57a1448113f/deploy-status">
+</a>
+</div>
+
+# Contributing
+
+It's important for a website like PrivacyTools to be up-to-date. Keep an eye on software updates of the applications listed here. Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So if you find an error, or you think a provider should not be listed here, or a qualified service provider is missing or a browser plugin is not the best choice anymore or anything else...
+
+**Talk to us!** If you want to help make privacytools.io the best website it can be, join our Matrix discussion chat at [`#dev:privacytools.io`](https://matrix.to/#/#dev:privacytools.io), where we talk about open issues and PRs in this repo, and changes to the site. You may submit any website suggestions here on GitHub [Issues](https://github.com/privacytools/privacytools.io/issues). Please refer to the [contribution guidelines](.github/CONTRIBUTING.md) and consider stopping by our chat room before submitting. Thank you.
+
+If you want to discuss privacy in general, a new tool, or just something else, feel free to join [our Discourse community](https://forum.privacytools.io/) or our general Matrix room at [`#general:privacytools.io`](https://matrix.to/#/#general:privacytools.io) and start a discussion! This is a community project and we're aiming to deliver the best information available. Thank you for participating.
+
+## Developing
+
+1. Install the latest stable version of [Ruby](https://www.ruby-lang.org/en/downloads/).
+1. Install [Bundler](https://bundler.io/) v2.0.1:
+	* `gem install bundler -v 2.0.1`
+1. Install the required dependencies:
+	* `bundle install`
+1. Build the website (the output can be found in the `_site` directory):
+	* `bundle exec jekyll build`
+1. Serve the website locally with live reloading:
+	* `bundle exec jekyll serve --incremental --livereload`
+
+# Support
+
+- [Donate](https://www.privacytools.io/sponsors/)
+- [Spread the word](https://www.privacytools.io/#participate)
+- [Join our Discourse community](https://forum.privacytools.io/)
+- [Make suggestions on reddit](https://www.reddit.com/r/privacytoolsIO/)
+- View and edit our website source code here on GitHub.
+
+## Backers
+
+Like what we're doing? [Become a backer](https://opencollective.com/privacytools) and show your support for our project.
+
+<a href="https://opencollective.com/privacytools">
+	<img src="https://opencollective.com/privacytools/tiers/sponsor.svg?avatarHeight=64&width=890" height="64px" width="890px" alt="opencollective.com" />
+</a>
+
+## Sponsors
+
+Are you working with a privacy focused company? Ask your manager or marketing team if your company would be interested in supporting our project. Your support will help us continue to develop this website, promote privacy-respecting tools and services, and reach out to thousands of data privacy newcomers every month. Also, your company's logo will show on GitHub and [our site](https://www.privacytools.io/sponsors/), and who doesn't like a little extra exposure?
+
+## Community Translations
+- [繁体中文 / Chinese](https://privacytools.twngo.xyz/) - [GitHub](https://github.com/twngo/privacytools-zh)
+- [Español / Spanish](https://victorhck.gitlab.io/privacytools-es/) - [GitLab](https://gitlab.com/victorhck/privacytools-es)
+- [Polski / Polish](https://pl.privacytools.io) - [Gitea](https://git.privacytools.io/pl-privacytoolsIO/pl.privacytools.io)
+- [Deutsch / German](https://privacytools.it-sec.rocks/) - [GitHub](https://github.com/Anon215/privacytools.it-sec.rocks)
+- [Français / French](https://privacytools.dreads-unlock.fr/) - [GitLab](https://gitlab.com/Booteille/privacytools)
+- [Italiano / Italian](https://privacytools-it.github.io/) - [GitHub](https://github.com/privacytools-it/privacytools-it.github.io)
+- [Русский / Russian](https://privacytools.ru) - [GitHub](https://github.com/c0rdis/privacytools.ru)
+- [Português / Portuguese](https://www.privacidade.digital/) - [GitHub](https://github.com/PrivacidadeDigital/privacidade.digital)
+
+# License & Notices
+
+Please visit [https://www.privacytools.io/notices/](https://www.privacytools.io/notices/) for license information and other disclaimers. PrivacyTools is provided on an "as-is" basis, without warranty, and disclaiming liability for damages. By contributing to this repository you agree to license your work under the terms of the [license](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt) in this repository.
--- a/_config.yml
+++ b/_config.yml
@ -0,0 +1,13 @@
+title: PrivacyTools - Encryption Against Global Mass Surveillance
+name: PrivacyTools
+description: You are being watched. PrivacyTools provides knowledge, encryption, and software recommendations to protect you against global mass surveillance.
+url: "https://www.privacytools.io"
+production_url: "https://www.privacytools.io"
+sass:
+  style: compressed
+plugins:
+  - jekyll-sitemap
+sitemap:
+file: "/sitemap.xml"
+include: [".well-known"]
+exclude: ["font", "vendor"]
--- a/_includes/badge.html
+++ b/_includes/badge.html
@ -0,0 +1,20 @@
+{% if include.link %}
+<a
+  href="{{ include.link }}" class="badge badge-{{ include.color | default: "info" }}"
+  {% if include.tooltip %}
+  data-toggle="tooltip"
+  title="{{ include.tooltip }}"><i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{ include.text }}
+{% else %}><i class="{{ include.icon | default: "fas fa-external-link-alt"}}"></i> {{ include.text }}{% endif %}
+</a>
+{% else %}
+<span
+  class="badge badge-{{ include.color | default: "info" }}"
+  {% if include.tooltip %}
+    data-toggle="tooltip"
+    title="{{ include.tooltip }}"
+    > <i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{include.text}}
+  {% else %}
+    > {% if include.icon %}<i class="{{ include.icon }}"></i>{% endif %} {{include.text}}
+  {% endif %}
+</span>
+{% endif %}
--- a/_includes/breadcrumbs.html
+++ b/_includes/breadcrumbs.html
@ -0,0 +1,23 @@
+<nav id="breadcrumb" aria-label="breadcrumb">
+  {% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
+  <ol class="breadcrumb" itemscope itemtype="https://schema.org/BreadcrumbList">
+    <li class="breadcrumb-item">
+      <a href="/"><i class="fas fa-home" aria-hidden="true"></i> <span>Home</span></a>
+    </li>
+    {% for crumb in crumbs offset: 1 %}
+    {% if forloop.last %}
+    <li class="breadcrumb-item active" aria-current="page" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+      <link href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}" itemprop="item"  />
+      <span itemprop="name">{% if page.breadcrumb %}{{ page.breadcrumb }}{% else %}{% assign words = crumb | replace:'-',' ' | remove:'.html' | split: ' ' %}{% capture titlecase %}{% for word in words %}{{ word | capitalize }} {% endfor %}{% endcapture %}{{ titlecase }}{% endif %}
+      </span>
+      <meta itemprop="position" content="{{ forloop.index }}" />
+    </li>
+    {% else %}
+    <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+      <a href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}" itemprop="item"><span itemprop="name">{{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}</span></a>
+      <meta itemprop="position" content="{{ forloop.index }}" />
+    </li>
+    {% endif %}
+    {% endfor %}
+  </ol>
+</nav>
--- a/_includes/card.html
+++ b/_includes/card.html
@ -0,0 +1,76 @@
+<div class="col-xl-4 col-lg-6 col-md-12 mb-4">
+    <div class="card card-{{include.color}}">
+        {% if include.color == "warning" %}
+        <div class="card-header text-dark bg-{{include.color}}">
+        {% else %}
+        <div class="card-header text-white bg-{{include.color}}">
+        {% endif %}
+        <h3 class="h5">{{include.title}}</h3>
+        </div>
+        <div class="card-body">
+            {% if include.labels %}
+            {% assign labels = include.labels | replace:", ", "," | split:"," %}
+            <div class="mb-1">
+                {% for label in labels %}
+                    {% assign label_data = label | split:":" %}
+                    {% assign color = label_data[0] %}
+                    {% assign text = label_data[1] %}
+                    {% assign tooltip = label_data[2] | default: "" %}
+                    {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+                    <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
+                        }}
+                        {% else %}
+                        >{{text}}
+                        {% endif %}
+                    </span>
+                {% endfor %}
+            </div>
+            {% endif %}
+            <p>
+              {% if include.image %}
+              <img src="{{include.image}}" width="120" height="120" alt="{{include.title}}" class="panel-item">
+              {% elsif include.icon %}
+              <i class="{{ include.icon }} panel-icon{% if include.iconcolor %} text-{{include.iconcolor}}{% endif %}"></i>
+              {% elsif include.font %}
+              <span class="{{ include.font }} panel-item panel-font" alt="{{ include.title }}"></span>
+              {% endif %}
+              {{include.description}}
+            </p>
+            <div>
+            <p>
+                {% if include.url %}
+                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">
+                    {% if include.website %}
+                        {{include.website}}
+                    {% else %}
+                        {{ include.url | remove: "https://" | remove: "http://" | remove: "www." | remove: "/" | remove: "github.com" }}
+                    {% endif %}
+                </a>
+                {% elsif include.page %}
+                <a class="btn btn-{{include.color}} mb-1" href="{{include.page}}">
+                    {% if include.moretext %}
+                        {{include.moretext}}
+                    {% else %}
+                        Learn More
+                    {% endif %}
+                </a>
+                {% endif %}
+                {% if include.tor %}
+                <a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.tor}} Requires specific software to access: torproject.org" href="{{include.tor}}"><img alt="Tor" src="/assets/img/layout/tor.png" width="35" height="35"></a>
+                {% endif %}
+
+                {% if include.git %}
+                <a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.git}} supports source code compiling and open review | is free software" href="{{include.git}}"><img alt="Git" src="assets/img/layout/git.png" width="35"></a>
+                {% endif %}
+
+                {% if include.extra_button %}
+                    {{include.extra_button}}
+                {% endif %}
+            </p>
+            {% if include.footer %}
+                <p>{{include.footer}}</p>
+            {% endif %}
+            </div>
+        </div>
+    </div>
+</div>
--- a/_includes/cardv2.html
+++ b/_includes/cardv2.html
@ -0,0 +1,329 @@
+<div class="card">
+  <div class="card-header text-white bg-secondary">
+    <h3 class="h5">
+      {% if include.badges %}
+      <span class="mr-2">{{ include.title }}</span>
+      {% assign badges = include.badges | split:"|" %}
+        {% for badge in badges %}
+          {% assign badge_data = badge | split:":" %}
+          {% assign color = badge_data[0] %}
+          {% assign text = badge_data[1] %}
+          {% assign tooltip = badge_data[2] | default: false %}
+          {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+          <span
+            class="badge badge-{{color}}"
+            {% if tooltip %}
+              data-toggle="tooltip"
+              title="{{ tooltip }}"
+              > {{text}} {{ help_icon }}
+            {% else %}
+              > {{text}}
+            {% endif %}
+          </span>
+        {% endfor %}
+      {% else %}
+        {{ include.title }}
+      {% endif %}
+    </h3>
+  </div>
+  <div class="card-body">
+    <p class="card-text">
+      <img
+        src="{{include.image}}"
+        {% if include.image-dark %}
+        data-theme-src="{{include.image-dark}}"
+        {% endif %}
+        height="120"
+        width="120"
+        class="panel-pic"
+        alt="{{include.title}} logo"
+      >
+      {{ include.description }}
+      {% if include.labels %}
+      {% assign labels = include.labels | split:"|" %}
+      {% for label in labels %}
+        {% assign label_data = label | split:"::" %}
+          {% for label_attr in label_data %}
+            {% assign attr = label_attr | split:"==" %}
+            {% if attr[0] == "color" %}
+              {% assign color = attr[1] %}
+            {% elsif attr[0] == "link" %}
+              {% assign link = attr[1] %}
+            {% elsif attr[0] == "text" %}
+              {% assign text = attr[1] %}
+            {% elsif attr[0] == "icon" %}
+              {% assign icon = attr[1] %}
+            {% elsif attr[0] == "tooltip" %}
+              {% assign tooltip = attr[1] %}
+            {% endif %}
+          {% endfor %}
+        {% include badge.html
+          link=link
+          color=color
+          text=text
+          icon=icon
+          tooltip=tooltip
+        %}
+        {% assign color = nil %}
+        {% assign link = nil %}
+        {% assign text = nil %}
+        {% assign icon = nil %}
+        {% assign tooltip = nil %}
+      {% endfor %}
+      {% endif %}
+    </p>
+    <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
+      <div class="flow-root flex-shrink-0 mr-1">
+        <a
+          href="{{include.website}}"
+          rel="noopener"
+          class="btn btn-primary mt-1 mr-1">
+          <i class="fas fa-external-link-alt fa-fw"></i>
+          Website
+        </a>
+        {% if include.privacy-policy %}
+        <a
+          href="{{include.privacy-policy}}"
+          rel="noopener"
+          class="btn btn-warning mt-1 mr-1">
+          <i class="fas fa-book fa-fw"></i>
+          Privacy Policy
+        </a>
+        {% endif %}
+        {% if include.forum %}
+          <a
+            href="{{include.forum}}"
+            rel="noopener"
+            class="btn btn-success mt-1 mr-1">
+            <i class="fab fa-discourse fa-fw"></i>
+            Forum
+          </a>
+        {% endif %}
+        {% if include.tor %}
+          <a
+            href="{{include.tor}}"
+            rel="noopener"
+            class="btn icon-btn hover-text-decoration-none mt-1 mr-1"
+            data-toggle="tooltip"
+            data-placement="bottom"
+            data-original-title="Requires specific software to access: torproject.org">
+            <span class="ptio-tor btn-tor btn-icon"></span>
+          </a>
+        {% endif %}
+        {% if include.i2p %}
+          <a
+            href="{{include.i2p}}"
+            rel="noopener"
+            class="btn icon-btn hover-text-decoration-none mt-1 mr-1"
+            data-toggle="tooltip"
+            data-placement="bottom"
+            data-original-title="Requires specific software to access: geti2p.net">
+            <span class="ptio-i2p-garlic btn-secondary btn-icon"></span>
+          </a>
+        {% endif %}
+      </div>
+
+      <div class="mt-2">
+          {% if include.windows %}
+            {% if include.windows != "" %}
+              <a href="{{ include.windows }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.mac %}
+            {% if include.mac != "" %}
+              <a href="{{ include.mac }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.linux %}
+            {% if include.linux != "" %}
+              <a href="{{ include.linux }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.freebsd %}
+            {% if include.freebsd != "" %}
+              <a href="{{ include.freebsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.openbsd %}
+            {% if include.openbsd != "" %}
+              <a href="{{ include.openbsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="ptio-openbsd fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="ptio-openbsd fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.netbsd %}
+            {% if include.netbsd != "" %}
+              <a href="{{ include.netbsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="ptio-netbsd fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="ptio-netbsd fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.firefox %}
+            {% if include.firefox != "" %}
+              <a href="{{ include.firefox }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.chrome %}
+            {% if include.chrome != "" %}
+              <a href="{{ include.chrome }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.safari %}
+            {% if include.safari != "" %}
+              <a href="{{ include.safari }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.opera %}
+            {% if include.opera != "" %}
+              <a href="{{ include.opera }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.edge %}
+            {% if include.edge != "" %}
+              <a href="{{ include.edge }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.fdroid %}
+            {% if include.fdroid != "" %}
+              <a href="{{ include.fdroid }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="ptio-f-droid fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="ptio-f-droid fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.googleplay %}
+            {% if include.googleplay != "" %}
+              <a href="{{ include.googleplay }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="fab fa-google-play fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="fab fa-google-play fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.android %}
+            {% if include.android != "" %}
+              <a href="{{ include.android }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.ios %}
+            {% if include.ios != "" %}
+              <a href="{{ include.ios }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="ptio-ios fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="ptio-ios fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.sailfish %}
+            {% if include.sailfish != "" %}
+              <a href="{{ include.sailfish }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {% if include.web %}
+            {% if include.web != "" %}
+              <a href="{{ include.web }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+                <i class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></i>
+              </a>
+            {% else %}
+              <i class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></i>
+            {% endif %}
+          {% endif %}
+
+          {{include.icon1}}
+          {{include.icon2}}
+          {{include.icon3}}
+
+          {% if include.github %}
+            <a href="{{include.github}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <i class="fab fa-github fa-2x fa-fw d-inline"></i>
+            </a>
+          {% endif %}
+
+          {% if include.gitlab %}
+            <a href="{{include.gitlab}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <i class="fab fa-gitlab fa-2x fa-fw d-inline"></i>
+            </a>
+          {% endif %}
+
+          {% if include.git %}
+            <a href="{{include.git}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <i class="fab fa-git-square fa-2x fa-fw d-inline"></i>
+            </a>
+          {% endif %}
+
+          {% if include.source %}
+            <a href="{{include.source}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <i class="fas fa-code-branch fa-2x fa-fw d-inline"></i>
+            </a>
+          {% endif %}
+
+      </div>
+    </div>
+  </div>
+</div>
+<br>
--- a/_includes/footer.html
+++ b/_includes/footer.html
@ -0,0 +1,97 @@
+<footer>
+
+  <hr class="footer-divider" />
+
+  <h3 id="participate">Spread the word and help your friends</h3>
+
+  <div class="row mb-4">
+    <div class="col-12 col-md-6 d-flex justify-content-between">
+      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body={{ site.production_url }}/" class="share-btn email" title="Email">
+        <i class="fas fa-envelope"></i>
+      </a>
+
+      <a href="https://www.facebook.com/sharer/sharer.php?u={{ site.production_url }}" class="share-btn facebook" title="Facebook">
+        <i class="fab fa-facebook-f"></i>
+      </a>
+
+      <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url={{ site.production_url }}/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
+        <i class="fab fa-twitter"></i>
+      </a>
+
+      <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url={{ site.production_url }}" class="share-btn mastodon" title="Mastodon">
+        <i class="fab fa-mastodon"></i>
+      </a>
+    </div>
+    <div class="col-12 col-md-6 d-flex justify-content-between">
+      <a href="https://reddit.com/submit?url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
+        <i class="fab fa-reddit-alien"></i>
+      </a>
+
+      <a href="https://www.linkedin.com/shareArticle?url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
+        <i class="fab fa-linkedin-in"></i>
+      </a>
+
+      <a href="https://mix.com/mixit?su=submit&url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
+        <i class="ptio-mix"></i>
+      </a>
+
+      <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url={{ site.production_url }}" class="share-btn diaspora" title="Diaspora*">
+        <i class="fas fa-asterisk"></i>
+      </a>
+    </div>
+  </div>
+
+  <h3>Copy URL and Description</h3>
+
+  <p>
+  <input type="text" value="{{ site.name }} - Encryption and tools to protect against global mass surveillance - {{ site.production_url }}" class="form-control input-lg onclick-select">
+  <span class="help-block">For easy copy and paste. Share this text snippet.</span>
+  </p>
+
+  <hr class="footer-divider" />
+
+  <div class="row mt-3">
+    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
+      <span class="fab fa-creative-commons-zero fa-2x mr-2"></span>
+      <a
+        href="/LICENSE.txt"
+        title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."
+        data-toggle="tooltip"
+        data-placement="top">
+        CC0
+      </a>
+    </div>
+
+    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
+      <span class="far fa-address-card fa-2x mr-2"></span>
+      <a href="/about/">About Us &amp; Contact</a>
+    </div>
+
+    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
+      <span class="fas fa-donate fa-2x mr-2"></span>
+      <a href="/donate/" data-toggle="tooltip" data-placement="top" data-original-title="Please support this project by donating. We are ad-free and not affiliated with any providers. Your donation will cover our costs for servers and domains.">Support Us!</a>
+    </div>
+  </div>
+
+  <div class="copyright-text">
+    <a href="/about/javascript" data-jslicense="1">
+      <span class="fab fa-js fa-lg"></span>
+      JavaScript Licenses
+    </a>
+    <p class="mt-2">
+      <strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong>
+      <em>{{ site.name }} is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em>
+    </p>
+    <p class="text-left">
+      Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong>
+      (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</a>)
+    </p>
+    <small>
+      <a href="/privacy/">Privacy Statement</a> |
+      <a href="/notices/">Notices &amp; Disclaimers</a> |
+      <a href="https://github.com/privacytools/brand">Brand Assets &amp; Guidelines</a> |
+      <a href="https://status.privacytools.io">Status Page</a>
+    </small>
+
+  </div>
+</footer>
--- a/_includes/head.html
+++ b/_includes/head.html
@ -0,0 +1,65 @@
+<head>
+  <meta charset="utf-8">
+  <meta name="referrer" content="no-referrer">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="keywords" content="privacy, anonymity, privacy tools, surveillance, encryption">
+  <meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
+  <link rel="canonical" href="{{ site.production_url }}{{ page.url | replace:'index.html',''}}">
+
+  <!-- title -->
+  {% if page.title %}
+  <title>{{ page.title }} | {{ site.name }}</title>
+  <meta property="og:title" content="{{ page.title }} | {{ site.name }}" />
+  {% else %}
+  <title>{{ site.title }}</title>
+  <meta property="og:title" content="{{ site.title }}" />
+  {% endif %}
+  <meta property="og:type" content="website" />
+  <meta property="og:url" content="{{ page.permalink | prepend: site.url }}" />
+  <meta property="og:image" content="{{ site.production_url }}/assets/img/svg/layout/brand/square-transparent.svg" />
+  <meta property="og:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}"/>
+  <meta property="og:locale" content="en_GB" />
+  <meta property="og:site_name" content="{{ site.name }}" />
+
+  {% if page.url == "/" %}
+  <script type="application/ld+json">
+  {
+    "@context": "https://schema.org",
+    "@type": "Organization",
+    "name": "{{ site.name }}",
+    "description": "{{ site.description }}",
+    "alternateName": [
+      "privacytools.io",
+      "Privacy Tools",
+      "privacytoolsIO"
+    ],
+    "url": "{{ site.production_url }}",
+    "logo": "{{ site.production_url }}/assets/img/svg/layout/brand/square-transparent.svg",
+    "sameAs": [
+      "https://blog.privacytools.io",
+      "https://twitter.com/privacytoolsIO",
+      "https://social.privacytools.io/@privacytools",
+      "https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg",
+      "https://github.com/privacytools"
+    ]
+  }
+  </script>
+  {% endif %}
+
+  <!-- icons -->
+  <link rel="apple-touch-icon" sizes="180x180" href="/assets/img/png/favicons/apple-touch-icon.png?v=2">
+  <link rel="icon" type="image/png" sizes="32x32" href="/assets/img/png/favicons/favicon-32x32.png?v=2">
+  <link rel="icon" type="image/png" sizes="16x16" href="/assets/img/png/favicons/favicon-16x16.png?v=2">
+  <link rel="manifest" href="/assets/img/png/favicons/site.webmanifest?v=2">
+  <link rel="mask-icon" href="/assets/img/png/favicons/safari-pinned-tab.svg?v=2" color="#3498db">
+  <link rel="shortcut icon" href="/assets/img/png/favicons/favicon.ico?v=2">
+  <meta name="msapplication-TileColor" content="#3498db">
+  <meta name="msapplication-config" content="/assets/img/png/favicons/browserconfig.xml?v=2">
+  <meta name="theme-color" content="#ffffff">
+
+
+  <!-- CSS stylesheets -->
+  <link href="/assets/css/style.css?v=9" rel="stylesheet">
+  {% unless page.url == '/sponsors/' %}<link id="dark-css" href="/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)">{% endunless %}
+</head>
--- a/_includes/nav.html
+++ b/_includes/nav.html
@ -0,0 +1,145 @@
+<nav class="fixed-top bg-dark">
+  <div id="navbar" class="d-flex flex-wrap justify-content-between align-items-center">
+    <div class="w-50">
+      <a id="nav-home-mobile" class="nav-anchor" href="/">
+        <img src="/assets/img/svg/layout/brand/horizontal.svg" width="150px" />
+      </a>
+    </div>
+    <input type="checkbox" id="nav-toggle" checked />
+    <label for="nav-toggle" id="nav-toggle-label" class="fas fa-bars fa-lg"></label>
+
+    <div class="menu w-100">
+      <div id="nav-left" class="position-relative flex-col">
+        <a class="nav-anchor" href="/">
+          <span id="nav-home" class="fas fa-home fa-fw"></span>
+        </a>
+
+        <!-- Provider -->
+        <details class="nav-details">
+          <summary>
+            <span class="nav-summary">
+              Provider
+              <span class="dropdown-toggle"></span>
+            </span>
+          </summary>
+          <span class="nav-dropdown">
+            <a class="dropdown-item" href="/providers/#ukusa"><span class="fas fa-user-secret fa-fw"></span> Avoid US & UK services</a>
+            <a class="dropdown-item" href="/providers/cloud-storage/"><span class="fas fa-cloud fa-fw"></span> Cloud Storage</a>
+            <a class="dropdown-item" href="/providers/dns/"><span class="fa fa-tasks fa-fw"></span> DNS</a>
+            <a class="dropdown-item" href="/providers/email/"><span class="fas fa-mail-bulk fa-fw"></span> Email</a>
+            <a class="dropdown-item" href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> Hosting</a>
+            <a class="dropdown-item" href="/providers/paste/"><span class="fas fa-paste fa-fw"></span> Pastebins</a>
+            <a class="dropdown-item" href="/providers/search-engines/"><span class="fas fa-search fa-fw"></span> Search Engines</a>
+            <a class="dropdown-item" href="/providers/social-networks/"><span class="fas fa-expand-arrows-alt fa-fw"></span> Social Networks</a>
+            <a class="dropdown-item" href="/providers/social-news-aggregator/"><span class="far fa-newspaper fa-fw"></span> Social News Aggregators</a>
+            <a class="dropdown-item" href="/providers/video/"><span class="fas fa-video fa-fw"></span> Video Platforms</a>
+            <a class="dropdown-item" href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> VPN</a>
+          </span>
+        </details>
+
+        <!-- Browser -->
+        <details class="nav-details">
+          <summary>
+            <span class="nav-summary">
+              Browser
+              <span class="dropdown-toggle"></span>
+            </span>
+          </summary>
+          <span class="nav-dropdown">
+            <a class="dropdown-item" href="/browsers/#browser"><span class="fas fa-check fa-fw"></span> Recommendation</a>
+            <a class="dropdown-item" href="/browsers/#fingerprint"><span class="fas fa-fingerprint fa-fw"></span> Fingerprinting Info</a>
+            <a class="dropdown-item" href="/browsers/#webrtc"><span class="far fa-eye fa-fw"></span> WebRTC IP Leak</a>
+            <a class="dropdown-item" href="/browsers/#addons"><span class="far fa-list-alt fa-fw"></span> Browser Add-ons</a>
+            <a class="dropdown-item" href="/browsers/#about_config"><span class="fas fa-wrench fa-fw"></span> Firefox Tweaks</a>
+          </span>
+        </details>
+
+        <!-- Software -->
+        <details class="nav-details">
+          <summary>
+            <span class="nav-summary">
+              Software
+              <span class="dropdown-toggle"></span>
+            </span>
+          </summary>
+          <span class="nav-dropdown">
+            <a class="dropdown-item" href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> Calendar/Contacts Sync Tools</a>
+            <a class="dropdown-item" href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebook</a>
+            <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a>
+            <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a>
+            <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a>
+            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> File Sync</a>
+            <a class="dropdown-item" href="/software/productivity/#metadata-removal-tools"><span class="far fa-eye-slash fa-fw"></span> Metadata Removal Tools</a>
+            <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> Password Manager</a>
+            <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> Productivity Tools</a>
+            <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> Real-Time Communication</a>
+            <a class="dropdown-item" href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> Self-contained Networks</a>
+            <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> Self-Hosted Cloud Server</a>
+          </span>
+        </details>
+
+        <!-- OS -->
+        <details class="nav-details">
+          <summary>
+            <span class="nav-summary">
+              OS
+              <span class="dropdown-toggle"></span>
+            </span>
+          </summary>
+          <span class="nav-dropdown">
+            <a class="dropdown-item" href="/operating-systems"><span class="fas fa-th-large fa-fw"></span> PC OS</a>
+            <a class="dropdown-item" href="/operating-systems/#tor_os"><span class="ptio-tor"></span> Tor focused distributions</a>
+            <a class="dropdown-item" href="/operating-systems/#mobile_os"><span class="fas fa-mobile-alt fa-fw"></span> Mobile OS</a>
+            <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> Android Privacy Add-ons</a>
+            <a class="dropdown-item" href="/operating-systems/#firmware"><span class="fas fa-signal fa-fw"></span> Router Firmware</a>
+            <a class="dropdown-item" href="/operating-systems/#win10"><span class="far fa-thumbs-down fa-fw"></span> Don't use Windows 10</a>
+          </span>
+        </details>
+
+        <a class="nav-anchor" href="/index.html#participate">Participate</a>
+      </div>
+
+      <!-- Language -->
+      <div id="nav-right">
+
+        <a href="/services/" class="nav-anchor">
+          Services
+        </a>
+        <a href="https://blog.privacytools.io/" class="nav-anchor">
+          Blog
+        </a>
+        <a href="/sponsors/" class="nav-anchor">
+          Sponsors
+        </a>
+        <a href="/about/" class="nav-anchor">
+          About Us
+        </a>{% unless page.url == '/sponsors/' %}
+        <span id="nav-switch-theme" class="nav-anchor">
+          <span class="nav-theme-icon fas fa-fw" aria-hidden="true" title="Theme"></span>
+          <span class="sr-only">Toggle Theme</span>
+        </span>
+
+        <details class="nav-details">
+          <summary>
+            <span class="nav-summary">
+              <span class="fas fa-language text-danger fa-fw" aria-hidden="true" title="Language"></span>
+              <span class="sr-only">Language Selection</span>
+              <span class="dropdown-toggle"></span>
+            </span>
+          </summary>
+          <span class="nav-dropdown">
+            <a href="https://www.privacytools.io/" class="dropdown-item">English</a>
+            <a href="https://privacytools.twngo.xyz/" rel="nofollow noopener" class="dropdown-item">繁體中文</a>
+            <a href="https://victorhck.gitlab.io/privacytools-es/" rel="nofollow noopener" class="dropdown-item">Español</a>
+            <a href="https://pl.privacytools.io/" rel="nofollow noopener" class="dropdown-item">Polski</a>
+            <a href="https://www.privacidade.digital/" rel="nofollow noopener" class="dropdown-item">Português</a>
+            <a href="https://privacytools.it-sec.rocks/" rel="nofollow noopener" class="dropdown-item">Deutsch</a>
+            <a href="https://privacytools-it.github.io/" rel="nofollow noopener" class="dropdown-item">Italiano</a>
+            <a href="https://privacytools.ru" rel="nofollow noopener" class="dropdown-item">Русский</a>
+            <a href="https://privacytools.dreads-unlock.fr" rel="nofollow noopener" class="dropdown-item">Français</a>
+          </span>
+        </details>{% endunless %}
+      </div>
+    </div>
+  </div>
+</nav>
--- a/_includes/panel.html
+++ b/_includes/panel.html
@ -0,0 +1,14 @@
+<div class="col-xl-4 col-lg-6 col-md-12 mb-4">
+    <div class="card card-{{include.color}}">
+        {% if include.color == "warning" %}
+        <div class="card-header text-dark bg-{{include.color}}">
+        {% else %}
+        <div class="card-header text-white bg-{{include.color}}">
+        {% endif %}
+        <h3 class="h5">{{include.title}}</h3>
+        </div>
+        <div class="card-body">
+            {{include.body}}
+        </div>
+    </div>
+</div>
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@ -0,0 +1,5 @@
+<script src="/assets/js/jquery-3.3.1.min.js?v=4"></script>
+<script src="/assets/js/popper.min.js?v=4"></script>
+<script src="/assets/js/bootstrap.min.js?v=4"></script>
+<script src="/assets/js/sortable.min.js?v=4"></script>
+<script src="/assets/js/main.js?v=5"></script>
--- a/_includes/sections/android-addons.html
+++ b/_includes/sections/android-addons.html
@ -0,0 +1,33 @@
+<h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> Android Privacy Add-ons</h1>
+
+<div class="container-fluid">
+
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img src="/assets/img/png/3rd-party/netguard.png" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
+    </div>
+    <div class="col">
+    <h3>Control your traffic with <a href="https://www.netguard.me/">NetGuard</a></h3>
+    <p><strong>NetGuard</strong> provides simple and advanced methods to block certain apps from accessing the internet, without requiring root privileges. Applications and addresses can be individually allowed or denied access to your Wi-Fi and/or mobile connections, allowing you to control exactly which apps are able to phone home or not.</p>
+    </div>
+  </div>
+
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img src="/assets/img/svg/3rd-party/orbot.svg" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Orbot">
+    </div>
+    <div class="col">
+    <h3>Tor for Android with <a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>
+    <p><strong>Orbot</strong> is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world.</p>
+    </div>
+  </div>
+
+</div>
+
+<h2>See also</h2>
+
+<ul>
+  <li>
+    <a href="/providers/dns#dns-android-clients">Our DNS client recommendations</a>, which have information on enabling encrypted DNS on Android.
+  </li>
+</ul>
--- a/_includes/sections/android-operating-systems.html
+++ b/_includes/sections/android-operating-systems.html
@ -0,0 +1,53 @@
+<h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> Mobile Operating Systems</h1>
+
+<h2 id="aosp_os" class="anchor"><a href="#aosp_os"><i class="fas fa-link anchor-icon"></i></a> Android-based Operating Systems</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>Even though the source code of the following operating systems is provided, installing Google Apps may compromise your setup.</strong>
+</div>
+
+{% include cardv2.html
+  title="CalyxOS"
+  image="/assets/img/svg/3rd-party/calyxos.svg"
+  description='CalyxOS is a custom ROM based on the Android Open Source Project with Pixel phones. It aims to be secure and private by default including a number of good choices for default applications. It also supports <a href="https://source.android.com/security/verifiedboot">verified boot</a>.'
+  badges="info:AOSP"
+  website="https://calyxos.org"
+  gitlab="https://gitlab.com/calyxos"
+%}
+
+{% include cardv2.html
+  title="GrapheneOS"
+  image="/assets/img/svg/3rd-party/grapheneos.svg"
+  image-dark="/assets/img/svg/3rd-party/grapheneos-dark.svg"
+  description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
+  badges="info:AOSP"
+  website="https://grapheneos.org/"
+  github="https://github.com/GrapheneOS/"
+%}
+
+{% include cardv2.html
+  title="LineageOS (Official Builds)"
+  image="/assets/img/svg/3rd-party/lineageos.svg"
+  description='LineageOS is a custom ROM based on the Android Open Source Project with <a href="https://wiki.lineageos.org/devices/">official support for a wide variety of devices</a>. The project is the successor to the popular CyanogenMod project, focusing on system control and customization, device longevity, and privacy. For security reasons, we do not recommend third-party builds of LineageOS for unsupported devices.'
+  badges="info:AOSP"
+  website="https://www.lineageos.org/"
+  privacy-policy="https://www.lineageos.org/legal/"
+  github="https://github.com/LineageOS"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li>
+    <a href="https://microg.org/">MicroG</a>
+    {% include badge.html
+    color="info"
+    text="Add-on Package"
+    %}
+    {% include badge.html
+    color="warning"
+    icon="far fa-question-circle"
+    %}
+    - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at <a href="https://lineage.microg.org/">Lineage for microG</a>.
+  </li>
+</ul>
--- a/_includes/sections/browser-addons.html
+++ b/_includes/sections/browser-addons.html
@ -0,0 +1,193 @@
+<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Recommended Browser Add-ons</h1>
+
+<div class="alert alert-secondary" role="alert">
+  Not all of these add-ons are necessary, and many provide redundant functionality. Choose the ones you need, and <a class="alert-link" href="https://blog.privacytools.io/firefox-privacy-an-introduction-to-safe/">learn more with our guide to Firefox Privacy</a>.
+</div>
+
+{% include cardv2.html
+  title="uBlock Origin: Block Ads and Trackers"
+  image="/assets/img/svg/3rd-party/ublock_origin.svg"
+  description="<p><strong>uBlock Origin</strong> is an efficient <a href=https://github.com/gorhill/uBlock/wiki/Blocking-mode>wide-spectrum blocker</a> that is easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source. <a href=https://github.com/gorhill/uBlock/wiki/Advanced-user-features>Advanced mode</a> allows for <a href=https://github.com/gorhill/uBlock/wiki/Dynamic-filtering:-quick-guide>dynamic filtering</a>. Dynamic filtering allows for extended blocking similar to NoScript and uMatrix (E.g. <a href=https://github.com/gorhill/uBlock/wiki/Blocking-mode:-medium-mode>medium</a> or <a href=https://github.com/gorhill/uBlock/wiki/Blocking-mode:-hard-mode>hard</a>) blocking.</p>"
+  website="https://addons.mozilla.org/firefox/addon/ublock-origin/"
+  privacy-policy="https://github.com/gorhill/uBlock/wiki/Privacy-policy"
+  forum="https://forum.privacytools.io/t/discussion-ublock-origin/266"
+  github="https://github.com/gorhill/uBlock/"
+  firefox="https://addons.mozilla.org/firefox/addon/ublock-origin/"
+  chrome="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm"
+  opera="https://addons.opera.com/en/extensions/details/ublock/"
+  edge="https://www.microsoft.com/en-us/p/ublock-origin/9nblggh444l4"
+%}
+
+{% include cardv2.html
+  title="HTTPS Everywhere: Secure Connections"
+  image="/assets/img/svg/3rd-party/https_everywhere.svg"
+  description="<strong>HTTPS Everywhere</strong> enables encryption of your connections to many major websites, making your browsing more secure. It is a collaboration between The Tor Project and the Electronic Frontier Foundation."
+  website="https://www.eff.org/https-everywhere"
+  privacy-policy="https://www.eff.org/code/privacy/policy"
+  forum="https://forum.privacytools.io/t/discussion-https-everywhere/268"
+  github="https://github.com/EFForg/https-everywhere"
+  firefox="https://addons.mozilla.org/firefox/addon/https-everywhere"
+  chrome="https://chrome.google.com/webstore/detail/https-everywhere/gcbommkclmclpchllfjekcdonpmejbdp"
+  opera="https://addons.opera.com/en/extensions/details/https-everywhere"
+%}
+
+{% include cardv2.html
+  title="Decentraleyes: Block Content Delivery Networks"
+  image="/assets/img/svg/3rd-party/decentraleyes.svg"
+  description="<strong>Decentraleyes</strong> emulates Content Delivery Networks locally by intercepting requests, finding the required resource, and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required."
+  website="https://decentraleyes.org/"
+  privacy-policy="https://decentraleyes.org/privacy-policy/"
+  forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
+  gitlab="https://git.synz.io/Synzvato/decentraleyes"
+  firefox="https://addons.mozilla.org/firefox/addon/decentraleyes"
+  chrome="https://chrome.google.com/webstore/detail/decentraleyes/ldpochfccmkkmhdbclfhpagapcfdljkj"
+  opera="https://addons.opera.com/extensions/details/decentraleyes"
+%}
+
+{% include cardv2.html
+  title="ClearURLs"
+  image="/assets/img/svg/3rd-party/clearurls.svg"
+  description="<strong>ClearURLs</strong> will automatically remove tracking elements from URLs to help protect your privacy when browsing through the Internet."
+  website="https://gitlab.com/KevinRoebert/ClearUrls"
+  privacy-policy="https://gitlab.com/KevinRoebert/ClearUrls/-/blob/master/PRIVACY.md"
+  forum="https://forum.privacytools.io/t/discussion-clearurls/3353"
+  gitlab="https://gitlab.com/KevinRoebert/ClearUrls"
+  firefox="https://addons.mozilla.org/firefox/addon/clearurls/"
+  chrome="https://chrome.google.com/webstore/detail/clearurls/lckanjgmijmafbedllaakclkaicjfmnk"
+  edge="https://microsoftedge.microsoft.com/addons/detail/mdkdmaickkfdekbjdoojfalpbkgaddei"
+%}
+
+{% include cardv2.html
+  title="xBrowserSync"
+  image="/assets/img/svg/3rd-party/xbrowsersync.svg"
+  description='<strong>xBrowserSync</strong> synchronizes bookmarks across devices and browsers with end-to-end encryption. Data is encrypted and decrypted on the device, no one but you can read it. No registration is needed, just enter a randomly generated id or QR code on all devices. <a href="https://www.xbrowsersync.org/#status">Different servers</a> are available, and it can also be <a href="https://github.com/xbrowsersync/api-docker">self-hosted</a>.'
+  website="https://www.xbrowsersync.org/"
+  privacy-policy="https://www.xbrowsersync.org/privacypolicy"
+  github="https://github.com/xbrowsersync"
+  firefox="https://addons.mozilla.org/firefox/addon/xbs/"
+  chrome="https://chrome.google.com/webstore/detail/xbrowsersync/lcbjdhceifofjlpecfpeimnnphbcjgnc"
+  googleplay="https://play.google.com/store/apps/details?id=com.xBrowserSync.android"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://floccus.org/">floccus</a> - Synchronize bookmarks across browsers via Nextcloud, WebDAV or a local file (and thus any file sync solution). For <a href="https://addons.mozilla.org/firefox/addon/floccus/">Firefox</a>, <a href="https://chrome.google.com/webstore/detail/floccus-bookmarks-sync/fnaicdffflnofjppbagibeoednhnbjhg">Chrome</a>, <a href="https://microsoftedge.microsoft.com/addons/detail/gjkddcofhiifldbllobcamllmanombji">Edge</a>.</li>
+</ul>
+
+<h2>Additional Functionality</h2>
+
+<div class="alert alert-secondary" role="alert">
+  These add-ons don't necessarily add to your privacy when browsing the web, but add additional functionality to your browser you may find useful.
+</div>
+
+{% include cardv2.html
+  title="Terms of Service; Didn’t Read: Be Informed"
+  image="/assets/img/svg/3rd-party/terms_of_service_didnt_read.svg"
+  description='<strong>Terms of Service; Didn’t Read</strong> is an addon that believes "I have read and agree to the Terms of Service" is the biggest lie on the web, and wants to fix it by grading websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analysis and ratings are published transparently by a community of reviewers.'
+  website="https://tosdr.org/"
+  privacy-policy="https://addons.mozilla.org/firefox/addon/terms-of-service-didnt-read/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270"
+  github="https://github.com/tosdr/"
+  firefox="https://addons.mozilla.org/firefox/addon/terms-of-service-didnt-read/"
+  chrome="https://chrome.google.com/webstore/detail/terms-of-service-didn%E2%80%99t-r/hjdoplcnndgiblooccencgcggcoihigg"
+  opera="https://addons.opera.com/extensions/details/terms-of-service-didnt-read"
+%}
+
+{% include cardv2.html
+  title="Snowflake"
+  image="/assets/img/svg/3rd-party/snowflake.svg"
+  description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead. <b>Note:</b> This add-on does not work with WebRTC disabled."
+  website="https://snowflake.torproject.org"
+  forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
+  git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
+  firefox="https://addons.mozilla.org/firefox/addon/torproject-snowflake"
+  chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
+%}
+
+<h2>Persistent storage management</h2>
+
+<h3>Desktop</h3>
+
+<div class="alert alert-warning" role="alert">
+  These add-ons are the preferred method for controlling persistent storage data that various websites and web-apps may create on your computer.
+</div>
+
+{% include cardv2.html
+  title="Temporary Containers"
+  image="/assets/img/svg/3rd-party/temporary_containers.svg"
+  image-dark="/assets/img/svg/3rd-party/temporary_containers-dark.svg"
+  description="<strong>Temporary Containers</strong> allow you to open tabs, websites, and links in automatically managed disposable containers. Containers isolate data websites store (cookies, storage, and more) from each other, enhancing your privacy and security while you browse: <a href=https://medium.com/@stoically/enhance-your-privacy-in-firefox-with-temporary-containers-33925cd6cd21>Enhance your privacy in Firefox with Temporary Containers.</a>"
+  website="https://addons.mozilla.org/firefox/addon/temporary-containers/"
+  privacy-policy="https://addons.mozilla.org/firefox/addon/temporary-containers/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-temporary-containers-multi-account-containers/3354"
+  github="https://github.com/stoically/temporary-containers"
+  firefox="https://addons.mozilla.org/firefox/addon/temporary-containers/"
+%}
+
+{% include cardv2.html
+  title="Firefox Multi-Account Containers"
+  image="/assets/img/svg/3rd-party/firefox_multi_account_containers.svg"
+  description="<strong>Firefox Multi-Account Containers</strong> allow you to create containers for specific websites. These containers are isolated from eachother. This add-on can be used in conjunctiuon with Temporary Containers to allow persistent logins to websites you specify."
+  website="https://support.mozilla.org/kb/containers"
+  forum="https://forum.privacytools.io/t/discussion-temporary-containers-multi-account-containers/3354"
+  github="https://github.com/mozilla/multi-account-containers"
+  firefox="https://addons.mozilla.org/firefox/addon/multi-account-containers/"
+%}
+
+<h3>Android</h3>
+
+<div class="alert alert-warning" role="alert">
+  Unfortunately the Android version of Firefox <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1398097">doesn't support managing tabs as containers</a>. The recommended extensions below are a substitute, however as APIs do not exist for clearing <a href="https://en.wikipedia.org/wiki/Indexed_Database_API">IndexedDB</a>, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#Service_workers">Service Workers</a> cache, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#AppCache_(obsolete)">appCache</a>, or cache by host. As a result they are not as good as the above Temporary Container suggestions.
+</div>
+
+{% include cardv2.html
+  title="ETag Stoppa"
+  image="/assets/img/svg/3rd-party/etag_stoppa.svg"
+  description="<strong>ETag Stoppa</strong> Prevents Firefox from storing entity tags by removing ETag response headers unconditionally and without exceptions."
+  website="https://addons.mozilla.org/firefox/addon/etag-stoppa/"
+  forum=""
+  github="https://github.com/claustromaniac/etag-stoppa"
+  firefox="https://addons.mozilla.org/firefox/addon/etag-stoppa/"
+%}
+
+{% include cardv2.html
+  title="Cookie AutoDelete: Automatically Delete Cookies"
+  image="/assets/img/png/3rd-party/cookie_autodelete.png"
+  description="<strong>Cookie AutoDelete</strong> automatically removes cookies, lingering sessions, and other information that can be used to spy on you when they are no longer used by open browser tabs."
+  website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/"
+  forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267"
+  github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete"
+  firefox="https://addons.mozilla.org/firefox/addon/cookie-autodelete"
+  chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
+%}
+
+<h2>For Advanced Users</h2>
+
+<div class="alert alert-warning" role="alert">
+  These addons require quite a lot of interaction from the user, and some of them completely replace the add-ons we've recommended above. Some sites may not work properly without careful configuration.
+</div>
+
+{% include cardv2.html
+  title="uMatrix: Stop Cross-Site Requests"
+  image="/assets/img/png/3rd-party/umatrix.png"
+  description="<strong>uMatrix</strong> gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics. uMatrix allows 1st party scripts in its default configuration. If you want the default functionality of NoScript consider <a href=https://github.com/gorhill/uMatrix/wiki/How-to-block-1st-party-scripts-everywhere-by-default>blocking 1st party scripts everywhere by default</a>. <strong>This addon has been <a href=https://github.com/uBlockOrigin/uMatrix-issues/issues/291#issuecomment-694988696>discontinued</a>.</strong>"
+  website="https://addons.mozilla.org/firefox/addon/umatrix/"
+  privacy-policy="https://github.com/gorhill/uMatrix/wiki/Privacy-policy"
+  forum="https://forum.privacytools.io/t/discussion-umatrix/271"
+  github="https://github.com/gorhill/uMatrix"
+  firefox="https://addons.mozilla.org/firefox/addon/umatrix"
+  chrome="https://chrome.google.com/webstore/detail/umatrix/ogfcmafjalglgifnmanfmnieipoejdcf"
+  opera="https://addons.opera.com/extensions/details/umatrix"
+%}
+
+{% include cardv2.html
+  title="CanvasBlocker"
+  image="/assets/img/svg/3rd-party/canvasblocker.svg"
+  description="<strong>CanvasBlocker</strong> allows users to prevent websites from using some Javascript APIs to fingerprint them. Users can choose to block the APIs entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API."
+  website="https://github.com/kkapsner/CanvasBlocker/"
+  privacy-policy="https://addons.mozilla.org/firefox/addon/canvasblocker/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-canvasblocker/3352"
+  github="https://github.com/kkapsner/CanvasBlocker/"
+  firefox="https://addons.mozilla.org/firefox/addon/canvasblocker/"
+%}
--- a/_includes/sections/browser-fingerprint.html
+++ b/_includes/sections/browser-fingerprint.html
@ -0,0 +1,25 @@
+<h1 id="fingerprint" class="anchor"><a href="#fingerprint"><i class="fas fa-link anchor-icon"></i></a> Browser Fingerprint - Is your browser configuration unique?</h1>
+
+<div class="alert alert-warning" role="alert">
+  Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.
+</div>
+
+<p>When you visit a web page, your browser voluntarily sends information about its configuration, such as available fonts, browser type, and add-ons. If this combination of information is unique, it may be possible to identify and track you without using cookies. EFF created a Tool called <a href="https://panopticlick.eff.org/" target="_blank">Panopticlick</a> to test your browser to see how unique it is.</p>
+
+<p>
+<a class="btn btn-warning" target="_blank" href="https://panopticlick.eff.org/">
+  Test your Browser now
+</a>
+</p>
+
+<p>You need to find what <strong>most browsers</strong> are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a <a href="https://addons.mozilla.org/firefox/addon/uaswitcher/">spoofed user-agent string</a> to match what the large userbase has. You need to have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even using the Tor Browser Bundle, will make your browser stick out from the masses.</p>
+
+<p>Modern web browsers have not been architected to assure personal web privacy. Rather than worrying about being fingerprinted, it seems more practical to use <a href="#addons"><i class="fas fa-link"></i> free software plugins</a> to regain control. They not only respect your freedom, but your privacy also. You can get much further with these than trying to manipulate your browser's fingerprint.</p>
+
+<h3>Related Information</h3>
+
+<ul>
+  <li><a href="https://panopticlick.eff.org/static/browser-uniqueness.pdf">How Unique Is Your Web Browser? Peter Eckersley, EFF.</a></li>
+  <li><a href="#addons"><i class="fas fa-link"></i> Our Firefox privacy add-ons section.</a></li>
+  <li><a href="https://www.browserleaks.com/">BrowserLeaks.com</a> - Web browser security testing tools that tell you what exactly personal identity data may be leaked without any permissions when you surf the Internet.</li>
+</ul>
--- a/_includes/sections/browser-recommendation.html
+++ b/_includes/sections/browser-recommendation.html
@ -0,0 +1,143 @@
+<h1 id="browser" class="anchor">
+  <a href="#browser"><span class="fas fa-link anchor-icon"></span></a>
+  Browser Recommendations For Desktop
+</h1>
+
+{% include cardv2.html
+  title="Firefox"
+  image="/assets/img/svg/3rd-party/firefox_browser.svg"
+  description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
+  recommendations: <a href="#addons"><i class="fas fa-link"></i> Privacy Add-ons</a> <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> <a href="#about_config"><i class="fas fa-link"></i> about:config tweaks</a>.'
+  website="https://firefox.com"
+  privacy-policy="https://www.mozilla.org/en-US/privacy/firefox/"
+  forum="https://forum.privacytools.io/t/discussion-firefox/279"
+  source="https://hg.mozilla.org/mozilla-central/"
+  windows="https://www.mozilla.org/firefox/windows/"
+  mac="https://www.mozilla.org/firefox/mac/"
+  linux="https://www.mozilla.org/firefox/linux/"
+  freebsd="https://www.freshports.org/www/firefox"
+  openbsd="http://openports.se/www/mozilla-firefox"
+  netbsd="http://pkgsrc.se/www/firefox"
+%}
+
+{% include cardv2.html
+  title="Tor Browser - Provides Anonymity"
+  image="/assets/img/svg/3rd-party/tor_browser.svg"
+  description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption, and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
+  website="https://www.torproject.org/"
+  privacy-policy="https://support.torproject.org/tbb/tbb-3/"
+  tor="http://expyuzz4wqqyqhjn.onion/"
+  forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
+  git="https://trac.torproject.org/projects/tor"
+  windows="https://www.torproject.org/download/"
+  mac="https://www.torproject.org/download/"
+  linux="https://www.torproject.org/download/"
+%}
+
+<h1 id="browser-android" class="anchor">
+  <a href="#browser-android"><span class="fas fa-link anchor-icon"></span></a>
+  Browser Recommendations For Android
+</h1>
+
+{% include cardv2.html
+  title="Firefox"
+  image="/assets/img/svg/3rd-party/firefox_browser.svg"
+  description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
+  recommendations: <a href="#addons"><i class="fas fa-link"></i> Privacy Add-ons</a> <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> <a href="#about_config"><i class="fas fa-link"></i> about:config tweaks</a>.'
+  website="https://www.mozilla.org/en-US/firefox/mobile/"
+  privacy-policy="https://www.mozilla.org/en-US/privacy/firefox/"
+  forum="https://forum.privacytools.io/t/discussion-firefox/279"
+  github="https://github.com/mozilla-mobile"
+  fdroid="https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/"
+  googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefox"
+  android="https://www.mozilla.org/firefox/all/#product-android-release"
+%}
+
+{% include cardv2.html
+  title="Tor Browser - Provides Anonymity"
+  image="/assets/img/svg/3rd-party/tor_browser.svg"
+  description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
+  website="https://www.torproject.org/"
+  privacy-policy="https://support.torproject.org/tbb/tbb-3/"
+  tor="http://expyuzz4wqqyqhjn.onion/"
+  forum="https://forum.privacytools.io/t/discussion-tor-browser-for-android-browsers/1522"
+  git="https://gitweb.torproject.org/tor-browser.git/"
+  android="https://www.torproject.org/download/#android"
+  fdroid="https://guardianproject.info/fdroid/"
+  googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
+%}
+
+{% include cardv2.html
+  title="Bromite"
+  image="/assets/img/svg/3rd-party/bromite.svg"
+  description='Bromite is a Chromium-based browser with privacy and security enhancements, built-in adblocking and DNS over HTTPS support; it includes patches from ungoogled-chromium and other privacy-focused projects. More info can be found <a href="https://www.bromite.org/#main-features">on the official website</a>.'
+  website="https://www.bromite.org/"
+  forum="https://forum.privacytools.io/t/discussion-bromite-browsers/1521"
+  github="https://github.com/bromite/bromite"
+  fdroid="https://www.bromite.org/fdroid"
+  android="https://www.bromite.org/#download-bromite"
+%}
+
+<h3>Worth Mentioning for Android</h3>
+
+<ul>
+  <li>
+    <a href="https://www.stoutner.com/privacy-browser/">Privacy Browser</a>
+    - An open-source web browser focused on user privacy. Features include integrated ad blocking with <a href="https://easylist.to/">EasyList</a>, <a href="https://www.stoutner.com/privacy-browser-2-5/">SSL certificate pinning</a>, and <a href='https://guardianproject.info/apps/orbot/'>Tor Orbot proxy support.</a>
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://play.google.com/store/apps/details?id=com.google.android.webview"
+    tooltip="Privacy Browser relies on the Android System WebView which needs to be kept up to date to fix security issues. One can update WebView by either installing it from Google Play or Aurora Store which you can get from F-Droid."
+    text="Keep WebView up-to-date"
+    %}
+  </li>
+</ul>
+
+
+<h1 id="browser-ios" class="anchor"><a href="#browser-ios"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations For iOS</h1>
+
+{% include cardv2.html
+  title="Firefox"
+  image="/assets/img/svg/3rd-party/firefox_browser.svg"
+  description='Firefox is fast, reliable, open-source, and respects your privacy. Note: Because of limitations set by Apple in iOS, our recommended tweaks cannot be applied. However, Firefox for iOS has an <a href="https://support.mozilla.org/en-US/kb/enhanced-tracking-protection-firefox-ios">Enhanced Tracking Protection</a> feature that uses a list provided by <a href="https://disconnect.me/trackerprotection">Disconnect</a> to identify and block ad, social, and analytics trackers, as well as cryptominers and fingerprinters.'
+  website="https://www.mozilla.org/en-US/firefox/mobile/"
+  privacy-policy="https://www.mozilla.org/en-US/privacy/firefox/"
+  forum="https://forum.privacytools.io/t/discussion-firefox/279"
+  github="https://github.com/mozilla-mobile/firefox-ios"
+  ios="https://apps.apple.com/us/app/firefox-private-safe-browser/id989804926"
+%}
+
+
+{% include cardv2.html
+  title="Onion Browser"
+  image="/assets/img/svg/3rd-party/onion_browser.svg"
+  description='Onion Browser is an open-source browser that lets you browse the web anonymously over the Tor network on iOS devices and is endorsed by the Tor Project. Warning: there are certain anonymity-related <a href="https://onionbrowser.com/about">issues</a> with Onion Browser due to iOS limitations.'
+  website="https://onionbrowser.com/"
+  privacy-policy="https://onionbrowser.com/privacy-policy"
+  forum="https://forum.privacytools.io/t/discussion-onion-browser-browsers/1523"
+  github="https://github.com/OnionBrowser/OnionBrowser"
+  ios="https://apps.apple.com/us/app/onion-browser/id519296448"
+%}
+
+
+{% include cardv2.html
+  title="DuckDuckGo Privacy Browser"
+  image="/assets/img/svg/3rd-party/duckduckgo.svg"
+  description='DuckDuckGo Privacy Browser is an open-source web browser that has built-in ad and tracker blocking and utilizes <a href="https://tosdr.org/">ToS;DR</a> to rate the privacy policies of the sites you visit.'
+  website="https://duckduckgo.com/app"
+  privacy-policy="https://duckduckgo.com/privacy"
+  tor="https://3g2upl4pq6kufc4m.onion/app"
+  forum="https://forum.privacytools.io/t/discussion-duckduckgo-privacy-browser-browsers/1524"
+  github="https://github.com/duckduckgo/iOS"
+  ios="https://apps.apple.com/us/app/duckduckgo-privacy-browser/id663592361"
+%}
+
+<h3>Worth Mentioning for iOS</h3>
+
+<ul>
+  <li>
+    <a href="https://snowhaze.com/en/index.html">SnowHaze</a>
+        - An open-source web browser with built-in ad, tracker, cookie, and fingerprint blocking, all customizable on a per-site basis.
+  </li>
+</ul>
--- a/_includes/sections/browser-tweaks.html
+++ b/_includes/sections/browser-tweaks.html
@ -0,0 +1,134 @@
+<h1 id="about_config" class="anchor"><a href="#about_config"><i class="fas fa-link anchor-icon"></i></a> Firefox: Privacy Related "about:config" Tweaks</h1>
+
+<div class="alert alert-success" role="alert">This is a collection of privacy-related <strong>about:config</strong> tweaks. We'll show you how to enhance the privacy of your Firefox browser.</div>
+
+<h3>Preparation:</h3>
+
+<ol>
+  <li>Enter "about:config" in the firefox address bar and press enter.</li>
+  <li>Press the button "Accept the Risk and Continue" [FF71+] or "I accept the risk".</li>
+  <li>Copy and paste each of the preferences below (for example "webgl.disabled") into the search bar, and set each of them to the stated value (such as "true").</li>
+</ol>
+
+<h3>Getting started:</h3>
+
+<dl class="long-string-list">
+  <dt>privacy.firstparty.isolate = true</dt>
+  <dd>A result of the <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> effort, this preference isolates all browser identifier sources (e.g. cookies) to the first party domain, with the goal of preventing tracking across different domains. (Don't do this if you are using the Firefox Addon "Cookie AutoDelete" with Firefox v58 or below.)</dd>
+
+  <dt>privacy.resistFingerprinting = true</dt>
+  <dd>A result of the <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> effort, this preference makes Firefox more resistant to browser fingerprinting.</dd>
+
+  <dt>privacy.trackingprotection.fingerprinting.enabled = true</dt>
+  <dd>[FF67+] Blocks Fingerprinting</dd>
+
+  <dt>privacy.trackingprotection.cryptomining.enabled = true</dt>
+  <dd>[FF67+] Blocks CryptoMining</dd>
+
+  <dt>privacy.trackingprotection.enabled = true</dt>
+  <dd>This is Mozilla's new built-in tracking protection. One of it's benefits is blocking tracking (i.e. Google Analytics) on <a href="https://github.com/gorhill/uMatrix/wiki/Privileged-Pages">privileged pages</a> where add-ons that usually do that are disabled.</dd>
+
+  <dt>browser.send_pings = false</dt>
+  <dd>The attribute would be useful for letting websites track visitors' clicks.</dd>
+
+  <dt>browser.urlbar.speculativeConnect.enabled = false</dt>
+  <dd>Disable preloading of autocomplete URLs. Firefox preloads URLs that autocomplete when a user types into the address bar, which is a concern if URLs are suggested that the user does not want to connect to. <a href="https://www.ghacks.net/2017/07/24/disable-preloading-firefox-autocomplete-urls/">Source</a></dd>
+
+
+  <dt>dom.event.clipboardevents.enabled = false</dt>
+  <dd>Disable that websites can get notifications if you copy, paste, or cut something from a web page, and it lets them know which part of the page had been selected.</dd>
+
+  <dt>media.eme.enabled = false</dt>
+  <dd>
+  <p>Disables playback of DRM-controlled HTML5 content, which, if enabled, automatically downloads the Widevine Content Decryption Module provided by Google Inc. <a href="https://support.mozilla.org/kb/enable-drm#w_opt-out-of-cdm-playback-uninstall-cdms-and-stop-all-cdm-downloads">Details</a></p>
+  <p>DRM-controlled content that requires the Adobe Flash or Microsoft Silverlight NPAPI plugins will still play, if installed and enabled in Firefox.</p>
+  </dd>
+
+  <dt>media.gmp-widevinecdm.enabled = false</dt>
+  <dd>Disables the Widevine Content Decryption Module provided by Google Inc., used for the playback of DRM-controlled HTML5 content. <a href="https://support.mozilla.org/kb/enable-drm#w_disable-the-google-widevine-cdm-without-uninstalling">Details</a></dd>
+
+  <dt>media.navigator.enabled = false</dt>
+  <dd>Websites can track the microphone and camera status of your device.</dd>
+
+  <dt>network.cookie.cookieBehavior = 1</dt>
+  <dd>
+  Disable cookies
+  <ul>
+    <li>0 = Accept all cookies by default</li>
+    <li>1 = Only accept from the originating site (block third-party cookies)</li>
+    <li>2 = Block all cookies by default</li>
+  </ul>
+  </dd>
+
+
+
+  <dt>network.http.referer.XOriginPolicy = 2</dt>
+  <dd>
+  Only send <code>Referer</code> header when the full hostnames match. (Note: if you notice significant breakage, you might try <code>1</code> combined with an <code>XOriginTrimmingPolicy</code> tweak below.) <a href="https://feeding.cloud.geek.nz/posts/tweaking-referrer-for-privacy-in-firefox/">Source</a>
+  <ul>
+    <li>0 = Send <code>Referer</code> in all cases</li>
+    <li>1 = Send <code>Referer</code> to same eTLD sites</li>
+    <li>2 = Send <code>Referer</code> only when the full hostnames match</li>
+  </ul>
+  </dd>
+
+  <dt>network.http.referer.XOriginTrimmingPolicy = 2</dt>
+  <dd>
+  When sending <code>Referer</code> across origins, only send scheme, host, and port in the <code>Referer</code> header of cross-origin requests. <a href="https://feeding.cloud.geek.nz/posts/tweaking-referrer-for-privacy-in-firefox/">Source</a>
+  <ul>
+    <li>0 = Send full url in <code>Referer</code></li>
+    <li>1 = Send url without query string in <code>Referer</code></li>
+    <li>2 = Only send scheme, host, and port in <code>Referer</code></li>
+  </ul>
+  </dd>
+
+  <dt>webgl.disabled = true</dt>
+  <dd>WebGL is a potential security risk. <a href="https://security.stackexchange.com/questions/13799/is-webgl-a-security-concern">Source</a></dd>
+
+  <dt>browser.sessionstore.privacy_level = 2</dt>
+  <dd>
+  This preference controls when to store extra information about a session: contents of forms, scrollbar positions, cookies, and POST data. <a href="http://kb.mozillazine.org/Browser.sessionstore.privacy_level">Details</a>
+  <ul>
+    <li>0 = Store extra session data for any site. (Default starting with Firefox 4.)</li>
+    <li>1 = Store extra session data for unencrypted (non-HTTPS) sites only. (Default before Firefox 4.)</li>
+    <li>2 = Never store extra session data.</li>
+  </ul>
+  </dd>
+
+  <dt>beacon.enabled = false</dt>
+  <dd>Disables sending additional analytics to web servers. <a href="https://developer.mozilla.org/en-US/docs/Web/API/Navigator/sendBeacon">Details</a></dd>
+
+  <dt>browser.safebrowsing.downloads.remote.enabled = false</dt>
+  <dd>Prevents Firefox from sending information about downloaded executable files to Google Safe Browsing to determine whether it should be blocked for safety reasons. <a href="https://support.mozilla.org/en-US/kb/how-does-phishing-and-malware-protection-work#w_what-information-is-sent-to-mozilla-or-its-partners-when-phishing-and-malware-protection-are-enabled">Details</a></dd>
+
+  <dt>Disable Firefox prefetching pages it thinks you will visit next:</dt>
+  <dd>
+  Prefetching causes cookies from the prefetched site to be loaded and other potentially unwanted behavior. Details <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Link_prefetching_FAQ">here</a> and <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-DNS-Prefetch-Control">here</a>.
+  <ul>
+    <li>network.dns.disablePrefetch = true</li>
+    <li>network.dns.disablePrefetchFromHTTPS = true</li>
+    <li>network.predictor.enabled = false</li>
+    <li>network.predictor.enable-prefetch = false</li>
+    <li>network.prefetch-next = false</li>
+  </dd>
+
+  <dt>network.IDN_show_punycode = true</dt>
+  <dd>Not rendering IDNs as their Punycode equivalent leaves you open to phishing attacks that can be very difficult to notice. <a href="https://krebsonsecurity.com/2018/03/look-alike-domains-and-visual-confusion/#more-42636">Source</a></dd>
+
+  <dt>Looking for TRR, DoH or ESNI?</dt>
+  <dd>They have moved to <a href="/providers/dns/#dns">our DNS page</a>.</dd>
+
+<h3 id="user.js">Firefox user.js Templates</h3>
+<ul>
+   <li><a href="https://github.com/arkenfox/user.js">arkenfox user.js</a> (formerly ghacks-user.js) - An ongoing comprehensive user.js template for configuring and hardening Firefox privacy, security and anti-fingerprinting.</li>
+</ul>
+
+
+<h3>Related Information</h3>
+
+<ul>
+  <li><a href="https://blog.privacytools.io/firefox-privacy-an-introduction-to-safe/">Firefox Privacy: Tips and Tricks for Better Browsing</a> - A good starting guide for users looking to keep their data private and secure.</li>
+  <li><a href="https://ffprofile.com/">ffprofile.com</a> - Helps you to create a Firefox profile with the defaults you like.</li>
+  <li><a href="https://addons.mozilla.org/firefox/addon/privacy-settings/">Privacy Settings</a> - A Firefox add-on to alter built-in privacy settings easily with a toolbar panel.</li>
+  <li><a href="https://12bytes.org/articles/tech/firefox/the-firefox-privacy-guide-for-dummies/">Firefox Privacy Guide For Dummies</a> - Guide on ways (already discussed and others) to improve your privacy and safety on Firefox.</li>
+</ul>
--- a/_includes/sections/browser-webrtc.html
+++ b/_includes/sections/browser-webrtc.html
@ -0,0 +1,58 @@
+<h1 id="webrtc" class="anchor"><a href="#webrtc"><i class="fas fa-link anchor-icon"></i></a> WebRTC IP Leak Test - Is your IP address leaking?</h1>
+
+<div class="alert alert-danger" role="alert">
+  WebRTC is a new communication protocol that relies on JavaScript that can leak your actual IP address from behind your VPN.
+</div>
+
+<p>While software like NoScript prevents this, it's probably a good idea to block this protocol directly as well, just to be safe. <b>Note:</b> This disables browser-based call functionality that is used for webapps like Discord, Hangouts, Jitsi, etc.</p>
+
+<p>
+<a class="btn btn-warning" target="_blank" rel="noopener noreferrer" href="https://ipleak.net">Test your Browser now</a>
+</p>
+
+<h3>How to disable WebRTC in Firefox?</h3>
+
+<p>In short: Set "media.peerconnection.enabled" to "false" in "about:config".</p>
+<p><strong>Explained:</strong></p>
+
+<ol class="long-string-list">
+  <li>Enter "about:config" in the firefox address bar and press enter.</li>
+  <li>Press the button "I'll be careful, I promise!"</li>
+  <li>Search for "media.peerconnection.enabled"</li>
+  <li>Double click the entry, the column "Value" should now be "false"</li>
+  <li>Done. Do the WebRTC leak test again.</li>
+</ol>
+
+<p>If you want to make sure every single WebRTC-related setting is really disabled change these settings:</p>
+
+<ol class="long-string-list">
+  <li>media.peerconnection.turn.disable = true</li>
+  <li>media.peerconnection.use_document_iceservers = false</li>
+  <li>media.peerconnection.video.enabled = false</li>
+  <li>media.peerconnection.identity.timeout = 1</li>
+</ol>
+
+<p>Now you can be 100% sure WebRTC is disabled.</p>
+
+<p>
+<a class="btn btn-primary" target="_blank" rel="noopener noreferrer" href="https://ipleak.net">Test your Browser again</a>
+</p>
+
+<h3>How to disable WebRTC in Safari?</h3>
+
+<p>Safari is far stricter with WebRTC than other major browsers, and it does not leak your IP address in its default configuration. If you'd like, you can follow these steps just to double-check your browser:</p>
+
+<ol class="long-string-list">
+  <li>Choose "Preferences" under the Safari menu in your menu bar.</li>
+  <li>Select the Advanced tab and check the "Show Develop menu in menu bar" box.</li>
+  <li>Exit Preferences and open the Develop menu in your menu bar.</li>
+  <li>In the drop-down menu, open the "WebRTC" submenu and ensure "Enable Legacy WebRTC API" is unchecked. If it's grayed out, even better.</li>
+</ol>
+
+<h3>How to disable WebRTC in Google Chrome?</h3>
+
+<p>WebRTC cannot be fully disabled in Chrome; however, it is possible to change its routing settings (and prevent leaks) using an extension. Two open-source solutions include <a href="https://chrome.google.com/webstore/detail/webrtc-leak-prevent/eiadekoaikejlgdbkbdfeijglgfdalml">WebRTC Leak Prevent</a> (options may need to be changed depending on the scenario), and <a href="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm">uBlock Origin</a> (select "Prevent WebRTC from leaking local IP addresses" in Settings).</p>
+
+<h3>What about other browsers?</h3>
+
+<p>Chrome on macOS and Internet Explorer do not implement WebRTC yet. <a href="#browser"><i class="fas fa-link"></i> But we recommend using Firefox on all devices.</a></p>
--- a/_includes/sections/calendar-contacts-sync.html
+++ b/_includes/sections/calendar-contacts-sync.html
@ -0,0 +1,69 @@
+<h1 id="calendar_contacts" class="anchor"><a href="#calendar_contacts"><i class="fas fa-link anchor-icon"></i></a> Calendar and Contacts Sync</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using a calendar and or contacts synchronization service like Google Sync or iCloud, you should pick an alternative here.</strong>
+</div>
+
+{%
+  include cardv2.html
+  title="Nextcloud"
+  image="/assets/img/svg/3rd-party/nextcloud.svg"
+  description="<strong>Nextcloud</strong> is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server."
+  website="https://nextcloud.com/"
+  privacy-policy="https://nextcloud.com/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-nextcloud-calender-contacts-sync-tools/1535"
+  github="https://github.com/nextcloud"
+  windows="https://nextcloud.com/install/"
+  linux="https://nextcloud.com/install/"
+  mac="https://nextcloud.com/install/"
+  freebsd="https://www.freshports.org/deskutils/nextcloudclient/"
+  openbsd="http://openports.se/www/nextcloud"
+  netbsd="http://pkgsrc.se/www/php-nextcloud"
+  android="https://nextcloud.com/install/"
+  ios="https://nextcloud.com/install/"
+%}
+
+{%
+  include cardv2.html
+  title="EteSync"
+  image="/assets/img/svg/3rd-party/etesync.svg"
+  description="<strong>EteSync</strong> is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information (e.g. contacts and calendars). There are native clients for Android, iOS, and the web, and an adapter layer for most desktop clients. It costs $24 per year to use, or you can host the server yourself for free."
+  website="https://www.etesync.com/"
+  privacy-policy="https://www.etesync.com/tos/#privacy"
+  forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536"
+  github="https://github.com/etesync"
+  web="https://client.etesync.com/"
+  windows="https://www.etesync.com/install/dav/"
+  mac="https://www.etesync.com/install/dav/"
+  linux="https://www.etesync.com/install/dav/"
+  freebsd="https://www.etesync.com/install/dav/"
+  openbsd="https://www.etesync.com/install/dav/"
+  netbsd="https://www.etesync.com/install/dav/"
+  fdroid="https://f-droid.org/packages/com.etesync.syncadapter/"
+  googleplay="https://play.google.com/store/apps/details?id=com.etesync.syncadapter"
+  ios="https://www.etesync.com/install/ios/"
+%}
+
+{%
+  include cardv2.html
+  title="Email Providers"
+  image="/assets/img/svg/layout/email.svg"
+  description='Many email providers also offer calendar and or contacts sync services. Refer to our <a href="/providers/email">Email Provider recommendations</a> to choose an email provider and see if they also offer calendar and/or contacts sync.'
+  website="/providers/email"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li>
+    <a href="https://fruux.com/">fruux</a> - A unified contacts/calendaring system that works across platforms and devices.
+  </li>
+
+  <li>
+    <a href="../cloud">Cloud backups</a> - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/">encrypting</a> them).
+  </li>
+
+  <li>
+    <a href="https://github.com/39aldo39/DecSync">DecSync</a> - DecSync can be used to synchronize RSS, contacts, and calendars without a server by using file synchronization software such as <a href="https://syncthing.net/">Syncthing</a>.
+  </li>
+</ul>
--- a/_includes/sections/cloud-storage.html
+++ b/_includes/sections/cloud-storage.html
@ -0,0 +1,31 @@
+<h1 id="cloud" class="anchor"><a href="#cloud"><i class="fas fa-link anchor-icon"></i></a> Encrypted Cloud Storage Services</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+  title="Nextcloud - Choose your hoster"
+  image="/assets/img/svg/3rd-party/nextcloud.svg"
+  description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
+  website="https://nextcloud.com/"
+  privacy-policy="https://nextcloud.com/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
+  windows="https://nextcloud.com/install/#install-clients"
+  mac="https://nextcloud.com/install/#install-clients"
+  linux="https://nextcloud.com/install/#install-clients"
+  freebsd="https://www.freshports.org/www/nextcloud/"
+  openbsd="http://openports.se/www/nextcloud"
+  netbsd="http://pkgsrc.se/www/php-nextcloud"
+  fdroid="https://f-droid.org/packages/com.nextcloud.client/"
+  googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
+  ios="https://itunes.apple.com/us/app/nextcloud/id1125420102"
+  github="https://github.com/nextcloud"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. {% include badge.html color="warning" tooltip="Cryptomator's mobile apps are not open-source." link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375" icon="fas fa-exclamation-triangle" %}</li>
+  <li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li>
+</ul>
--- a/_includes/sections/decentralized-video.html
+++ b/_includes/sections/decentralized-video.html
@ -0,0 +1,14 @@
+<h1 id="video" class="anchor"><a href="#video"><i class="fas fa-link anchor-icon"></i></a> Decentralized Video Platforms</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong> If you are currently using a platform like YouTube or Vimeo, you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+  title="PeerTube"
+  image="/assets/img/svg/3rd-party/peertube.svg"
+  description='PeerTube, developed by Framasoft, is a free and decentralized alternative to video platforms, with over 400,000 videos published by over 50,000 users and viewed over 10 million times. If you are looking for a server to join, you are welcome to join our hosted instance: <a href="https://tube.privacytools.io/">tube.privacytools.io</a>'
+  website="https://joinpeertube.org"
+  github="https://github.com/Chocobozzz/PeerTube"
+  web="https://joinpeertube.org/#what-is-peertube"
+%}
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@ -0,0 +1,668 @@
+<h1 id="dns" class="anchor">
+  <a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Encrypted DNS Resolvers
+</h1>
+
+<div class="alert alert-warning" role="alert">
+  DNS-over-HTTPS, DNS-over-TLS, and DNSCrypt resolvers will not make you anonymous. Using Anonymized DNSCrypt hides <i>only</i> your DNS traffic from your Internet Service Provider. However, using any of these protocols will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here. See the <a href="#dns-definitions">definitions</a> below.
+</div>
+
+<div id="dns-table" class="table-responsive">
+  <table class="table sortable-theme-bootstrap" data-sortable>
+    <thead>
+      <tr>
+        <th data-sorted="true" data-sorted-direction="ascending">DNS Provider</th>
+        <th data-sortable="true">Server Locations</th>
+        <th data-sortable="false">Privacy Policy</th>
+        <th data-sortable="true">Type</th>
+        <th data-sortable="true">Logging</th>
+        <th data-sortable="true">Protocols</th>
+        <th data-sortable="true">DNSSEC</th>
+        <th data-sortable="true">QNAME Minimization</th>
+        <th data-sortable="true">Filtering</th>
+        <th data-sortable="true">Source Code</th>
+        <th data-sortable="true">Hosting Provider</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td data-value="AdGuard">
+          <a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard</a>
+        </td>
+        <td>Anycast (based in
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-cy"></span>
+              Cyprus)
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://adguard.com/en/privacy/dns.html">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>Commercial</td>
+       <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"We store aggregated performance metrics of our DNS server, namely the number of complete requests to a particular server, the number of blocked requests, the speed of processing requests.
+We keep and store the database of domains requested in the last 24 hours. We need this information to identify and block new trackers and threats.
+We also log how many times this or that tracker has been blocked. We need this information to remove outdated rules from our filters."' href="https://adguard.com/en/privacy/dns.html">Some</a></td>
+        <td>DoH, DoT, DNSCrypt</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://github.com/AdguardTeam/AdGuardDNS/">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.choopa.com/">Choopa, LLC</a>,
+          </span>
+          <span class="no-text-wrap">
+            <a href="https://flops.ru/en/about.html">Serveroid, LLC</a>
+          </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td data-value="BlahDNS">
+          <a href="https://blahdns.com/">BlahDNS</a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-fi"></span>
+            Finland,
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-de"></span>
+            Germany,
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-jp"></span>
+            Japan
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-sg"></span>
+            Singapore
+          </span>
+        </td>
+        <td>
+          <div
+            class="btn-secondary btn-icon"
+            title="&quot;No logs.&quot;"
+            data-toggle="tooltip"
+            data-placement="bottom">
+            <span class="fas fa-globe"></span>
+          </div>
+        </td>
+        <td>Hobby Project</td>
+        <td>No</td>
+        <td data-value="dot/443">
+          <span class="no-text-wrap">
+            DoH,
+            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
+              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
+            </span>
+          </span>
+          DNSCrypt
+        </td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>
+          <span class="no-text-wrap">
+            Ads, trackers,
+          </span>
+          <span class="no-text-wrap">
+            malicious domains
+          </span>
+          <span class="no-text-wrap">
+            Based on server choice only for DoH
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://github.com/ookangzheng/blahdns/">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.choopa.com/">Choopa, LLC</a>,
+          </span>
+          <span class="no-text-wrap">
+            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
+          </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td data-value="Cloudflare">
+          <a href="https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1/">Cloudflare</a>
+        </td>
+        <td>Anycast (based in
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-us"></span>
+            US)
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://www.cloudflare.com/privacypolicy/">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>Commercial</td>
+        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title="Cloudflare collects and stores only the limited DNS query data that is sent to the 1.1.1.1 resolver. The 1.1.1.1 resolver service does not log personal data, and the bulk of the limited non-personally identifiable query data is only stored for 25 hours." href="https://developers.cloudflare.com/1.1.1.1/privacy/public-dns-resolver/">Some</a></td>
+        <td>DoH, DoT</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice
+          </span>
+        </td>
+        <td>?</td>
+        <td>Self</td>
+      </tr>
+
+      <tr>
+        <td data-value="CZ.NIC">
+          <a href="https://www.nic.cz/odvr/">CZ.NIC</a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-cz"></span>
+            Czech Republic
+          </span>
+        </td>
+        <td>
+          <div
+            class="btn-secondary btn-icon"
+            title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;"
+            data-toggle="tooltip"
+            data-placement="bottom">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"CZ.NIC is an interest association of legal entities, founded in 1998 by leading providers of Internet services."' href="https://www.nic.cz/page/351/about-association/">Association</a></td>
+        <td>No</td>
+        <td>DoH, DoT</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td data-value="No">?</td>
+        <td>?</td>
+        <td>Self</td>
+      </tr>
+
+      <tr>
+        <td data-value="Foundation for Applied Privacy">
+          <a href="https://appliedprivacy.net/services/dns/">Foundation for Applied Privacy</a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-at"></span>
+            Austria
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://appliedprivacy.net/privacy-policy">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>Non-Profit</td>
+        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"We do NOT log your IP address or DNS queries during normal operations. We do NOT share query data with third parties that are not directly involved with resolving the query (i.e. sending queries to authoritative nameservers for resolution)."' href="https://appliedprivacy.net/privacy-policy/">Some</a></td>
+        <td data-value="dot/443">
+          <span class="no-text-wrap">
+            DoH,
+            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
+              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>
+            </span>
+          </span>
+        </td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>No</td>
+        <td>?</td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.ipax.at/">IPAX OG</a>
+          </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td data-value="LibreDNS">
+          <a href="https://libredns.gr/">LibreDNS</a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-de"></span>
+            Germany
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://libreops.cc/terms.html">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="Part of LibreHosters, &quot;a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms.&quot;" href="https://libreho.st/">
+            Informal collective
+          </a>
+        </td>
+        <td>No</td>
+        <td>DoH, DoT</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice only for DoH
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://gitlab.com/libreops/libredns">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
+          </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td data-value="nextdns">
+          <a href="https://www.nextdns.io/">NextDNS</a>
+        </td>
+        <td>Anycast (based in
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-us"></span>
+            US)
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://www.nextdns.io/privacy">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>Commercial</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"Some of the features require some sort of data retention. In that case, we give our users the choice to granularly or completely disable those features (and associated data retention), and we follow up immediately on that promise"' href="https://www.nextdns.io/privacy">Based on user choice</a>
+        </td>
+        <td>DoH, DoT, DNSCrypt</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice
+          </span>
+        </td>
+        <td>?</td>
+        <td>Self</td>
+      </tr>
+
+      <tr>
+        <td data-value="NixNet">
+          <a href="https://nixnet.xyz/dns/">NixNet</a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            Anycast (based in
+            <span class="flag-icon flag-icon-us"></span>
+            US),
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-us"></span>
+            US,
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-lu"></span>
+            Luxembourg
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://nixnet.xyz/privacy/">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='Part of LibreHosters, "a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms."' href="https://libreho.st/">
+            Informal collective
+          </a>
+        </td>
+        <td>No</td>
+        <td>DoH, DoT</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://git.nixnet.xyz/NixNet/dns">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://frantech.ca/">FranTech Solutions</a>
+          </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td data-value="PowerDNS">
+          <a href="https://powerdns.org/">PowerDNS</a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-nl"></span>
+            The Netherlands
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://powerdns.org/doh/privacy.html">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>Hobby Project</td>
+        <td>No</td>
+        <td>DoH</td>
+        <td>Yes</td>
+        <td>No</td>
+        <td>No</td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://github.com/PowerDNS/pdns">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.transip.nl/">TransIP B.V. Admin</a>
+          </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td data-value="Quad9">
+          <a href="https://quad9.net/">Quad9</a>
+        </td>
+        <td>Anycast (based in
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-us"></span>
+            US)
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://quad9.net/policy/">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>Non-Profit</td>
+        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"Our normal course of data management does not have any IP address information or other PII logged to disk or transmitted out of the location in which the query was received."' href="https://quad9.net/policy/">Some</a></td>
+        <td>DoH, DoT, DNSCrypt</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>
+          <span class="no-text-wrap">
+            Malicious domains
+          </span>
+        </td>
+        <td>?</td>
+        <td>
+          Self,
+          <span class="no-text-wrap">
+            <a href="https://www.pch.net/">Packet Clearing House</a>
+          </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td data-value="Snopyta">
+          <a href="https://snopyta.org/service/dns/index.html">Snopyta</a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-fi"></span>
+            Finland
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://snopyta.org/privacy_policy/">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="Part of LibreHosters, &quot;a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms.&quot;" href="https://libreho.st/">
+            Informal collective
+          </a>
+        </td>
+        <td>No</td>
+        <td>DoH, DoT</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>
+          <span class="no-text-wrap">
+            No
+          </span>
+        </td>
+        <td>?</td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
+          </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td data-value="UncensoredDNS">
+          <a href="https://blog.uncensoreddns.org/">UncensoredDNS</a>
+        </td>
+        <td>Anycast (based in
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-dk"></span>
+            Denmark),
+          </span>
+
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-dk"></span>
+            Denmark,
+            </span>
+
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-us"></span>
+            US
+          </span>
+        </td>
+        <td>
+          <div
+            class="btn-secondary btn-icon"
+            title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;"
+            data-toggle="tooltip"
+            data-placement="bottom">
+            <span class="fas fa-globe"></span>
+          </div>
+        </td>
+        <td>Hobby Project</td>
+        <td>No</td>
+        <td data-value="doh">DoT</td> <!-- "hack" to group "DoT" values (when sorted) with "DoH" values -->
+        <td>Yes</td>
+        <td>No</td>
+        <td>No</td>
+        <td>?</td>
+        <td>
+          Self,
+          <span class="no-text-wrap">
+            <a href="https://www.teliacompany.com">Telia Company AB</a>
+          </span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<h1 id="dns-desktop-clients" class="anchor">
+  <a href="#dns-desktop-clients">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Encrypted DNS Client Recommendations for Desktop
+</h1>
+
+{%
+  include cardv2.html
+  title="Unbound"
+  image="/assets/img/svg/3rd-party/unbound.svg"
+  description='A validating, recursive, caching DNS resolver, supporting DNS-over-TLS, and has been <a href="https://ostif.org/our-audit-of-unbound-dns-by-x41-d-sec-full-results/">independently audited</a>.'
+  website="https://nlnetlabs.nl/projects/unbound/about/"
+  forum="https://forum.privacytools.io/t/discussion-unbound/3563"
+  github="https://github.com/NLnetLabs/unbound"
+%}
+
+{%
+  include cardv2.html
+  title="dnscrypt-proxy"
+  image="/assets/img/svg/3rd-party/dnscrypt-proxy.svg"
+  description='A DNS proxy with support for DNSCrypt, DNS-over-HTTPS, and <a href="https://github.com/DNSCrypt/dnscrypt-protocol/blob/master/ANONYMIZED-DNSCRYPT.txt">Anonymized DNSCrypt</a>, a <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Anonymized-DNS">relay-based protocol that the hides client IP address.</a>'
+  website="https://github.com/DNSCrypt/dnscrypt-proxy/wiki"
+  forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
+  github="https://github.com/DNSCrypt/dnscrypt-proxy"
+%}
+
+{%
+  include cardv2.html
+  title="Stubby"
+  image="/assets/img/png/3rd-party/stubby.png"
+  description='An application that acts as a local DNS-over-TLS stub resolver. Stubby can be used in <a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients#DNSPrivacyClients-Unbound/Stubbycombination">combination with Unbound</a> by managing the upstream TLS connections (since Unbound cannot yet re-use TCP/TLS connections) with Unbound providing a local cache.'
+  website="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby"
+  forum="https://forum.privacytools.io/t/discussion-stubby/3582"
+  github="https://github.com/getdnsapi/stubby"
+%}
+
+{%
+  include cardv2.html
+  title="Firefox's built-in DNS-over-HTTPS resolver"
+  image="/assets/img/svg/3rd-party/firefox_browser.svg"
+  description='Firefox comes with built-in DNS-over-HTTPS support for <a href="https://blog.mozilla.org/blog/2020/02/25/firefox-continues-push-to-bring-dns-over-https-by-default-for-us-users/">NextDNS and Cloudflare</a> but users can manually use any other DoH resolver.'
+  labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.cloudflare.com/1.1.1.1/privacy/firefox::text==Warning::tooltip==Cloudflare logs a limited amount of data about the DNS requests that are sent to their custom resolver for Firefox."
+  website="https://support.mozilla.org/en-US/kb/firefox-dns-over-https"
+  privacy-policy="https://wiki.mozilla.org/Security/DOH-resolver-policy"
+  forum="https://forum.privacytools.io/t/discussion-firefox-s-built-in-dns-over-https-resolver/3564"
+%}
+
+<h1 id="dns-android-clients" class="anchor">
+  <a href="#dns-android-clients">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Encrypted DNS Client Recommendations for Android
+</h1>
+
+{%
+  include cardv2.html
+  title="Android 9's built-in DNS-over-TLS resolver"
+  image="/assets/img/svg/3rd-party/android.svg"
+  description="Android 9 (Pie) comes with built-in DNS-over-TLS support without the need for a 3rd-party application."
+  labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.google.com/speed/public-dns/docs/using#android_9_pie_or_later::text==Warning::tooltip==Android 9's DoT settings have no effect when used concurrently with VPN-based apps which override the DNS."
+  website="https://support.google.com/android/answer/9089903#private_dns"
+  forum="https://forum.privacytools.io/t/discussion-android-9s-built-in-dns-over-tls-resolver/3562"
+%}
+
+{%
+  include cardv2.html
+  title="Nebulo"
+  image="/assets/img/png/3rd-party/nebulo.png"
+  description='An open-source Android client supporting DNS-over-HTTPS and DNS-over-TLS, caching DNS responses, and locally logging DNS queries.'
+  website="https://git.frostnerd.com/PublicAndroidApps/smokescreen/-/blob/master/README.md"
+  privacy-policy="https://smokescreen.app/privacypolicy"
+  forum="https://forum.privacytools.io/t/discussion-nebulo/3565"
+  fdroid="https://git.frostnerd.com/PublicAndroidApps/smokescreen#f-droid"
+  googleplay="https://play.google.com/store/apps/details?id=com.frostnerd.smokescreen"
+  source="https://git.frostnerd.com/PublicAndroidApps/smokescreen"
+%}
+
+<h1 id="dns-ios-clients" class="anchor">
+  <a href="#dns-ios-clients">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Encrypted DNS Client Recommendations for iOS
+</h1>
+
+{%
+  include cardv2.html
+  title="DNSCloak"
+  image="/assets/img/png/3rd-party/dnscloak.png"
+  description='An open-source iOS client supporting DNS-over-HTTPS, DNSCrypt, and <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki">dnscrypt-proxy</a> options such as caching DNS responses, locally logging DNS queries, and custom block lists. Users can <a href="https://blog.privacytools.io/adding-custom-dns-over-https-resolvers-to-dnscloak/">add custom resolvers by DNS stamp</a>.'
+  website="https://github.com/s-s/dnscloak/blob/master/README.md"
+  privacy-policy="https://drive.google.com/file/d/1050No_pU74CAWUS5-BwQWyO2x_aiMzWc/view"
+  forum="https://forum.privacytools.io/t/discussion-dnscloak/3566"
+  ios="https://apps.apple.com/app/id1452162351"
+  github="https://github.com/s-s/dnscloak"
+%}
+
+<h2 id="appledns" class="anchor">
+  <a href="#appledns">
+    <i class="fas fa-link anchor-icon"></i>
+  </a>Apple's native support
+</h2>
+
+<p>
+  In iOS, iPadOS, tvOS 14 and macOS 11, DoT and DoH were introduced. DoT and DoH are supported natively by installation of profiles (through mobileconfig files opened in <em>Safari</em>).
+  After installation, the encrypted DNS server can be selected in <em>Settings &rarr; General &rarr; VPN and Network &rarr; DNS</em>.
+</p>
+
+<ul>
+  <li><strong>Signed profiles</strong> are offered by <a href="https://adguard.com/en/blog/encrypted-dns-ios-14.html">AdGuard</a> and <a href="https://apple.nextdns.io/">NextDNS</a>.</li>
+  <li>User contributed <strong>unsigned profiles</strong> for several DNS providers are hosted by <a href="https://encrypted-dns.party/">encrypted-dns.party</a>.</li>
+</ul>
+
+<h2 id="dns-definitions" class="anchor">
+  <a href="#dns-definitions">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Definitions
+</h2>
+
+<h4>DNS-over-TLS (DoT)</h4>
+<p>
+  A security protocol for encrypted DNS on a dedicated port 853. Some providers support port 443 which generally works everywhere while port 853 is often blocked by restrictive firewalls.
+</p>
+
+<h4>DNS-over-HTTPS (DoH)</h4>
+<p>
+  Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443 and more difficult to block. {% include badge.html color="warning" text="Warning" tooltip="DoH contains metadata such as user-agent (which may include system information) that is sent to the DNS server." link="https://tools.ietf.org/html/rfc8484#section-8.2" icon="fas fa-exclamation-triangle" %}
+</p>
+
+<h4>DNSCrypt</h4>
+<p>
+  With an <a href="https://dnscrypt.info/protocol/">open specification</a>, DNSCrypt is an older, yet robust method for encrypting DNS.
+</p>
+
+<h4>Anonymized DNSCrypt</h4>
+<p>
+  A <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Anonymized-DNS">lightweight protocol</a> that hides the client IP address by using pre-configured relays to forward encrypted DNS data. This is a relatively new protocol created in 2019 currently only supported by <a href="#dns-desktop-clients">dnscrypt-proxy</a> and a limited number of <a href="https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/relays.md">relays</a>.
+</p>
--- a/_includes/sections/email-clients.html
+++ b/_includes/sections/email-clients.html
@ -0,0 +1,99 @@
+<h1 id="desktopclients" class="anchor"><a href="#desktopclients"><i class="fas fa-link anchor-icon"></i></a> Desktop Email Clients</h1>
+
+{% include cardv2.html
+  title="Thunderbird"
+  image="/assets/img/svg/3rd-party/thunderbird.svg"
+  description="Thunderbird is a free, open source, cross-platform email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client developed by the Thunderbird community, and previously by the Mozilla Foundation."
+  website="https://www.thunderbird.net/"
+  privacy-policy="https://www.mozilla.org/privacy/thunderbird/"
+  forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
+  source="https://hg.mozilla.org/comm-central/"
+  windows="https://www.thunderbird.net"
+  mac="https://www.thunderbird.net"
+  linux="https://www.thunderbird.net/"
+  freebsd="https://www.freshports.org/mail/thunderbird/"
+  openbsd="http://openports.se/mail/mozilla-thunderbird"
+  netbsd="http://pkgsrc.se/mail/thunderbird"
+%}
+
+{% include cardv2.html
+  title="Mailpile"
+  image="/assets/img/svg/3rd-party/mailpile.svg"
+  description="Mailpile is a free, community funded, open source email client with user-friendly encryption and privacy features."
+  website="https://www.mailpile.is/"
+  privacy-policy="https://www.mailpile.is/privacy.html"
+  tor="clgs64523yi2bkhz.onion"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/mailpile/Mailpile"
+  linux="https://www.mailpile.is/download/linux.html"
+%}
+
+{% include cardv2.html
+  title="Mailvelope"
+  image="/assets/img/svg/3rd-party/mailvelope.svg"
+  description="Mailvelope is a browser extension that enables the exchange of encrypted emails following the OpenPGP encryption standard."
+  website="https://www.mailvelope.com/en"
+  privacy-policy="https://www.mailvelope.com/en/privacy-policy"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/mailvelope/mailvelope"
+  firefox="https://addons.mozilla.org/firefox/addon/mailvelope/"
+  chrome="https://chrome.google.com/webstore/detail/mailvelope/kajibbejlbohfaggdiogboambcijhkke?hl"
+  edge="https://microsoftedge.microsoft.com/addons/detail/mailvelope/dgcbddhdhjppfdfjpciagmmibadmoapc"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://neomutt.org/">NeoMutt</a> - NeoMutt is an open-source command line mail reader (or MUA) for Linux and BSD. It’s a fork of <a href="https://en.wikipedia.org/wiki/Mutt_(email_client)">Mutt</a> with added features.
+</ul>
+
+
+
+<h1 id="mobileclients" class="anchor"><a href="#mobileclients"><i class="fas fa-link anchor-icon"></i></a> Mobile Email Clients</h1>
+
+<h2 id="adroidclients" class="anchor"><a href="#adroidclients"><i class="fas fa-link anchor-icon"></i></a> Android Email Clients</h1>
+
+{% include cardv2.html
+  title="FairEmail"
+  image="/assets/img/svg/3rd-party/fairemail.svg"
+  description="FairEmail is a minimal, open source email app, using open standards (IMAP, SMTP, OpenPGP) with a low data and battery usage."
+  website="https://email.faircode.eu/"
+  privacy-policy="https://github.com/M66B/FairEmail/blob/master/PRIVACY.md"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/M66B/FairEmail"
+  fdroid="https://f-droid.org/en/packages/eu.faircode.email/"
+  googleplay="https://play.google.com/store/apps/details?id=eu.faircode.email"
+%}
+
+{% include cardv2.html
+  title="K-9 Mail"
+  image="/assets/img/svg/3rd-party/k9mail.svg"
+  description="K-9 Mail is an independent mail application that supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP."
+  website="https://k9mail.app/"
+  privacy-policy="https://k9mail.app/privacy"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/k9mail"
+  fdroid="https://f-droid.org/packages/com.fsck.k9/"
+  googleplay="https://play.google.com/store/apps/details?id=com.fsck.k9"
+%}
+
+<h2 id="iosclients" class="anchor"><a href="#iosclients"><i class="fas fa-link anchor-icon"></i></a> iOS Email Clients</h1>
+
+{% include cardv2.html
+  title="Canary Mail"
+  image="/assets/img/svg/3rd-party/canarymail.svg"
+  labels="color==warning::link==https://canarymail.io/faq.html::text==Closed source::tooltip==The source programming code for Canary Mail is not available. Canary Mail is a proprietary application."
+  description="Canary Mail is a paid email client designed to make end-to-end encryption seamless with security features such as a biometric app lock."
+  website="https://canarymail.io/"
+  privacy-policy="https://canarymail.io/privacy.html"
+  forum="https://forum.privacytools.io/t/"
+  ios="https://apps.apple.com/us/app/canary-mail/id1236045954"
+%}
+
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://letterbox-app.org/">Letterbox</a> - Letterbox is a free open-source mail client for iOS made as a part of an ongoing research project at the Freie Universität Berlin, Germany.</li>
+</ul>
+
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@ -0,0 +1,237 @@
+<h1 id="email" class="anchor"><a href="#email"><i class="fas fa-link anchor-icon"></i></a> Recommended Email Services</h1>
+
+<div class="alert alert-success" role="alert">
+  <strong>Our recommended providers operate outside of the US, adopt modern email technology, and meet <a href="/providers/email/#criteria">our other criteria</a> for listing.</strong> We also have a <a href="https://wiki.privacytools.io/view/Comparison_of_email_providers#Provider_comparison">detailed comparison table</a> of the below providers on the wiki.
+</div>
+
+<div class="container-fluid">
+
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/protonmail.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="ProtonMail">
+    </div>
+    <div class="col">
+    <h2 id="protonmail" class="anchor"><a href="#protonmail"><i class="fas fa-link anchor-icon"></i></a> ProtonMail {% include badge.html color="info" text="Free" %}</h2>
+    <p><strong><a href="https://protonmail.com">ProtonMail.com</a></strong> is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since <strong>2013</strong>. ProtonMail is based in Genève, <span class="flag-icon flag-icon-ch"></span> Switzerland. Accounts start with 500 MB storage with their free plan.</p>
+
+    <p>Free accounts have some limitations and do not allow the use of the <a href="https://protonmail.com/bridge">ProtonMail Bridge</a>, which is required to use a <a href="/software/email">recommended email client</a> (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at <strong>€48/y</strong> which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search <code>To:</code>, <code>From:</code>, <code>Date:</code> and <code>Subject:</code> (this is likely to change when <a href="https://reddit.com/comments/cqwk2a/comment/ex21b4e">v4.0</a> of ProtonMail is released).</p>
+
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
+    <p>Paid ProtonMail users can use their own domain with the service. <a href="https://protonmail.com/support/knowledge-base/catch-all/">Catch-all</a> addresses are supported with custom domains for Professional and Visionary plans. ProtonMail also supports <a href="https://protonmail.com/support/knowledge-base/creating-aliases/">subaddressing</a>, which is useful for users who don't want to purchase a domain.</p>
+
+    <h5>{% include badge.html color="success" text="Payment Methods" %}</h5>
+    <p>ProtonMail accepts Bitcoin in addition to accepting credit/debit cards and PayPal.</p>
+
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
+    <p>ProtonMail supports <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> <a href="https://protonmail.com/support/knowledge-base/two-factor-authentication/">two factor authentication</a> only. The use of a <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> security key is not yet supported. ProtonMail is planning to implement U2F upon completion of their <a href="https://reddit.com/comments/cheoy6/comment/feh2lw0/">Single Sign On (SSO)</a> code.</p>
+
+    <h5>{% include badge.html color="success" text="Data Security" %}</h5>
+    <p>ProtonMail has <a href="https://protonmail.com/blog/zero-access-encryption">zero access encryption at rest</a> for your emails, <a href="https://protonmail.com/blog/encrypted-contacts-manager">address book contacts</a>, and <a href="https://protonmail.com/blog/protoncalendar-security-model">calendars</a>. This means the messages and other data stored in your account are only readable by you. </p>
+
+    <h5>{% include badge.html color="success" text="Email Encryption" %}</h5>
+    <p>ProtonMail has <a href="https://protonmail.com/support/knowledge-base/how-to-use-pgp">integrated OpenPGP encryption</a> in their webmail. Emails to other ProtonMail users are encrypted automatically, and encryption to non-ProtonMail users with an OpenPGP key can be enabled easily in your account settings. They also allow you to <a href="https://protonmail.com/support/knowledge-base/encrypt-for-outside-users">encrypt messages to non-ProtonMail users</a> without the need for them to sign up for a ProtonMail account or use software like OpenPGP.</p>
+    <p>ProtonMail also supports the discovery of public keys via HTTP from their <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a>. This allows users outside of ProtonMail to find the OpenPGP keys of ProtonMail users easily, for cross-provider E2EE.</p>
+
+    <h5>{% include badge.html color="success" text=".onion Service" %}</h5>
+    <p>ProtonMail is accessible via Tor at <a href="https://protonirockerxow.onion/">protonirockerxow.onion</a>.</p>
+
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
+    <p>ProtonMail offers a "Visionary" account for €24/Month, which also enables access to ProtonVPN in addition to providing multiple accounts, domains, aliases, and extra storage.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/mailboxorg.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Mailbox">
+    </div>
+    <div class="col">
+    <h2 id="mailbox" class="anchor"><a href="#mailbox"><i class="fas fa-link anchor-icon"></i></a> Mailbox.org {% include badge.html color="info" text="€12/y" %}</h2>
+    <p><strong><a href="https://mailbox.org">Mailbox.org</a></strong> is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since <strong>2014</strong>. Mailbox.org is based in Berlin, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.</p>
+
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
+    <p>Mailbox.org lets users use their own domain and they support <a href="https://kb.mailbox.org/display/MBOKBEN/Using+catch-all+alias+with+own+domain">catch-all</a> addresses. Mailbox.org also supports <a href="https://kb.mailbox.org/display/BMBOKBEN/What+is+an+alias+and+how+do+I+use+it">subaddressing</a>, which is useful for users who don't want to purchase a domain.</p>
+
+    <h5>{% include badge.html color="warning" text="Payment Methods" %}</h5>
+    <p>Mailbox.org doesn't accept Bitcoin or any other cryptocurrencies as a result of their payment processor BitPay suspending operations in Germany. However, they do accept Cash by mail, cash payment to bank account, bank transfer, credit card, PayPal and couple of German-specific processors: paydirekt and Sofortüberweisung.</p>
+
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
+    <p>Mailbox.org supports <a href="https://kb.mailbox.org/display/MBOKBEN/How+to+use+two-factor+authentication+-+2FA">two factor authentication</a> for their webmail only. You can use either <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> or a <a href="https://en.wikipedia.org/wiki/YubiKey">Yubikey</a> via the <a href="https://www.yubico.com/products/services-software/yubicloud">Yubicloud</a>. Web standards such as <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> and <a href="https://en.wikipedia.org/wiki/WebAuthn">WebAuthn</a> are not yet supported.</p>
+
+    <h5>{% include badge.html color="warning" text="Data Security" %}</h5>
+    <p>Mailbox.org allows for encryption of incoming mail using their <a href="https://kb.mailbox.org/display/MBOKBEN/The+Encrypted+Mailbox">encrypted mailbox</a>. New messages that you receive will then be immediately encrypted with your public key.</p>
+    <p>However, <a href="https://en.wikipedia.org/wiki/Open-Xchange">Open-Exchange</a>, the software platform used by Mailbox.org, <a href="https://kb.mailbox.org/display/BMBOKBEN/Encryption+of+calendar+and+address+book">does not support</a> the encryption of your address book and calendar. A <a href="/software/calendar-contacts/">standalone option</a> may be more appropriate for that information.</p>
+
+    <h5>{% include badge.html color="success" text="Email Encryption" %}</h5>
+    <p>Mailbox.org has <a href="https://kb.mailbox.org/display/MBOKBEN/Send+encrypted+e-mails+with+Guard">integrated encryption</a> in their webmail, which simplifies sending messages to users with public OpenPGP keys. They also allow <a href="https://kb.mailbox.org/display/MBOKBEN/My+recipient+does+not+use+PGP">remote recipients to decrypt an email</a> on Mailbox.org's servers. This feature is useful when the remote recipient does not have OpenPGP and cannot decrypt a copy of the email in their own mailbox.</p>
+    <p>Mailbox.org also supports the discovery of public keys via HTTP from their <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a>. This allows users outside of Mailbox.org to find the OpenPGP keys of Mailbox.org users easily, for cross-provider E2EE.</p>
+
+    <h5>{% include badge.html color="warning" text=".onion Service" %}</h5>
+    <p>You can access your Mailbox.org account via IMAP/SMTP using <a href="https://kb.mailbox.org/display/MBOKBEN/The+Tor+exit+node+of+mailbox.org">their .onion service</a>. However, their webmail interface cannot be accessed via their .onion service, and users may experience TLS certificate errors.</p>
+
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
+    <p>All accounts come with limited cloud storage that <a href="https://kb.mailbox.org/display/MBOKBEN/Encrypt+files+on+your+Drive">can be encrypted</a>. Mailbox.org also offers the alias <a href="https://kb.mailbox.org/display/MBOKBEN/Ensuring+E-Mails+are+Sent+Securely">@secure.mailbox.org</a>, which enforces the TLS encryption on the connection between mail servers, otherwise the message will not be sent at all. Mailbox.org also supports <a href="https://en.wikipedia.org/wiki/Exchange_ActiveSync">Exchange ActiveSync</a> in addition to standard access protocols like IMAP and POP3.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/posteo.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Posteo">
+    </div>
+    <div class="col">
+    <h2 id="posteo" class="anchor"><a href="#posteo"><i class="fas fa-link anchor-icon"></i></a> Posteo {% include badge.html color="info" text="€12/y" %}</h2>
+    <p><strong><a href="https://posteo.de">Posteo.de</a></strong> is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since <strong>2009</strong>. Posteo is based in <span class="flag-icon flag-icon-de"></span> Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.</p>
+
+    <h5>{% include badge.html color="warning" text="Domains and Aliases" %}</h5>
+    <p>Posteo does <a href="https://posteo.de/en/site/faq">not allow the use of custom domains</a>, however users may still make use of <a href="https://posteo.de/en/help/what-is-an-email-alias">subaddressing</a>.</p>
+
+    <h5>{% include badge.html color="warning" text="Payment Methods" %}</h5>
+    <p>Posteo does not accept Bitcoin or other cryptocurrencies as a form of payment, however they do accept cash-by-mail. They also accept credit/debit cards, bank transfers, and PayPal, and remove PII (personally identifiable information) <a href="https://posteo.de/en/site/payment">that they receive</a> in connection with these payment methods.</p>
+
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
+    <p>Posteo supports <a href="https://posteo.de/en/help/what-is-two-factor-authentication-and-how-do-i-set-it-up">two factor authentication</a> for their webmail only. You can use either <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> a <a href="https://en.wikipedia.org/wiki/YubiKey">Yubikey</a> with TOTP. Web standards such as <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> and <a href="https://en.wikipedia.org/wiki/WebAuthn">WebAuthn</a> are not yet supported.</p>
+
+    <h5>{% include badge.html color="warning" text="Data Security" %}</h5>
+    <p>Posteo has <a href="https://posteo.de/en/site/encryption#cryptomailstorage">zero access encryption</a> for email storage. This means the messages stored in your account are only readable by you.</p>
+    <p>Posteo also supports the encryption of your <a href="https://posteo.de/en/site/features#featuresaddressbook">address book contacts</a> and <a href="https://posteo.de/en/site/features#featurescalendar">calendars</a> at rest. However, Posteo still uses standard <a href="https://en.wikipedia.org/wiki/CalDAV">CalDAV</a> and <a href="https://en.wikipedia.org/wiki/CardDAV">CardDAV</a> for calendars and contacts. These protocols do not support <a href="https://en.wikipedia.org/wiki/End-to-end_encryption">E2EE (End-To-End Encryption)</a>. A <a href="/software/calendar-contacts/">standalone option</a> may be more appropiate.</p>
+
+    <h5>{% include badge.html color="success" text="Email Encryption" %}</h5>
+    <p>Posteo has <a href="https://posteo.de/en/site/encryption#pgp_webmailer">integrated encryption</a> in their webmail, which simplifies sending messages to users with public OpenPGP keys. They also support the discovery of public keys via HTTP from their <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a>. This allows users outside of Posteo to find the OpenPGP keys of Posteo users easily, for cross-provider E2EE.</p>
+
+    <h5>{% include badge.html color="danger" text=".onion Service" %}</h5>
+    <p>Posteo does not operate a .onion service.</p>
+
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
+    <p>Posteo allows users to <a href="https://posteo.de/en/help/does-posteo-offer-mailing-lists">set up their own mailing lists</a>. Each account can create one list for free.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/disroot.svg"
+        data-theme-src="/assets/img/svg/3rd-party/disroot-dark.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Disroot">
+    </div>
+    <div class="col">
+    <h2 id="disroot" class="anchor"><a href="#disroot"><i class="fas fa-link anchor-icon"></i></a> Disroot {% include badge.html color="info" text="Free" %}</h2>
+    <p><strong><a href="https://disroot.org/en/services/email">Disroot</a></strong> offers email amongst <a href="https://disroot.org/en/#services">other services</a>. The service is maintained by volunteers and its community. They have been in operation since <strong>2015</strong>. Disroot is based in <span class="flag-icon flag-icon-nl"></span> Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.</p>
+
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
+    <p>Disroot lets users use their own domain. They have aliases, however you must <a href="https://disroot.org/en/forms/alias-request-form">manually apply</a> for them.</p>
+
+    <h5>{% include badge.html color="success" text="Payment Methods" %}</h5>
+    <p>Disroot accepts Bitcoin and Faircoin as payment methods. They also accept PayPal, direct bank deposit, and Patreon payments. Disroot is a not-for-profit organization that also accepts donations through Liberapay, Flattr, and Monero, but these payment methods cannot be used to purchase services.</p>
+
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
+    <p>Disroot supports <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> two factor authentication for webmail only. They do not allow <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> security key authentication.</p>
+
+    <h5>{% include badge.html color="warning" text="Data Security" %}</h5>
+    <p>Disroot uses full disk encryption. However, it doesn't appear to be "zero access", meaning it is technically possible for them to decrypt the data they have.</p>
+    <p>Disroot also uses the standard <a href="https://en.wikipedia.org/wiki/CalDAV">CalDAV</a> and <a href="https://en.wikipedia.org/wiki/CardDAV">CardDAV</a> protocols for calendars and contacts, which do not support E2EE. A <a href="/software/calendar-contacts/">standalone option</a> may be more appropriate.</p>
+
+    <h5>{% include badge.html color="success" text="Email Encryption" %}</h5>
+    <p>Disroot allows for encrypted emails to be sent from their webmail application using OpenPGP. However, Disroot has not integrated a <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a> for users on their platform.</p>
+
+    <h5>{% include badge.html color="danger" text=".onion Service" %}</h5>
+    <p>Disroot does not operate a .onion service.</p>
+
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
+    <p>They offer <a href="https://disroot.org/en/#services">other services</a> such as NextCloud, XMPP Chat, Etherpad, Ethercalc, Pastebin, Online polls and a Gitea instance. They also have an app <a href="https://f-droid.org/packages/org.disroot.disrootapp/">available in F-Droid</a>.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/tutanota.svg"
+        data-theme-src="/assets/img/svg/3rd-party/tutanota-dark.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Tutanota">
+    </div>
+    <div class="col">
+    <h2 id="tutanota" class="anchor"><a href="#tutanota"><i class="fas fa-link anchor-icon"></i></a> Tutanota {% include badge.html color="info" text="Free" %}</h2>
+    <p><strong><a href="https://tutanota.com">Tutanota.com</a></strong> is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since <strong>2011</strong> and is based in Hanover, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 1GB storage with their free plan.</p>
+    <p>Tutanota <a href="https://tutanota.com/faq/#imap">doesn't allow</a> the use of third-party <a href="/software/email/">email clients</a>. There are plans to allow Tutanota pull email from <a href="https://github.com/tutao/tutanota/issues/544">external email accounts</a> using the <a href="https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol">IMAP</a> protocol. <a href="https://github.com/tutao/tutanota/issues/630">Email import</a> is currently not possible.</p>
+    <p>Emails can be exported <a href="https://tutanota.com/howto#generalMail">individually or by bulk selection</a>. Tutanota does not allow for <a href="https://github.com/tutao/tutanota/issues/927">subfolders</a> as you might expect with other email providers.</p>
+    <p>Tutanota is working on a <a href="https://tutanota.com/blog/posts/desktop-clients/">desktop client</a> and they have an app <a href="https://f-droid.org/packages/de.tutao.tutanota">available in F-Droid</a>. They also have their app in conventional stores such as <a href="https://apps.apple.com/us/app/tutanota/id922429609">App Store</a> on iOS and <a href="https://play.google.com/store/apps/details?id=de.tutao.tutanota">Google Play</a> for Android.</p>
+
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
+    <p>Paid Tutanota accounts can use up to 5 <a href="https://tutanota.com/faq#alias">aliases</a> and <a href="https://tutanota.com/faq#custom-domain">custom domains</a>. Tutanota doesn't allow for <a href="https://tutanota.com/faq#plus">subaddressing (plus addresses)</a>, but you can use a <a href="https://tutanota.com/howto#settings-global">catch-all</a> with a custom domain.</p>
+
+    <h5>{% include badge.html color="danger" text="Payment Methods" %}</h5>
+    <p>Tutanota accepts only credit cards and PayPal.</p>
+
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
+    <p>Tutanota supports <a href="https://tutanota.com/faq#2fa">two factor authentication</a>. Users can either use <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> or <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a>. U2F support is <a href="https://github.com/tutao/tutanota/issues/443">not yet available on Android</a>.</p>
+
+    <h5>{% include badge.html color="success" text="Data Security" %}</h5>
+    <p>Tutanota has <a href="https://tutanota.com/faq#what-encrypted">zero access encryption at rest</a> for your emails, <a href="https://tutanota.com/faq#encrypted-address-book">address book contacts</a>, and <a href="https://tutanota.com/faq#calendar">calendars</a>. This means the messages and other data stored in your account are only readable by you. </p>
+
+    <h5>{% include badge.html color="warning" text="Email Encryption" %}</h5>
+    <p>Tutanota <a href="https://www.tutanota.com/faq/#pgp">does not use OpenPGP</a>. Tutanota users can only receive encrypted emails when external users send them through a <a href="https://www.tutanota.com/howto/#encrypted-email-external">temporary Tutanota mailbox</a>.</p>
+    <p>Tutanota <a href="https://github.com/tutao/tutanota/issues/198">does have plans</a> to support <a href="https://autocrypt.org">AutoCrypt</a>. This would allow for external users to send encrypted emails to Tutanota users as long as their email client supports the AutoCrypt headers.</p>
+
+    <h5>{% include badge.html color="danger" text=".onion Service" %}</h5>
+    <p>Tutanota does not operate a .onion service but <a href="https://github.com/tutao/tutanota/issues/528">may consider</a> it in the future.</p>
+
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
+    <p>Tutanota offers the business version of <a href="https://tutanota.com/blog/posts/secure-email-for-non-profit">Tutanota to non-profit organizations</a> for free or with a heavy discount.</p>
+
+    <p>Tutanota also has a business feature called <a href="https://tutanota.com/secure-connect/">Secure Connect</a>. This ensures customer contact to the business uses E2EE. The feature costs €240/y.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/startmail.svg"
+        data-theme-src="/assets/img/svg/3rd-party/startmail-dark.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="StartMail">
+    </div>
+    <div class="col">
+    <h2 id="startmail" class="anchor"><a href="#startmail"><i class="fas fa-link anchor-icon"></i></a> StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}</h2>
+    <p><strong><a href="https://startmail.com">StartMail.com</a></strong> is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since <strong>2014</strong> and is based in Boulevard 11, Zeist <span class="flag-icon flag-icon-nl"></span> Netherlands. Accounts start with 10GB. They offer a 30-day trial.</p>
+
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
+    <p>Personal accounts can use <a href="https://support.startmail.com/hc/en-us/articles/360007297457-Aliases">Custom or Generated</a> aliases. Business accounts can use <a href="https://support.startmail.com/hc/en-us/articles/360006840058">Domain aliases</a>.</p>
+
+    <h5>{% include badge.html color="warning" text="Payment Methods" %}</h5>
+    <p>StartMail accepts Visa, MasterCard, American Express and Paypal. StartMail also has other <a href="https://support.startmail.com/hc/en-us/articles/360006620637-Payment-methods">payment options</a> such as Bitcoin (currently only for Personal accounts) and SEPA Direct Debit for accounts older than a year.</p>
+
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
+    <p>StartMail supports <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> two factor authentication <a href="https://support.startmail.com/hc/en-us/articles/360006682158-Two-factor-authentication-2FA">for webmail only</a>. They do not allow <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> security key authentication.</p>
+
+    <h5>{% include badge.html color="warning" text="Data Security" %}</h5>
+    <p>StartMail has <a href="https://www.startmail.com/en/whitepaper/#_Toc458527835">zero access encryption at rest</a>, using their "user vault" system. When a user logs in, the vault is opened, and the email is then moved to the vault out of the queue where it is decrypted by the corresponding private key.</p>
+
+    <p>StartMail supports importing <a href="https://support.startmail.com/hc/en-us/articles/360006495557-Import-contacts">contacts</a> however, they are only accessible in the webmail and not through protocols such as <a href="https://en.wikipedia.org/wiki/CalDAV">CalDAV</a>. Contacts are also not stored using zero knowledge encryption, so a <a href="/software/calendar-contacts/">standalone option</a> may be more appropriate.</p>
+
+    <h5>{% include badge.html color="success" text="Email Encryption" %}</h5>
+    <p>StartMail has <a href="https://support.startmail.com/hc/en-us/sections/360001889078-Encryption">integrated encryption</a> in their webmail, which simplifies sending messages to users with public OpenPGP keys.</p>
+
+    <h5>{% include badge.html color="danger" text=".onion Service" %}</h5>
+    <p>StartMail does not operate a .onion service.</p>
+
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
+    <p>StartMail allows for proxying of images within emails. If a user allows the remote image to be loaded, the sender won't know what the user's IP address is.</p>
+    </div>
+  </div>
+</div>
--- a/_includes/sections/email-warning.html
+++ b/_includes/sections/email-warning.html
@ -0,0 +1,10 @@
+
+<div class="card border-danger">
+  <div class="card-header text-danger"><i class="fas fa-exclamation-circle fa-fw"></i> Warning</div>
+    <div class="card-body">
+      <p class="card-text text-danger">When using end-to-end encryption (E2EE) technology like <a href="https://en.wikipedia.org/wiki/Pretty_Good_Privacy">OpenPGP</a>, email will still have some metadata that is not encrypted in the header of the email. <a href="/providers/email/#metadata">Read more about email metadata.</a></p>
+      <p class="card-text text-danger">OpenPGP also does not support <a href="https://en.wikipedia.org/wiki/Forward_secrecy">Forward secrecy</a>, which means if either your or the recipient's private key is ever stolen, <strong>all</strong> previous messages encrypted with it will be exposed. <a href="/providers/email/#email-encryption">How do I protect my private keys?</a></p>
+      <p class="card-text text-secondary">Rather than use email for prolonged conversations, consider using a medium that does support Forward secrecy.</p>
+      <a href="/software/real-time-communication/" class="btn btn-outline-secondary">Recommended Instant Messengers</a>
+    </div>
+</div>
--- a/_includes/sections/file-encryption.html
+++ b/_includes/sections/file-encryption.html
@ -0,0 +1,80 @@
+<h1 id="encrypt" class="anchor"><a href="#encrypt"><i class="fas fa-link anchor-icon"></i></a> File Encryption Software</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently not using encryption software for your hard disk, emails, or file archives, you should pick one here.</strong>
+</div>
+
+{%
+  include cardv2.html
+  title="VeraCrypt - Disk Encryption"
+  image="/assets/img/svg/3rd-party/veracrypt.svg"
+  image-dark="/assets/img/svg/3rd-party/veracrypt-dark.svg"
+  description="<strong>VeraCrypt</strong> is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file or encrypt a partition or the entire storage device with pre-boot authentication. VeraCrypt is a fork of the discontinued TrueCrypt project. It was initially released on June 22, 2013. According to its developers, security improvements have been implemented and issues raised by the initial TrueCrypt code audit have been addressed."
+  website="https://veracrypt.fr/"
+  forum="https://forum.privacytools.io/t/discussion-veracrypt-file-encryption/1532"
+  git="https://www.veracrypt.fr/code/"
+  windows="https://www.veracrypt.fr/en/Downloads.html"
+  linux="https://www.veracrypt.fr/en/Downloads.html"
+  mac="https://www.veracrypt.fr/en/Downloads.html"
+%}
+
+{%
+  include cardv2.html
+  title="GNU Privacy Guard - Email Encryption"
+  image="/assets/img/svg/3rd-party/gnupg.svg"
+  description="<strong>GnuPG</strong> is a GPL-licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German government."
+  website="https://gnupg.org/"
+  privacy-policy="https://gnupg.org/privacy-policy.html"
+  forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533"
+  git="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git"
+  windows="https://gpg4win.org/download.html"
+  linux="https://gnupg.org/download/index.html#binary"
+  freebsd="https://www.freshports.org/security/gnupg/"
+  openbsd="http://openports.se/security/gnupg"
+  netbsd="http://pkgsrc.se/security/gnupg"
+  mac="https://gpgtools.org/"
+  fdroid="https://f-droid.org/app/org.sufficientlysecure.keychain"
+  googleplay="https://play.google.com/store/apps/details?id=org.sufficientlysecure.keychain"
+%}
+
+{%
+  include cardv2.html
+  title="7 Zip"
+  image="/assets/img/svg/3rd-party/7zip.svg"
+  description='<strong>7-Zip</strong> is a free and open-source file archiver, a utility used to place groups of files within compressed containers. On Linux, MacOS etc. the command-line tool <a href="http://p7zip.sourceforge.net/"><strong>p7zip</strong></a> is used and integrates into various interfaces such as <a href="https://wiki.gnome.org/Apps/FileRoller">FileRoller</a>, <a href="https://github.com/ib/xarchiver">Xarchiver</a>, <a href="https://kde.org/applications/utilities/ark">Ark</a>.'
+  website="https://7-zip.org"
+  forum="https://forum.privacytools.io/t/discussion-7-zip/3024"
+  source="https://sourceforge.net/projects/sevenzip/files/"
+  windows="https://7-zip.org/download.html"
+  linux="https://sourceforge.net/projects/p7zip/files"
+  freebsd="https://www.freshports.org/archivers/p7zip"
+  openbsd="https://sourceforge.net/projects/p7zip"
+  netbsd="https://sourceforge.net/projects/p7zip"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li>
+    <a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.
+    {% include badge.html
+      color="warning"
+      text="Closed source"
+      icon="fas fa-exclamation-triangle"
+      link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"
+      tooltip="Cryptomator's mobile apps are not open-source."
+    %}
+  </li>
+  <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
+  <li><a href="https://www.dyne.org/software/tomb/">Tomb</a> - A simple zsh script for making LUKS containers on the commandline.</li>
+  <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</li>
+    <li>
+      <a href="https://kryptor.co.uk/">Kryptor</a> is a file encryption program for Windows, MacOS, and Linux.
+      {% include badge.html
+        color="warning"
+        icon="fas fa-exclamation-triangle"
+        text="Beta"
+        tooltip="As Kryptor is still in beta, it may not be stable."
+      %}
+    </li>
+</ul>
--- a/_includes/sections/file-sharing.html
+++ b/_includes/sections/file-sharing.html
@ -0,0 +1,46 @@
+<h1 id="filesharing" class="anchor"><a href="#filesharing"><i class="fas fa-link anchor-icon"></i></a> File Sharing</h1>
+
+{% include cardv2.html
+  title="OnionShare"
+  image="/assets/img/svg/3rd-party/onionshare.svg"
+  website="https://onionshare.org/"
+  tor="http://lldan5gahapx5k7iafb3s4ikijc4ni7gx5iywdflkba5y2ezyg6sjgyd.onion/"
+  description="OnionShare is an open-source tool that lets you securely and anonymously share a file of any size. It works by starting a web server accessible as a Tor onion service, with an unguessable URL that you can share with the recipients to download or send files."
+  forum="https://forum.privacytools.io/t/discussion-onionshare/754"
+  github="https://github.com/micahflee/onionshare"
+  windows="https://onionshare.org/#downloads"
+  mac="https://onionshare.org/#downloads"
+  linux="https://onionshare.org/#downloads"
+  freebsd="https://www.freshports.org/www/onionshare/"
+  openbsd="http://openports.se/net/onionshare"
+%}
+
+{% include cardv2.html
+  title="Magic Wormhole"
+  image="/assets/img/png/3rd-party/magic_wormhole.png"
+  website="https://magic-wormhole.readthedocs.io"
+  description="Magic Wormhole is a package that provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. Their motto: \"Get things from one computer to another, safely.\""
+  forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756"
+  github="https://github.com/warner/magic-wormhole"
+  windows="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+  mac="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+  linux="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+  freebsd="https://www.freshports.org/net/py-magic-wormhole/"
+  openbsd="https://pypi.org/project/magic-wormhole/"
+  netbsd="https://pypi.org/project/magic-wormhole/"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://framadrop.org/">FramaDrop</a> - Stores a file of any size for 24h. Data is end-to-end encrypted from your browser, powered by <a href="https://framagit.org/fiat-tux/hat-softwares/lufi">LuFi</a>.
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://framasoft.org/en/cgu/"
+    tooltip="FramaDrop logs IP addresses and fingerprints the browser for an unclear amount of time."
+    %}
+  </li>
+  <li><a href="https://github.com/schollz/croc">croc</a> - Easily and securely send arbitrary-sized files from one computer to another. Similar to Magic Wormhole but without dependencies.</li>
+  <li><a href="https://freedombox.org/">FreedomBox</a> - Designed to be your own inexpensive server at home. It runs free software and offers an increasing number of services ranging from a calendar or XMPP server, to a wiki, or VPN.</li>
+</ul>
--- a/_includes/sections/file-sync.html
+++ b/_includes/sections/file-sync.html
@ -0,0 +1,29 @@
+<h1 id="sync" class="anchor">
+  <a href="#sync">
+    <i class="fas fa-link anchor-icon"></i>
+  </a>
+  File Sync
+</h1>
+
+{%
+  include cardv2.html
+  title="Syncthing"
+  image="/assets/img/svg/3rd-party/syncthing.svg"
+  description="<strong>Syncthing</strong> replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party, and how it is transmitted over the Internet."
+  website="https://syncthing.net/"
+  forum="https://forum.privacytools.io/t/discussion-syncthing/1627/2"
+  github="https://github.com/syncthing?type=source"
+  windows="https://github.com/syncthing/syncthing-gtk/releases/latest"
+  linux="https://github.com/syncthing/syncthing-gtk/releases/latest"
+  mac="https://github.com/syncthing/syncthing-macos/releases/latest"
+  fdroid="https://f-droid.org/packages/com.github.catfriend1.syncthingandroid/"
+  googleplay="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li>
+    <a href="https://git-annex.branchable.com/">git-annex</a> - Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle, whether due to limitations in memory, time, or disk space.
+  </li>
+</ul>
--- a/_includes/sections/fourteen-eyes.html
+++ b/_includes/sections/fourteen-eyes.html
@ -0,0 +1,45 @@
+<h1 id="ukusa" class="anchor"><a href="#ukusa"><i class="fas fa-link anchor-icon"></i></a> Global Mass Surveillance - The Fourteen Eyes</h1>
+
+<img src="/assets/img/svg/layout/ukusa.svg" width="260" height="115" class="img-fluid float-right ml-2" alt="UKUSA Agreement">
+
+<p>The UKUSA Agreement is an agreement between the United Kingdom, United States, Australia, Canada, and New Zealand to cooperatively collect, analyze, and share intelligence. Members of this group, known as the <a href="https://www.giswatch.org/en/communications-surveillance/unmasking-five-eyes-global-surveillance-practices">Five Eyes</a>, focus on gathering and analyzing intelligence from different parts of the world. While Five Eyes countries have agreed to <a href="https://www.pbs.org/newshour/world/an-exclusive-club-the-five-countries-that-dont-spy-on-each-other">not spy on each other</a> as adversaries, leaks by Snowden have revealed that some Five Eyes members monitor each other's citizens and <a href="https://www.theguardian.com/uk/2013/jun/21/gchq-cables-secret-world-communications-nsa">share intelligence</a> to <a href="https://www.theguardian.com/politics/2013/jun/10/nsa-offers-intelligence-british-counterparts-blunkett">avoid breaking domestic laws</a> that prohibit them from spying on their own citizens. The Five Eyes alliance also cooperates with groups of third-party countries to share intelligence (forming the Nine Eyes and Fourteen Eyes); however, Five Eyes and third-party countries can and do spy on each other.</p>
+
+<div class="row mb-3">
+  {% include panel.html color="danger"
+  title="Five Eyes"
+  body='
+  <ol class="card-ol">
+    <li>Australia <div class="float-right"><span class="flag-icon flag-icon-au"></span></div></li>
+    <li>Canada <div class="float-right"><span class="flag-icon flag-icon-ca"></span></div></li>
+    <li>New Zealand <div class="float-right"><span class="flag-icon flag-icon-nz"></span></div></li>
+    <li>United Kingdom <div class="float-right"><span class="flag-icon flag-icon-gb"></span></div></li>
+    <li>United States of America <div class="float-right"><span class="flag-icon flag-icon-us"></span></div></li>
+  </ol>
+  '
+  %}
+
+  {% include panel.html color="warning"
+  title="Nine Eyes"
+  body='
+  <ol class="card-ol">
+    <li>Denmark <div class="float-right"><span class="flag-icon flag-icon-dk"></span></div></li>
+    <li>France <div class="float-right"><span class="flag-icon flag-icon-fr"></span></div></li>
+    <li>Netherlands <div class="float-right"><span class="flag-icon flag-icon-nl"></span></div></li>
+    <li>Norway <div class="float-right"><span class="flag-icon flag-icon-no"></span></div></li>
+  </ol>
+  '
+  %}
+
+  {% include panel.html color="secondary"
+  title="Fourteen Eyes"
+  body='
+  <ol class="card-ol">
+    <li>Belgium <div class="float-right"><span class="flag-icon flag-icon-be"></span></div></li>
+    <li>Germany <div class="float-right"><span class="flag-icon flag-icon-de"></span></div></li>
+    <li>Italy <div class="float-right"><span class="flag-icon flag-icon-it"></span></div></li>
+    <li>Spain <div class="float-right"><span class="flag-icon flag-icon-es"></span></div></li>
+    <li>Sweden <div class="float-right"><span class="flag-icon flag-icon-se"></span></div></li>
+  </ol>
+  '
+  %}
+</div>
--- a/_includes/sections/header.html
+++ b/_includes/sections/header.html
@ -0,0 +1,20 @@
+<div class="jumbotron p-5">
+  <h1 class="display-4">
+    <a href="{{ site.production_url }}" title="{{ site.name }}">
+      <img class="img-fluid d-none d-sm-block" src="/assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="{{ site.name }}">
+      <div class="text-center">
+        <img class="img-fluid d-sm-none" src="/assets/img/svg/layout/brand/vertical.svg" width="300px" alt="{{ site.name }}">
+      </div>
+    </a>
+  </h1>
+  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. {{ site.name }} provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
+</div>
+
+<form method="POST" action="https://search.privacytools.io/" id="search_form" role="search">
+<div class="input-group col-12 col-md-8 offset-md-2">
+<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try {{ site.name }} Search, a Privacy-Respecting Search Engine" autocomplete="off" value="">
+<span class="input-group-btn">
+<button type="submit" class="btn btn-primary input-lg"><span class="hide_if_nojs"><i class="fas fa-search"></i> </span><span class="hidden active_if_nojs">start search</span></button>
+</span>
+</div>
+</form>
--- a/_includes/sections/hosting-provider.html
+++ b/_includes/sections/hosting-provider.html
@ -0,0 +1,23 @@
+<h1 id="host" class="anchor"><a href="#host"><i class="fas fa-link anchor-icon"></i></a> Secure Hosting Provider</h1>
+
+{% include cardv2.html
+  title="Data Center: Bahnhof"
+  image="/assets/img/svg/3rd-party/bahnhof.svg"
+  image-dark="/assets/img/svg/3rd-party/bahnhof-dark.svg"
+  description="Bahnhof is one of Sweden’s largest network operators, founded in 1994. They specialize in innovative data center construction: Extreme security coupled with low-cost green energy has made them world famous."
+  website="https://www.bahnhof.net/"
+  privacy-policy="https://bahnhof.se/filestorage/userfiles/file/PrivacyPolicy_Bahnhof.pdf"
+  forum="https://forum.privacytools.io/t/discussion-bahnhof-net/341"
+%}
+
+{% include cardv2.html
+  title="VPS & Domain: Njalla"
+  image="/assets/img/svg/3rd-party/njalla.svg"
+  image-dark="/assets/img/svg/3rd-party/njalla-dark.svg"
+  description="Njalla is a privacy-aware domain registration service and VPS provider based in Nevis (with VPS data centers in Sweden). It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, Zcash, DASH, Bitcoin Cash and PayPal."
+  website="https://njal.la/"
+  labels="color==warning::link==https://github.com/privacytools/privacytools.io/issues/1920::text==Warning::tooltip==Njalla blocks port 25 traffic."
+  tor="http://njalladnspotetti.onion"
+  forum="https://forum.privacytools.io/t/discussion-njalla/339"
+%}
+
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@ -0,0 +1,182 @@
+<h1 id="im" class="anchor">
+  <a href="#im"><i class="fas fa-link anchor-icon"></i></a>
+  Encrypted Instant Messengers
+</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using an Instant Messenger like Telegram, LINE, Viber, <a href="https://www.eff.org/deeplinks/2016/10/where-whatsapp-went-wrong-effs-four-biggest-security-concerns">WhatsApp</a>, or plain SMS, you should pick an alternative here.</strong></div>
+
+<p>We only recommend instant messenger programs or apps that support <a href="https://en.wikipedia.org/wiki/End-to-end_encryption">end-to-end encryption (E2EE)</a>. When E2EE is used, all transmissions (messages, voice, video, etc.) are encrypted <strong>before</strong> they are sent from your device. E2EE protects both the authenticity and confidentiality of the transmission as they pass through any part of the network (servers, etc.).</p>
+
+<p>All the client programs/apps we chose are <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">free and open-source software</a> unless otherwise mentioned. This to ensure that the code can be independently verified by experts now and in the future.</p>
+
+<p>We have described the three main types of messaging programs that exist: Centralized, Federated and Peer-to-Peer (P2P), with the advantages and disadvantages of each.</p>
+
+<h2 id="centralized" class="anchor">
+  <a href="#centralized"><i class="fas fa-link anchor-icon"></i></a>
+  Centralized
+</h2>
+
+<p>Centralized messengers are those where every participant is on the same server or network of servers controlled by the same organization.</p>
+
+{%
+  include cardv2.html
+  title="Signal"
+  image="/assets/img/svg/3rd-party/signal.svg"
+  description='Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging, as well as voice and video calling. All communications are E2EE unless you choose to send as SMS. Its protocol has also been <a href="https://eprint.iacr.org/2016/1013.pdf">indepedently audited (PDF)</a>'
+  labels="color==warning::text==Requires phone number::tooltip==Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|text==VoIP"
+  website="https://signal.org/"
+  privacy-policy="https://signal.org/legal/"
+  forum="https://forum.privacytools.io/t/discussion-signal/664"
+  github="https://github.com/signalapp"
+  windows="https://signal.org/download/"
+  mac="https://signal.org/download/"
+  linux="https://signal.org/download/"
+  googleplay="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
+  android="https://signal.org/android/apk/#apk-danger"
+  ios="https://apps.apple.com/app/signal-private-messenger/id874139669"
+%}
+
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+    <h3>Advantages</h3>
+    <ul>
+      <li>New features and changes can be implemented more quickly.</li>
+      <li>Easier to get started with and to find contacts.</li>
+    </ul>
+    </div>
+  <div class="col-md-6">
+    <h3>Disadvantages</h3>
+    <ul>
+      <li>Centralized services could be more susceptible to <a href="#exploiting-centralized-networks">legislation requiring backdoor access</a>.</li>
+      <li>Can include <a href="https://drewdevault.com/2018/08/08/Signal.html">restricted control or access</a>. This can include things like:</li>
+      <ul>
+        <li>Being <a href="https://github.com/LibreSignal/LibreSignal/issues/37#issuecomment-217211165">forbidden from connecting third-party clients</a> to the centralized network that might provide for greater customization or better user experience. Often defined in Terms and Conditions of usage.</li>
+        <li>Poor or no documentation for third-party developers.</li>
+      </ul>
+      <li>The <a href="https://blog.privacytools.io/delisting-wire">ownership</a>, privacy policy, and operations of the service can change easily when a single entity controls it, potentially compromising the service later on.</li>
+    </ul>
+  </div>
+  </div>
+</div>
+
+<div>
+  <h2 id="federated" class="anchor">
+    <a href="#federated"><i class="fas fa-link anchor-icon"></i></a>
+    Federated
+  </h2>
+
+  <p>Federated messengers use multiple, independent servers that are able to talk to each other (email is one example of a federated service). Federation allows system administrators to control their own server and still be a part of the larger communications network.</p>
+
+{%
+  include cardv2.html
+  title="Element"
+  image="/assets/img/svg/3rd-party/element.svg"
+  description='<a href="https://element.io">Element</a> (formerly <a href="https://element.io/blog/welcome-to-element/">Riot</a>) is the reference client for the <a href="https://matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="https://matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.'
+  labels="text==VoIP"
+  website="https://element.io"
+  privacy-policy="https://element.io/privacy"
+  forum="https://forum.privacytools.io/t/discussion-element-io/665"
+  github="https://github.com/vector-im/element-web"
+  windows="https://element.io/get-started"
+  mac="https://element.io/get-started"
+  linux="https://element.io/get-started"
+  fdroid="https://f-droid.org/packages/im.vector.app/"
+  googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
+  ios="https://apps.apple.com/app/vector/id1083446067"
+  web="https://app.element.io"
+%}
+
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+      <h3>Advantages</h3>
+      <ul>
+        <li>Allows for greater control over your own data when running your own server.</li>
+        <li>Allows you to choose who to trust your data with by choosing between multiple "public" servers.</li>
+        <li>Often allows for third party clients which can provide a more native, customized, or accessible experience.</li>
+        <li>Generally a less juicy target for governments wanting <a href="#exploiting-centralized-networks">backdoor access to everything</a> as the trust is decentralized. The server may be hosted independently from the organization developing the software.</li>
+        <li>Server software can be verified that it matches public source code, assuming you have access to the server or you trust the person who does (e.g., a family member)</li>
+        <li>Third-party developers can contribute code and add new features, instead of waiting for a private development team to do so.</li>
+      </ul>
+    </div>
+    <div class="col-md-6">
+      <h3>Disadvantages</h3>
+      <ul>
+        <li>Adding new features is more complex, because these features need to be standardized and tested to ensure they work with all servers on the network.</li>
+        <li>Some metadata may be available (e.g., information like "who is talking to whom," but not actual message content if E2EE is used).</li>
+        <li>Federated servers generally require trusting your server's administrator. They may be a hobbyist or otherwise not a "security professional," and may not serve standard documents like a privacy policy or terms of service detailing how your data is utilized.</li>
+        <li>Server administrators sometimes choose to block other servers, which are a source of unmoderated abuse or break general rules of accepted behavior. This will hinder your ability to communicate with users on those servers.</li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+<div>
+  <h4>Worth Mentioning</h4>
+
+  <ul>
+    <li><a href="https://status.im">Status.im</a> - Encrypted instant messenger with an integrated <a href="https://en.wikipedia.org/wiki/Ethereum">Ethereum</a> wallet (cryptocurrency) that also includes support for <a href="https://our.status.im/tag/dapps">DApps (decentralized apps)</a> (web apps in a curated store). Uses the <a href="https://our.status.im/status-launches-private-peer-to-peer-messaging-protocol/">Waku protocol (a fork of Whisper)</a> for P2P communication. Only available for iOS and Android.</li>
+  </ul>
+
+  <h2 id="peer-to-peer" class="anchor">
+    <a href="#peer-to-peer"><i class="fas fa-link anchor-icon"></i></a>
+    Peer to Peer (P2P)
+  </h2>
+
+  <p>Peer-to-Peer instant messengers connect directly to each other without requiring third-party servers. Clients (peers) usually find each other through the use of a <a href="https://en.wikipedia.org/wiki/Distributed_computing">distributed computing</a> network. Examples of this include <a href="https://en.wikipedia.org/wiki/Distributed_hash_table">DHT (distributed hash table)</a> (used with technologies like <a href="https://en.wikipedia.org/wiki/BitTorrent_(protocol)">torrents</a> and <a href="https://en.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a>, for example). Another approach is proximity based networks, where a connection is established over WiFi or Bluetooth (for example, Briar or the <a href="https://www.scuttlebutt.nz">Scuttlebutt</a> social networking protocol). Once a peer has found a route to its contact via any of these methods, a direct connection between them is made.</p>
+
+{%
+  include cardv2.html
+  title="Briar"
+  image="/assets/img/svg/3rd-party/briar.svg"
+  description="Encrypted instant messenger that connects to contacts via Wi-Fi, Bluetooth, or Tor over the internet to synchronize messages. Technology such as this has proven to be useful when Internet availability is an issue, such as in times of crisis."
+  website="https://briarproject.org"
+  privacy-policy="https://briarproject.org/privacy-policy/"
+  forum="https://forum.privacytools.io/t/discussion-briar/2114"
+  gitlab="https://code.briarproject.org/briar/briar"
+  fdroid="https://f-droid.org/packages/org.briarproject.briar.android/"
+  googleplay="https://play.google.com/store/apps/details?id=org.briarproject.briar.android"
+%}
+
+{%
+  include cardv2.html
+  title="Jami"
+  image="/assets/img/svg/3rd-party/jami.svg"
+  description="Encrypted instant messaging and video calling software. All communications are E2EE using <a href=//jami.net/improving-performance-and-security-with-tls-1-3/>TLS 1.3</a> and never stored elsewhere than on user's devices, even when <a href=//jami.net/why-is-jami-truly-distributed/>TURN servers are used</a>."
+  labels="color==warning::link==https://git.jami.net/savoirfairelinux/ring-project/issues/765::text==Warning::tooltip==This software is partially centralized but can be self-hosted.|text==VoIP"
+  website="https://jami.net/"
+  privacy-policy="https://jami.net/privacy-policy/"
+  forum="https://forum.privacytools.io/t/discussion-jami/2116"
+  gitlab="https://git.jami.net/savoirfairelinux"
+  windows="https://jami.net/download-jami-windows"
+  mac="https://jami.net/download-jami-macos"
+  linux="https://jami.net/download-jami-linux"
+  fdroid="https://f-droid.org/packages/cx.ring/"
+  googleplay="https://play.google.com/store/apps/details?id=cx.ring"
+  ios="https://itunes.apple.com/app/ring-a-gnu-package/id1306951055?mt=8"
+%}
+
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+    <h3>Advantages</h3>
+    <ul>
+      <li>Minimal information is exposed to third parties.</li>
+      <li>Modern P2P platforms implement end-to-end encryption by default. There are no servers that could potentially intercept and decrypt your transmissions, unlike centralized and federated models.</li>
+    </ul>
+    </div>
+    <div class="col-md-6">
+      <h3>Disadvantages</h3>
+      <ul>
+        <li>Reduced feature set:</li>
+        <ul>
+          <li>Messages can only be sent when both peers are online, however, your client may store messages locally to wait for the contact to return online.</li>
+          <li>Generally increases battery usage on mobile devices, because the client must stay connected to the distributed network to learn about who is online.</li>
+        </ul>
+        <li>Your <a href="https://en.wikipedia.org/wiki/IP_address">IP address</a> and that of the contacts you're communicating with may be visible if you do not use the software in conjunction with a <a href="/software/networks">self contained network</a>, such as <a href="https://www.torproject.org">Tor</a> or <a href="https://geti2p.net/">I2P</a>. Many countries have some form of mass surveillance and/or metadata retention.</li>
+      </ul>
+    </div>
+  </div>
+</div>
--- a/_includes/sections/key-disclosure-law.html
+++ b/_includes/sections/key-disclosure-law.html
@ -0,0 +1,88 @@
+<h1 id="kdl" class="anchor"><a href="#kdl"><i class="fas fa-link anchor-icon"></i></a> Key Disclosure Law</h1>
+
+<h3>Who is required to hand over the encryption keys to authorities?</h3>
+
+<p>Mandatory <a href="https://en.wikipedia.org/wiki/Key_disclosure_law">key disclosure laws</a> require individuals to turn over encryption keys to law enforcement conducting a criminal investigation. How these laws are implemented (who may be legally compelled to assist) vary from nation to nation, but a warrant is generally required. Defenses against key disclosure laws include steganography and encrypting data in a way that provides plausible deniability.</p>  <p><a href="https://en.wikipedia.org/wiki/Steganography">Steganography</a> involves hiding sensitive information (which may be encrypted) inside of ordinary data (for example, encrypting an image file and then hiding it in an audio file). With plausible deniability, data is encrypted in a way that prevents an adversary from being able to prove that the information they are after exists (for example, one password may decrypt benign data and another password, used on the same file, could decrypt sensitive data).</p>
+
+<div class="row mb-2">
+
+  {% include panel.html color="danger"
+  title="Key disclosure laws apply"
+  body='
+  <ol class="card-ol">
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Antigua_and_Barbuda">Antigua and Barbuda</a> <div class="float-right"><span class="flag-icon flag-icon-ag"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Australia">Australia</a> <div class="float-right"><span class="flag-icon flag-icon-au"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#France">France</a> <div class="float-right"><span class="flag-icon flag-icon-fr"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#India">India</a> <div class="float-right"><span class="flag-icon flag-icon-in"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Ireland">Ireland</a> <div class="float-right"><span class="flag-icon flag-icon-ie"></span></div></li>
+    <li><a href="https://edri.org/norway-introduces-forced-biometric-authentication/">Norway</a> <div class="float-right"><span class="flag-icon flag-icon-no"></span></div></li>
+    <li><a href="https://www.bloomberg.com/news/articles/2018-03-20/telegram-loses-bid-to-stop-russia-from-getting-encryption-keys">Russia</a> <div class="float-right"><span class="flag-icon flag-icon-ru"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#South_Africa">South Africa</a> <div class="float-right"><span class="flag-icon flag-icon-za"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#United_Kingdom">United Kingdom</a> <div class="float-right"><span class="flag-icon flag-icon-gb"></span></div></li>
+  </ol>
+  '
+  %}
+
+  {% include panel.html color="warning"
+  title="Key disclosure laws may apply"
+  body='
+  <ol class="card-ol">
+    <li><a href="https://tweakers.net/nieuws/163116/belgische-rechter-verdachte-mag-verplicht-worden-code-smartphone-af-te-staan.html">Belgium</a> <div class="float-right"><span class="flag-icon flag-icon-be"></span></div></li>
+    <li><a href="https://www.riigiteataja.ee/akt/106012016019">Estonia</a> <div class="float-right"><span class="flag-icon flag-icon-ee"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Finland">Finland *</a> <div class="float-right"><span class="flag-icon flag-icon-fi"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#New_Zealand">New Zealand</a> (unclear) <div class="float-right"><span class="flag-icon flag-icon-nz"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#The_Netherlands">The Netherlands *</a> <div class="float-right"><span class="flag-icon flag-icon-nl"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#United_States">United States</a> (see related info) <div class="float-right"><span class="flag-icon flag-icon-us"></span></div></li>
+  </ol>
+  '
+  %}
+
+  {% include panel.html color="success"
+  title="Key disclosure laws don't apply"
+  body='
+  <ol class="card-ol">
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Canada">Canada</a> <div class="float-right"><span class="flag-icon flag-icon-ca"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Czech_Republic">Czech Republic</a> <div class="float-right"><span class="flag-icon flag-icon-cz"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Germany">Germany</a> <div class="float-right"><span class="flag-icon flag-icon-de"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Iceland">Iceland</a> <div class="float-right"><span class="flag-icon flag-icon-is"></span></div></li>
+    <li><a href="https://iclg.com/practice-areas/cybersecurity-laws-and-regulations/italy">Italy</a> <div class="float-right"><span class="flag-icon flag-icon-it"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Poland">Poland</a> <div class="float-right"><span class="flag-icon flag-icon-pl"></span></div></li>
+    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Sweden">Sweden</a> (proposed) <div class="float-right"><span class="flag-icon flag-icon-se"></span></div></li>
+    <li><a href="https://www.wikipedia.org/wiki/Key_disclosure_law#Switzerland">Switzerland</a> <div class="float-right"><span class="flag-icon flag-icon-ch"></span></div></li>
+  </ol>
+  '
+  %}
+
+</div>
+
+<p> * (people who know how to access a system may be ordered to share their knowledge, <strong>however, this doesn't apply to the suspect itself or family members.</strong>)</p>
+
+<h3>Related Information</h3>
+
+<ul>
+  <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law">Wikipedia page on key disclosure law</a></li>
+  <li><a href="https://law.stackexchange.com/questions/1523/can-a-us-citizen-be-required-to-provide-the-authentication-key-for-encrypted-dat">law.stackexchange.com question about key disclosure law in US</a></li>
+  <li><a href="https://peertube.mastodon.host/videos/watch/e09915eb-5962-4830-a02f-8da5c2b59e71">DEFCON 20: Crypto and the Cops: the Law of Key Disclosure and Forced Decryption</a></li>
+</ul>
+
+<h3 id="usa" class="anchor">Why is it not recommended to choose a US-based service?</h3>
+
+<img src="/assets/img/svg/layout/great_seal_of_the_united_states_obverse.svg" width="200" height="200" class="img-fluid float-right ml-3" alt="USA">
+
+<p>Services based in the United States are not recommended because of the country's surveillance programs and use of <a href="https://www.eff.org/issues/national-security-letters/faq">National Security Letters</a> (NSLs) with accompanying gag orders, which forbid the recipient from talking about the request. This combination allows the government to <a href="https://www.schneier.com/blog/archives/2013/08/more_on_the_nsa.html">secretly force</a> companies to grant complete access to customer data and transform the service into a tool of mass surveillance.</p>
+
+<p>An example of this is <a href="https://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order">Lavabit</a> – a secure email service created by Ladar Levison. The FBI <a href="https://www.vice.com/en_us/article/nzz888/lavabit-founder-ladar-levison-discusses-his-federal-battle-for-privacy">requested</a> Snowden's records after finding out that he used the service. Since Lavabit did not keep logs and email content was stored encrypted, the FBI served a subpoena (with a gag order) for the service's SSL keys. Having the SSL keys would allow them to access
+communications (both metadata and unencrypted content) in real time for all of Lavabit's customers, not just Snowden's.</p>
+
+<p>Ultimately, Levison turned over the SSL keys and <a href="https://www.theguardian.com/commentisfree/2014/may/20/why-did-lavabit-shut-down-snowden-email">shut down</a> the service at the same time. The US government then <a href="https://www.cnbc.com/id/100962389">threatened Levison with arrest</a>, saying that shutting down the service was a violation of the court order.</p>
+
+<h3>Related Information</h3>
+
+<ul>
+  <li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus">Avoid all US and UK based services</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Surespot#History">Proof that warrant canaries work based on the surespot example.</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/UKUSA_Agreement">The United Kingdom – United States of America Agreement (UKUSA)</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order">Lavabit: Suspension and gag order</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law">Key disclosure law</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Portal:Mass_surveillance">Wikipedia Portal: Mass_surveillance</a></li>
+</ul>
--- a/_includes/sections/notebooks.html
+++ b/_includes/sections/notebooks.html
@ -0,0 +1,69 @@
+<h1 id="notebook" class="anchor"><a href="#notebook"><i class="fas fa-link anchor-icon"></i></a> Digital Notebook</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using an application like Evernote, Google Keep, or Microsoft OneNote, you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+  title="Joplin"
+  image="/assets/img/svg/3rd-party/joplin.svg"
+  description="Joplin is a free, open-source, and fully-featured note-taking and to-do application which can handle a large number of markdown notes organized into notebooks and tags. It offers end-to-end encryption and can sync through Nextcloud, Dropbox, and more. It also offers easy import from Evernote and plain-text notes."
+  website="https://joplinapp.org/"
+  privacy-policy="https://joplinapp.org/privacy/"
+  github="https://github.com/laurent22/joplin"
+  windows="https://joplinapp.org/#desktop-applications"
+  mac="https://joplinapp.org/#desktop-applications"
+  linux="https://joplinapp.org/#desktop-applications"
+  freebsd="https://www.npmjs.com/package/joplin"
+  googleplay="https://play.google.com/store/apps/details?id=net.cozic.joplin"
+  android="https://joplinapp.org/#mobile-applications"
+  ios="https://itunes.apple.com/us/app/joplin/id1315599797"
+  firefox="https://addons.mozilla.org/en-US/firefox/addon/joplin-web-clipper/"
+  chrome="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek"
+%}
+
+{% include cardv2.html
+  title="Standard Notes"
+  image="/assets/img/svg/3rd-party/standard_notes.svg"
+  description='Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. It features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors. It has also been <a href="https://s3.amazonaws.com/standard-notes/security/Report-SN-Audit.pdf">independently audited (PDF)</a>.'
+  website="https://standardnotes.org/"
+  privacy-policy="https://standardnotes.org/privacy"
+  github="https://github.com/standardnotes"
+  windows="https://standardnotes.org/#get-started"
+  mac="https://standardnotes.org/#get-started"
+  linux="https://standardnotes.org/#get-started"
+  ios="https://itunes.apple.com/us/app/standard-notes/id1285392450"
+  fdroid="https://f-droid.org/packages/com.standardnotes/"
+  googleplay="https://play.google.com/store/apps/details?id=com.standardnotes"
+  web="https://app.standardnotes.org/"
+%}
+
+{% include cardv2.html
+  title="Turtl"
+  image="/assets/img/svg/3rd-party/turtl.svg"
+  description="Turtl lets you take notes, bookmark websites, and store documents for sensitive projects. From sharing passwords with your coworkers to tracking research on an article you're writing, Turtl keeps it all safe from everyone but you and those you share with."
+  website="https://turtlapp.com/"
+  privacy-policy="https://turtlapp.com/privacy/"
+  github="https://github.com/turtl"
+  windows="https://turtlapp.com/download/"
+  mac="https://turtlapp.com/download/"
+  linux="https://turtlapp.com/download/"
+  googleplay="https://play.google.com/store/apps/details?id=com.lyonbros.turtl"
+  android="https://turtlapp.com/download/"
+  firefox="https://addons.mozilla.org/en-US/firefox/addon/turtl-bookmarking/"
+  chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheihjadlpcml"
+%}
+
+<h3>Warning</h3>
+
+<ul>
+  <li>Note: As of Dec 2018, Joplin does not support password/pin protection for the application itself or individual notes/notebooks. Data is still encrypted in transit and at sync location using your master key. See <a href='https://github.com/laurent22/joplin/issues/289'>open issue</a>.</li>
+</ul>
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://www.etesync.com/">EteSync</a> - Secure, end-to-end encrypted, and privacy respecting sync for your contacts, calendars, tasks and notes.</li>
+  <li><a href="https://paperwork.cloud/">Paperwork</a> - An open-source and self-hosted solution. For PHP / MySQL servers.</li>
+  <li><a href="https://orgmode.org">Org-mode</a> - A major mode for GNU Emacs. Org-mode is for keeping notes, maintaining TODO lists, planning projects, and authoring documents with a fast and effective plain-text system. </li>
+</ul>
--- a/_includes/sections/operating-systems.html
+++ b/_includes/sections/operating-systems.html
@ -0,0 +1,86 @@
+<h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> Introductory Operating Systems</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using an operating system that collects data like Windows 10, you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+  title="Fedora Workstation"
+  image="/assets/img/svg/3rd-party/fedora.svg"
+  description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops. Fedora by default comes with the GNOME desktop environment, other <a href="https://spins.fedoraproject.org/">desktop environments</a> are also available.'
+  badges="info:Linux"
+  website="https://getfedora.org/"
+  privacy-policy="https://fedoraproject.org/wiki/Legal:PrivacyPolicy?rd=Legal/PrivacyPolicy"
+  git="https://src.fedoraproject.org/"
+%}
+
+{% include cardv2.html
+  title="Ubuntu"
+  image="/assets/img/svg/3rd-party/ubuntu.svg"
+  description='Ubuntu is a Linux distribution developed by Canonical Ltd. Ubuntu is a reliable and distribution that is user-friendly and can be run on desktops, servers, and IoT devices. Ubuntu uses GNOME as the default desktop environment, while other <a href="https://ubuntu.com/download/flavours">desktop environments</a> are also available.'
+  badges="info:Linux"
+  website="https://ubuntu.com"
+  privacy-policy="https://ubuntu.com/legal/data-privacy"
+  git="https://launchpad.net/ubuntu"
+%}
+
+<h1 id="advanced_os" class="anchor"><a href="#advanced_os"><i class="fas fa-link anchor-icon"></i></a> Advanced Operating Systems</h1>
+
+<div class="alert alert-info" role="alert">
+  <strong>These options have advanced features and are unique in some way. These options will likely require the user to read technical background documentation.</strong>
+</div>
+
+{% include cardv2.html
+  title="Alpine Linux"
+  image="/assets/img/svg/3rd-party/alpinelinux.svg"
+  description='Alpine Linux is a very minimal distribution designed to be secure and very resource efficient. Alpine Linux can run from RAM, and merge configuration files into the system on boot using <a href="https://wiki.alpinelinux.org/wiki/Alpine_local_backup">Alpine local backup</a>. Alpine Linux is often used on servers and in Linux containers.'
+  badges="info:Linux"
+  website="https://alpinelinux.org/"
+  privacy-policy="https://alpinelinux.org/privacy-policy.html"
+  gitlab="https://gitlab.alpinelinux.org"
+%}
+
+{% include cardv2.html
+  title="Arch Linux"
+  image="/assets/img/svg/3rd-party/archlinux.svg"
+  description='A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement.'
+  badges="info:Linux"
+  labels="color==success::link==https://tests.reproducible-builds.org/archlinux/archlinux.html::text==Reproducible builds"
+  website="https://www.archlinux.org/"
+  privacy-policy="https://wiki.archlinux.org/index.php/ArchWiki:Privacy_policy"
+  gitlab="https://gitlab.archlinux.org"
+%}
+
+{% include cardv2.html
+  title="Debian"
+  image="/assets/img/svg/3rd-party/debian.svg"
+  description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.'
+  badges="info:Linux"
+  labels="color==success::link==https://reproducible.debian.net::text==Reproducible builds"
+  website="https://www.debian.org/"
+  privacy-policy="https://www.debian.org/legal/privacy"
+  tor="http://sejnfjrq6szgca7v.onion"
+  gitlab="https://salsa.debian.org/qa/debsources"
+%}
+
+{% include cardv2.html
+  title="NixOS"
+  image="/assets/img/svg/3rd-party/nixos.svg"
+  description='NixOS is a Linux distribution with a unique approach to package and configuration management. Built on top of the Nix package manager, it is completely declarative, makes upgrading systems reliable, and has many <a href="https://nixos.org/features.html">other advantages</a>.'
+  badges="info:Linux"
+  labels="color==success::link==https://r13y.com::text==Reproducible builds"
+  website="https://nixos.org"
+  privacy-policy="https://nixos.wiki/wiki/NixOS_Wiki:Privacy_policy"
+  github="https://github.com/NixOS"
+%}
+
+{% include cardv2.html
+  title="Qubes OS"
+  image="/assets/img/svg/3rd-party/qubes_os.svg"
+  description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.'
+  badges="info:Xen"
+  website="https://www.qubes-os.org/"
+  privacy-policy="https://www.qubes-os.org/privacy/"
+  github="https://github.com/QubesOS"
+  tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
+%}
--- a/_includes/sections/other-mobile-operating-systems.html
+++ b/_includes/sections/other-mobile-operating-systems.html
@ -0,0 +1,11 @@
+<h2 id="other_os" class="anchor"><a href="#other_os"><i class="fas fa-link anchor-icon"></i></a> Other Mobile Operating Systems</h1>
+
+{% include cardv2.html
+  title="Ubuntu Touch"
+  image="/assets/img/svg/3rd-party/ubuntu.svg"
+  description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are <a href=https://devices.ubuntu-touch.io/>supported.</a>"
+  badges="info:Linux"
+  website="https://ubuntu-touch.io/"
+  privacy-policy="https://ubports.com/privacy"
+  github="https://github.com/ubports"
+%}
--- a/_includes/sections/participate.html
+++ b/_includes/sections/participate.html
@ -0,0 +1,38 @@
+<div class="page-header">
+  <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> Participate with suggestions and constructive criticism</h1>
+</div>
+
+<p>It's important for a website like {{ site.name }} to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a href="/services/chat/">several Matrix rooms</a>, primarily <code class="highlighter-rouge">#general:privacytools.io</code>. XMPP users can join there via <a href="https://conversations.im/j/%23general%23privacytools.io@matrix.org">#general#privacytools.io@matrix.org</a>. When using our services, users should follow our <a href="https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct">Code of Conduct</a>.</p>
+
+<div class="row">
+
+  {% include card.html color="success"
+  title="Discourse & Reddit"
+  image="/assets/img/svg/3rd-party/discourse.svg"
+  url="https://forum.privacytools.io/"
+  website="Discourse"
+  extra_button='<a class="btn btn-success mb-1" href="https://www.reddit.com/r/privacytoolsIO/">Reddit</a>'
+  description='Join our Discourse community to stay up to date on privacy news or make suggestions!'
+  %}
+
+  {% include card.html color="primary"
+  title="Follow on Mastodon & Twitter"
+  image="/assets/img/svg/3rd-party/mastodon.svg"
+  url="https://social.privacytools.io/@privacytools"
+  website="Mastodon"
+  extra_button='<a class="btn btn-primary mb-1" href="https://twitter.com/privacytoolsIO">Twitter</a>'
+  description="Get the latest privacy-related updates from our Mastodon Feed. Follow us today!"
+  %}
+
+  {% include card.html color="warning"
+  title="Develop on GitHub"
+  font="fab fa-github"
+  url="https://github.com/privacytools/privacytools.io"
+  website="GitHub"
+  description="The complete website source code is available on GitHub. Join our developer team!"
+  extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytools/privacytools.io/graphs/contributors">Contributor List</a>'
+  %}
+
+</div>
+
+<p>This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you.</p>
--- a/_includes/sections/password-managers.html
+++ b/_includes/sections/password-managers.html
@ -0,0 +1,90 @@
+<h1 id="pw" class="anchor"><a href="#pw"><i class="fas fa-link anchor-icon"></i></a> Password Manager Software</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using a password manager software like 1Password, LastPass, Roboform, or iCloud Keychain, you should pick an alternative here.</strong>
+</div>
+
+{%
+  include cardv2.html
+  title="Bitwarden - Cloud/Self-host"
+  image="/assets/img/svg/3rd-party/bitwarden.svg"
+  description="<strong>Bitwarden</strong> is a free and open-source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
+  website="https://bitwarden.com/"
+  privacy-policy="https://bitwarden.com/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-bitwarden/1343"
+  github="https://github.com/bitwarden"
+  web="https://vault.bitwarden.com/#/"
+  windows="https://bitwarden.com/#download"
+  linux="https://bitwarden.com/#download"
+  freebsd="https://www.npmjs.com/package/@bitwarden/cli"
+  openbsd="https://www.npmjs.com/package/@bitwarden/cli"
+  netbsd="https://www.npmjs.com/package/@bitwarden/cli"
+  mac="https://bitwarden.com/#download"
+  firefox="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/"
+  chrome="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb"
+  safari="https://safari-extensions.apple.com/details/?id=com.bitwarden.safari-LTZ2PFU5D6"
+  opera="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/"
+  edge="https://www.microsoft.com/store/apps/9P6KXL0SVNNL"
+  fdroid="https://mobileapp.bitwarden.com/fdroid/"
+  googleplay="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
+  ios="https://itunes.apple.com/app/bitwarden-free-password-manager/id1137397744?mt=8"
+%}
+
+{%
+  include cardv2.html
+  title="KeePassXC - Local"
+  image="/assets/img/svg/3rd-party/keepassxc.svg"
+  description="<strong>KeePassXC</strong> is a community fork of KeePassX, a native cross-platform port of KeePass Password Safe, with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager."
+  website="https://keepassxc.org/"
+  privacy-policy="https://keepassxc.org/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
+  github="https://github.com/keepassxreboot/keepassxc"
+  windows="https://keepassxc.org/download/#windows"
+  linux="https://keepassxc.org/download/#linux"
+  mac="https://keepassxc.org/download/#mac"
+  freebsd="https://www.freshports.org/security/keepassxc/"
+  openbsd="http://openports.se/security/keepassxc"
+  netbsd="http://pkgsrc.se/security/keepassxc"
+  fdroid="https://f-droid.org/packages/com.kunzisoft.keepass.libre/"
+  googleplay="https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free"
+  firefox="https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser"
+  chrome="https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk"
+%}
+
+{%
+  include cardv2.html
+  title="LessPass - Browser"
+  image="/assets/img/svg/3rd-party/lesspass.svg"
+  description="<strong>LessPass</strong> is a free and open-source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
+  website="https://lesspass.com/"
+  privacy-policy="https://addons.mozilla.org/en-US/firefox/addon/lesspass/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
+  github="https://github.com/lesspass/lesspass"
+  windows="https://pypi.org/project/lesspass/"
+  mac="https://pypi.org/project/lesspass/"
+  linux="https://pypi.org/project/lesspass/"
+  freebsd="https://pypi.org/project/lesspass/"
+  firefox="https://addons.mozilla.org/en-US/firefox/addon/lesspass/"
+  chrome="https://chrome.google.com/webstore/detail/lesspass/lcmbpoclaodbgkbjafnkbbinogcbnjih"
+  fdroid="https://f-droid.org/packages/com.lesspass.android"
+  googleplay="https://play.google.com/store/apps/details?id=com.lesspass.android"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li>
+    <a href="https://masterpassword.app">Master Password</a> - A password manager based on an ingenious password-generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site, and your master password. No syncing, backups, or internet access needed.
+  </li>
+
+  <li>
+    <a href="https://psono.com/">Psono</a> - Free and open source password manager for teams with client side encryption and secure sharing of passwords, files, bookmarks, emails. All secrets are protected by a master password. Uses <a href="https://nacl.cr.yp.to/">NACL Crypto</a>, a combination of Curve25519, Salsa20 and Poly1305.
+  </li>
+
+  <li>
+    <a href="https://pwsafe.org/">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted username/password list. With Password Safe all you have to do is create and remember a single "Master Password" of your choice in order to unlock and access your entire username/password list.
+  </li>
+  <li>
+    <a href="https://www.passwordstore.org/">Pass</a> - Pass is a bare-bones password store that keeps passwords using gpg2 encrypted files inside a simple directory tree residing at <code>~/.password-store</code>. It has a simple terminal interface where the user can perform the usual actions, and it's functionality can be extended by plugins. It can also be used in scripts without having to input the actual password in plain text.
+  </li>
+</ul>
--- a/_includes/sections/paste-services.html
+++ b/_includes/sections/paste-services.html
@ -0,0 +1,21 @@
+<h1 id="paste" class="anchor"><a href="#paste"><i class="fas fa-link anchor-icon"></i></a> Pastebin Services</h1>
+
+{% include cardv2.html
+title="PrivateBin"
+image="/assets/img/svg/3rd-party/privatebin.svg"
+description="PrivateBin is a minimalist, open-source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256-bit AES. It is the improved version of ZeroBin."
+website="https://privatebin.info/"
+forum="https://forum.privacytools.io/t/discussion-privatebin/296"
+github="https://github.com/PrivateBin/PrivateBin"
+%}
+
+
+{% include cardv2.html
+title="CryptPad"
+image="/assets/img/svg/3rd-party/cryptpad.svg"
+description="CryptPad is an open-source, zero knowledge, and real-time collaborative editor. Data is encrypted/decrypted in the browser, using Salsa20 with Poly1305 to encrypt pads."
+website="https://cryptpad.fr/pad/"
+privacy-policy="https://cryptpad.fr/privacy.html"
+forum="https://forum.privacytools.io/t/discussion-cryptpad/1270"
+github="https://github.com/xwiki-labs/cryptpad"
+%}
--- a/_includes/sections/privacy-resources.html
+++ b/_includes/sections/privacy-resources.html
@ -0,0 +1,41 @@
+<h1 id="resources" class="anchor"><a href="#resources"><i class="fas fa-link anchor-icon"></i></a> More Privacy Resources</h1>
+
+<h3>Guides</h3>
+
+<ul>
+  <li><a href="https://ssd.eff.org/"><strong>Surveillance Self-Defense by EFF</strong></a> - Guide to defending yourself from surveillance by using secure technology and developing careful practices.</li>
+  <li><a href="https://github.com/cryptoseb/CryptoPaper"><strong>The Crypto Paper</strong></a> - Privacy, Security and Anonymity for Every Internet User.</li>
+  <li><a href="https://emailselfdefense.fsf.org/en/"><strong>Email Self-Defense by FSF</strong></a> - A guide to fighting surveillance with GnuPG encryption.</li>
+  <li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/"><strong>The Ultimate Privacy Guide</strong></a> - Excellent privacy guide written by the creators of the bestVPN.com website.</li>
+  <li><a href="https://www.ivpn.net/privacy-guides"><strong>IVPN Privacy Guides</strong></a> - These privacy guides explain how to obtain vastly greater freedom, privacy and anonymity through compartmentalization and isolation.</li>
+  <li><a href="https://fried.com/privacy"><strong>The Ultimate Guide to Online Privacy</strong></a> - Comprehensive "Ninja Privacy Tips" and 150+ tools.</li>
+</ul>
+
+<h3>Information</h3>
+
+<ul>
+  <li><a href="https://freedom.press/"><strong>Freedom of the Press Foundation</strong></a> - Supporting and defending journalism dedicated to transparency and accountability since 2012.</li>
+  <li><a href="https://www.erfahrungen.com/mit/anonymisierung/t/"><strong>Erfahrungen.com</strong></a> - German review aggregator website of privacy-related services.</li>
+  <li><a href="https://openwireless.org/"><strong>Open Wireless Movement</strong></a> - a coalition of Internet freedom advocates, companies, organizations, and technologists working to develop new wireless technologies and to inspire a movement of Internet openness.</li>
+  <li><a href="https://privacy.net/us-government-surveillance-spying-data"><strong>privacy.net</strong></a> - What does the US government know about you?</li>
+  <li><a href="https://www.reddit.com/r/privacytoolsIO/wiki/index"><strong>r/privacytoolsIO Wiki</strong></a> - Our Wiki on reddit.com.</li>
+  <li><a href="https://www.grc.com/securitynow.htm"><strong>Security Now!</strong></a> - Weekly Internet Security Podcast by Steve Gibson and Leo Laporte.</li>
+  <li><a href="https://www.jupiterbroadcasting.com/show/techsnap/"><strong>TechSNAP</strong></a> - Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry.</li>
+  <li><a href="https://tosdr.org/"><strong>Terms of Service; Didn't Read</strong></a> - "I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.</li>
+</ul>
+
+<h3>Tools</h3>
+
+<ul>
+  <li><a href="https://ipleak.net/"><strong>ipleak.net</strong></a> - IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites.</li>
+  <li><a href="https://www.ghacks.net/2015/12/28/the-ultimate-online-privacy-test-resource-list/"><strong>The ultimate Online Privacy Test Resource List</strong></a> - A collection of Internet sites that check whether your web browser leaks information.</li>
+  <li><a href="https://prism-break.org/"><strong>PRISM Break</strong></a> - We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services.</li>
+  <li><a href="https://securityinabox.org/"><strong>Security in-a-Box</strong></a> - A guide to digital security for activists and human rights defenders throughout the world.</li>
+  <li><a href="https://securedrop.org/"><strong>SecureDrop</strong></a> - An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created
+    by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation.</li>
+  <li><a href="https://secfirst.org/"><strong>Security First</strong></a> - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.</li>
+  <li><a href="https://www.osalt.com/"><strong>Osalt</strong></a> - A directory to help you find open source alternatives to proprietary tools.</li>
+  <li><a href="https://alternativeto.net/"><strong>AlternativeTo</strong></a> - A directory to help find alternatives to other software, with the option to only show open source software</li>
+</ul>
+
+<p>Note: Just being open source does not make software secure!</p>
--- a/_includes/sections/productivity-tools.html
+++ b/_includes/sections/productivity-tools.html
@ -0,0 +1,97 @@
+<h1 id="productivity" class="anchor"><a href="#productivity"><i class="fas fa-link anchor-icon"></i></a> Productivity Tools</h1>
+
+{%
+  include cardv2.html
+  title="CryptPad"
+  image="/assets/img/svg/3rd-party/cryptpad.svg"
+  description="<strong>CryptPad</strong> is a private-by-design alternative to popular office tools and cloud services. All content is end-to-end encrypted. It is free and open-source, enabling anyone to verify its security by auditing the code. The development team is supported by donations and grants. No registration is required, and it can be used anonymously via Tor Browser."
+  website="https://cryptpad.fr/"
+  privacy-policy="https://cryptpad.fr/privacy.html"
+  forum="https://forum.privacytools.io/t/discussion-cryptpad-productivity-tools/1537"
+  github="https://github.com/xwiki-labs/cryptpad"
+  web="https://cryptpad.fr/"
+%}
+
+{%
+  include cardv2.html
+  title="Etherpad"
+  image="/assets/img/svg/3rd-party/etherpad.svg"
+  description="<strong>Etherpad</strong> is a highly customizable open-source online editor providing collaborative editing in real time. <a href=https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad>Here are a list of sites that run Etherpad</a>."
+  website="https://etherpad.org/"
+  forum="https://forum.privacytools.io/t/discussion-etherpad-productivity-tools/1538"
+  github="https://github.com/ether/etherpad-lite"
+  web="https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad"
+  windows="https://github.com/ether/etherpad-lite#windows"
+  linux="https://github.com/ether/etherpad-lite#installation"
+  mac="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
+  freebsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
+  openbsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
+  netbsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
+%}
+
+{%
+  include cardv2.html
+  title="Write.as"
+  image="/assets/img/svg/3rd-party/writeas.svg"
+  image-dark="/assets/img/svg/3rd-party/writeas-dark.svg"
+  description="<strong>Write.as</strong> is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model."
+  website="https://write.as/"
+  privacy-policy="https://write.as/privacy"
+  forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539"
+  tor="http://writeas7pm7rcdqg.onion"
+  git="https://code.as/writeas"
+  web="https://write.as/pad"
+  windows="https://github.com/writeas/writeas-cli"
+  mac="https://github.com/writeas/writeas-cli"
+  linux="https://write.as/apps"
+  chrome="https://write.as/apps"
+  googleplay="https://play.google.com/store/apps/details?id=com.abunchtell.writeas"
+  ios="https://itunes.apple.com/app/apple-store/id1000755153"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
+  <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
+  <li><a href="https://disroot.org/">Disroot</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
+  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open-source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
+  <li><a href="https://framadate.org/">Framadate</a> - A free and open-source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
+  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open-source office suite.</li>
+  <li><a href="https://vscodium.com/">VSCodium</a> - Scripts to automatically build Microsoft's Visual Studio Code editor without branding or telemetry.</li>
+</ul>
+
+<h1 id="metadata-removal-tools" class="anchor">
+  <a href="#metadata-removal-tools"
+    ><i class="fas fa-link anchor-icon"></i>
+  </a> Metadata Removal Tools
+</h1>
+
+{%
+  include cardv2.html
+  title="MAT2"
+  image="/assets/img/svg/3rd-party/mat2.svg"
+  description="<strong>MAT2</strong> is free software, which allows the removal of metadata of image, audio, torrent, and document file types. It provides both a command line tool and a graphical user interface via an extension for Nautilus, the default file manager of GNOME."
+  website="https://0xacab.org/jvoisin/mat2"
+  forum="https://forum.privacytools.io/t/discussion-mat/1559"
+  gitlab="https://0xacab.org/jvoisin/mat2"
+  windows="https://pypi.org/project/mat2/"
+  mac="https://pypi.org/project/mat2/"
+  linux="https://pypi.org/project/mat2/"
+  freebsd="https://pypi.org/project/mat2/"
+  openbsd="https://pypi.org/project/mat2/"
+  netbsd="https://pypi.org/project/mat2/"
+%}
+
+{%
+  include cardv2.html
+  title="ExifCleaner"
+  image="/assets/img/svg/3rd-party/exifcleaner.svg"
+  description='<strong>ExifCleaner</strong> is a freeware, open source graphical app that uses <a href="https://exiftool.org/">ExifTool</a> to remove <a href="https://en.wikipedia.org/wiki/Exif">exif</a> metadata from images, videos, and PDF documents using a simple drag and drop interface. It supports multi-core batch processing and dark mode.'
+  website="https://exifcleaner.com"
+  forum="https://forum.privacytools.io/t/discussion-mat/TODOADDTHIS"
+  github="https://github.com/szTheory/exifcleaner"
+  windows="https://github.com/szTheory/exifcleaner/releases"
+  mac="https://github.com/szTheory/exifcleaner/releases"
+  linux="https://github.com/szTheory/exifcleaner/releases"
+%}
--- a/_includes/sections/quotes.html
+++ b/_includes/sections/quotes.html
@ -0,0 +1,53 @@
+<div class="page-header">
+  <h1>Privacy? I don't have anything to hide.</h1>
+</div>
+<blockquote class="blockquote">
+  <p><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - Why privacy matters - TED Talk"><img src="/assets/img/png/layout/glenn_greenwald.png" width="170px" class="img-fluid float-right ml-2" alt="Glenn Greenwald: Why privacy matters"></a>
+  Over the last 16 months, as I've debated this issue around the world, every single time somebody has said to me, "I don't really worry about invasions of privacy because I don't have anything to hide." I always say the same thing to them. I get out a
+  pen, I write down my email address. I say, "Here's my email address. What I want you to do when you get home is email me the passwords to all of your email accounts, not just the nice, respectable work one in your name, but all of them, because I
+  want to be able to just troll through what it is you're doing online, read what I want to read and publish whatever I find interesting. After all, if you're not a bad person, if you're doing nothing wrong, you should have nothing to hide." <strong>Not a single person has taken me up on that offer.</strong></p>
+  <footer class="blockquote-footer">Glenn Greenwald in <cite title="Why privacy matters - TED Talk"><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters">Why privacy matters - TED Talk</a></cite></footer>
+</blockquote>
+
+<blockquote class="blockquote">
+  <p>The primary reason for window curtains in our house, is to stop people from being able to see in. The reason we don’t want them to see in is because we consider much of what we do inside our homes to be private. Whether that be having dinner at the table, watching a movie with your kids, or even engaging in intimate or sexual acts with your partner. None of these things are illegal by any means but even knowing this, we still keep the curtains and blinds on our windows. We clearly have this strong desire for privacy when it comes to our personal life and the public.</p>
+   <footer class="blockquote-footer">Joshua in <cite title="The Crypto Paper"><a href="https://github.com/cryptoseb/CryptoPaper#let-me-explain-further">The Crypto Paper</a></cite></footer>
+</blockquote>
+
+<blockquote class="blockquote">
+  <p>[...] But saying that you don't need or want privacy because you have nothing to hide is to assume that no one should have, or could have, to hide anything -- including their immigration status, unemployment history, financial history, and health records. You're assuming that no one, including yourself, might object to revealing to anyone information about their religious beliefs, political affiliations, and sexual activities, as casually as some choose to reveal their movie and music tastes and reading preferences.</p>
+  <footer class="blockquote-footer">Edward Snowden in <cite title="Permanent Record"><a href="https://en.wikipedia.org/wiki/Permanent_Record_(autobiography)">Permanent Record</a></cite></footer>
+</blockquote>
+
+<blockquote class="blockquote">
+  <p>Privacy is not a luxury [in America]: it is a right – one that we need to defend in the digital realm as much as in the physical realm. We need to stay vigilant to maintain access to that right, though ... especially as technology continues to advance...</p>
+  <footer class="blockquote-footer">Chelsea Manning in <cite title="The Guardian"><a href="https://www.theguardian.com/commentisfree/2016/feb/22/privacy-is-a-right-not-a-luxury-and-its-increasingly-at-risk-for-lgbt-people">The Guardian</a></cite></footer>
+</blockquote>
+
+<h4>Read also:</h4>
+
+<ul>
+  <li><a href="https://en.wikipedia.org/wiki/Nothing_to_hide_argument">Nothing to hide argument (Wikipedia)</a></li>
+  <li><a href="https://www.reddit.com/r/privacy/comments/3hynvp/how_do_you_counter_the_i_have_nothing_to_hide/">How do you counter the "I have nothing to hide?" argument? (reddit.com)</a></li>
+  <li><a href="https://papers.ssrn.com/sol3/papers.cfm?abstract_id=998565">'I've Got Nothing to Hide' and Other Misunderstandings of Privacy (Daniel J. Solove - San Diego Law Review)</a></li>
+</ul>
+
+<h1 id="quotes" class="anchor"><a href="#quotes"><i class="fas fa-link anchor-icon"></i></a> Quotes</h1>
+
+<blockquote class="blockquote">
+  <p>Ultimately, saying that you don't care about privacy because you have nothing to hide is no different from saying you don't care about freedom of speech because you have nothing to say.  Or that you don't care about freedom of the press because you don't like to read. Or that you don't care about freedom of religion because you don't believe in God. Or that you don't care about the freedom to peacably assemble because you're a lazy, antisocial agoraphobe. </p>
+  <footer class="blockquote-footer">Edward Snowden in <cite title="Permanent Record"><a href="https://en.wikipedia.org/wiki/Permanent_Record_(autobiography)">Permanent Record</a></cite></footer>
+</blockquote>
+
+<blockquote class="blockquote">
+  <p>The NSA has built an infrastructure that allows it to intercept almost everything. With this capability, the vast majority of human communications are automatically ingested without targeting. If I wanted to see your emails or your wife's phone, all
+  I have to do is use intercepts. I can get your emails, passwords, phone records, credit cards. I don't want to live in a society that does these sort of things... I do not want to live in a world where everything I do and say is recorded. That is
+  not something I am willing to support or live under. </p>
+  <footer class="blockquote-footer">Edward Snowden in <cite title="Edward Snowden, NSA files source: 'If they want to get you, in time they will"><a href="https://www.theguardian.com/world/2013/jun/09/nsa-whistleblower-edward-snowden-why">The Guardian</a></cite></footer>
+</blockquote>
+
+<blockquote class="blockquote">
+  <p>We all need places where we can go to explore without the judgmental eyes of other people being cast upon us, only in a realm where we're not being watched can we really test the limits of who we want to be. It's really in the private realm where
+  dissent, creativity and personal exploration lie.</p>
+  <footer class="blockquote-footer">Glenn Greenwald in <cite title="Glenn Greenwald On Why Privacy Is Vital, Even If You 'Have Nothing To Hide"><a href="https://www.huffingtonpost.com/2014/06/20/glenn-greenwald-privacy_n_5509704.html">Huffington Post</a></cite></footer>
+</blockquote>
--- a/_includes/sections/resources.html
+++ b/_includes/sections/resources.html
@ -0,0 +1,55 @@
+<h1 id="os" class="anchor">Privacy Tools</h1>
+
+<p><a href="/classic/"><i class="fas fa-info-circle"></i> Prefer the classic site? View a single-page layout.</a></p>
+
+<div class="row">
+
+  {% include card.html color="success"
+  title="Providers"
+  icon="fas fa-server"
+  iconcolor="dark"
+  page="/providers/"
+  description="Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!"
+  %}
+
+  {% include card.html color="primary"
+  title="Web Browsers"
+  icon="far fa-compass"
+  iconcolor="dark"
+  page="/browsers/"
+  description="Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks."
+  %}
+
+  {% include card.html color="warning"
+  title="Software"
+  icon="far fa-window-restore"
+  iconcolor="dark"
+  page="/software/"
+  description="Discover a variety of open source software built to protect your privacy and keep your digital data secure."
+  %}
+
+  {% include card.html color="info"
+  title="Operating Systems"
+  icon="fas fa-desktop"
+  iconcolor="dark"
+  page="/operating-systems/"
+  description="Find out how your operating system is compromising your privacy, and what simple alternatives exist."
+  %}
+
+  {% include card.html color="secondary"
+  title="PrivacyTools Services"
+  icon="far fa-eye-slash"
+  iconcolor="dark"
+  page="/services/"
+  description="The PrivacyTools team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!"
+  %}
+
+  {% include card.html color="danger"
+  title="Donate"
+  icon="fas fa-donate"
+  iconcolor="dark"
+  page="/donate/"
+  description="We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating."
+  %}
+
+</div>
--- a/_includes/sections/router-firmware.html
+++ b/_includes/sections/router-firmware.html
@ -0,0 +1,32 @@
+<h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> Open Source Router Firmware</h1>
+
+{% include cardv2.html
+  title="OpenWrt"
+  image="/assets/img/svg/3rd-party/openwrt.svg"
+  image-dark="/assets/img/svg/3rd-party/openwrt-dark.svg"
+  description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers."
+  badges="info:Linux"
+  website="https://openwrt.org/"
+  git="https://git.openwrt.org/"
+%}
+
+{% include cardv2.html
+  title="pfSense"
+  image="/assets/img/svg/3rd-party/pfsense.svg"
+  image-dark="/assets/img/svg/3rd-party/pfsense-dark.svg"
+  description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
+  badges="info:BSD"
+  website="https://www.pfsense.org/"
+  privacy-policy="https://www.pfsense.org/privacy.html"
+  github="https://github.com/pfsense/"
+%}
+
+{% include cardv2.html
+  title="LibreCMC"
+  image="/assets/img/svg/3rd-party/librecmc.svg"
+  image-dark="/assets/img/svg/3rd-party/librecmc-dark.svg"
+  description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)."
+  badges="info:GNU/Linux"
+  website="https://librecmc.org"
+  git="https://gogs.librecmc.org/libreCMC/libreCMC"
+%}
--- a/_includes/sections/search-engines.html
+++ b/_includes/sections/search-engines.html
@ -0,0 +1,57 @@
+<h1 id="search" class="anchor"><a href="#search"><i class="fas fa-link anchor-icon"></i></a> Privacy Respecting Search Engines</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using search engines like Google, Bing, or Yahoo, you should pick an alternative here.</strong>
+</div>
+
+{%
+  include cardv2.html
+  title="Searx"
+  image="/assets/img/svg/3rd-party/searx.svg"
+  description='Searx is an <a href="https://github.com/asciimoo/searx">open-source</a>, self-hostable, metasearch engine, aggregating the results of other search engines while not storing information about its users. There is a <a href="https://searx.space/">list of public instances</a> or you can try the <a href="https://search.privacytools.io/">PrivacyTools instance</a>.'
+  website="https://searx.me/"
+  tor="http://ulrn6sryqaifefld.onion"
+  forum="https://forum.privacytools.io/t/discussion-searx/283"
+  github="https://github.com/asciimoo/searx"
+%}
+
+{%
+  include cardv2.html
+  title="DuckDuckGo"
+  image="/assets/img/svg/3rd-party/duckduckgo.svg"
+  description='DuckDuckGo is a "search engine that doesn\'t track you." Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="../../providers/#ukusa">The company is based in the USA.</a>'
+  website="https://duckduckgo.com/"
+  privacy-policy="https://duckduckgo.com/privacy"
+  tor="http://3g2upl4pq6kufc4m.onion"
+  forum="https://forum.privacytools.io/t/discussion-duckduckgo/285"
+  github="https://github.com/duckduckgo"
+%}
+
+{%
+  include cardv2.html
+  title="Qwant"
+  image="/assets/img/svg/3rd-party/qwant.svg"
+  description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. <span class="flag-icon flag-icon-fr"></span> <a href="../../providers/#ukusa">The company is based in France.</a>'
+  website="https://www.qwant.com/"
+  privacy-policy="https://about.qwant.com/legal/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-qwant/286"
+  github="https://github.com/Qwant/"
+%}
+
+{% include cardv2.html
+  title="Startpage.com"
+  image="/assets/img/svg/3rd-party/startpage.svg"
+  description='Startpage.com is a search engine that provides Google search results with complete privacy protection. <span class="flag-icon flag-icon-nl"></span> Startpage BV is a Netherlands-based company that has been dedicated to privacy-respecting search since 2006.'
+  labels="color==warning::link==https://support.startpage.com/index.php?/Knowledgebase/Article/View/1277/0/startpage-ceo-robert-beens-discusses-the-investment-from-privacy-one--system1::text==Warning::tooltip==Startpage.com was recently acquired by United States-based System1."
+  website="https://www.startpage.com/"
+  privacy-policy="https://www.startpage.com/en/privacy-policy/"
+  forum="https://forum.privacytools.io/t/delisted-discussion-startpage/284"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://metager.org/">MetaGer</a> - An <a href="https://gitlab.metager.de/open-source/MetaGer">open-source</a>, metasearch engine run as a non-profit based in Germany. (<a href="https://metager.org/datenschutz">Privacy Policy</a>)</li>
+  <li><a href="https://www.mojeek.com/">Mojeek</a> - An independent search engine based in the UK, and the <a href="https://blog.mojeek.com/2018/10/search-that-does-not-follow-you-around.html">first search engine to have a policy of not tracking its users.</a> (<a href="https://www.mojeek.com/about/privacy/">Privacy Policy</a>)</li>
+  <li><a href="https://yacy.net/">YaCy</a> - An <a href="https://github.com/yacy/yacy_search_server">open-source</a>, peer-to-peer search engine powered by its users.</li>
+</ul>
--- a/_includes/sections/self-contained-networks.html
+++ b/_includes/sections/self-contained-networks.html
@ -0,0 +1,103 @@
+<h1 id="darknets" class="anchor"><a href="#darknets"><i class="fas fa-link anchor-icon"></i></a> Self-contained Networks</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently browsing <a href="https://en.wikipedia.org/wiki/Surface_Web">clearnet</a> and want to access the <a href="https://en.wikipedia.org/wiki/Dark_web">dark web</a>, this section is for you.</strong>
+</div>
+
+{% include cardv2.html
+  title="Tor"
+  image="/assets/img/svg/3rd-party/tor.svg"
+  description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool."
+  website="https://www.torproject.org/"
+  tor="http://expyuzz4wqqyqhjn.onion"
+  forum="https://forum.privacytools.io/t/discussion-tor/1589"
+  windows="https://www.torproject.org/download/"
+  mac="https://www.torproject.org/download/"
+  linux="https://www.torproject.org/download/"
+  freebsd="https://www.freshports.org/security/tor"
+  openbsd="http://openports.se/net/tor"
+  netbsd="http://pkgsrc.se/net/tor"
+  fdroid="https://support.torproject.org/tormobile/tormobile-7/"
+  googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
+  android="https://www.torproject.org/download/#android"
+  git="https://gitweb.torproject.org/tor.git"
+%}
+
+{% include cardv2.html
+  title="I2P Anonymous Network"
+  image="/assets/img/svg/3rd-party/i2p.svg"
+  image-dark="/assets/img/svg/3rd-party/i2p-dark.svg"
+  description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous Web surfing, chatting, blogging, and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open-source and is published under multiple licenses."
+  website="https://geti2p.net/"
+  forum="https://forum.privacytools.io/t/discussion-i2p/1590"
+  i2p="http://i2p-projekt.i2p/"
+  windows="https://geti2p.net/en/download#windows"
+  mac="https://geti2p.net/en/download#mac"
+  linux="https://geti2p.net/en/download#unix"
+  freebsd="https://www.freshports.org/security/i2p/"
+  openbsd="http://openports.se/net/i2pd"
+  netbsd="http://pkgsrc.se/wip/i2pd"
+  fdroid="https://f-droid.org/app/net.i2p.android.router"
+  googleplay="https://play.google.com/store/apps/details?id=net.i2p.android"
+  android="https://download.i2p2.de/android/current/"
+  source="https://geti2p.net/en/get-involved/guides/new-developers#getting-the-i2p-code"
+%}
+
+{% include cardv2.html
+  title="The Freenet Project"
+  image="/assets/img/svg/3rd-party/freenet.svg"
+  description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech on the Internet with strong anonymity protection."
+  website="https://freenetproject.org/"
+  forum="https://forum.privacytools.io/t/discussion-freenet/1591"
+  windows="https://freenetproject.org/pages/download.html#windows"
+  mac="https://freenetproject.org/pages/download.html#os-x"
+  linux="https://freenetproject.org/pages/download.html#gnulinux-posix"
+  freebsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
+  openbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
+  netbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
+  github="https://github.com/freenet/"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li>
+    <a href="https://zeronet.io/">ZeroNet</a> - Open, free, and uncensorable websites, using Bitcoin cryptography and BitTorrent network.
+    {% include badge.html
+    color="danger"
+    icon="fas fa-exclamation-triangle"
+    tooltip="Your IP address isn't hidden by default and won't be, unless you enforce Tor usage."
+    text="Not anonymous"
+    %}
+  </li>
+  <li><a href="https://retroshare.cc/">RetroShare</a> - An open source, cross-platform, friend-to-friend, secure, and decentralized communication platform.</li>
+  <li><a href="https://i2pbote.xyz/">I2P-Bote</a> - End-to-end encrypted decentralized mail system within the I2P network.</li>
+  <li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
+  <li>
+    <a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local).
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://github.com/privacytools/privacytools.io/pull/361#issuecomment-344414022"
+    text="Supercookie warning"
+    %}
+  </li>
+  <li>
+    <a href="https://yggdrasil-network.github.io/">Yggdrasil</a>
+    - An early-stage implementation of a fully end-to-end encrypted IPv6 network. It is lightweight, self-arranging, supported on multiple platforms, and allows pretty much any IPv6-capable application to communicate securely with other Yggdrasil nodes. Yggdrasil does not require you to have IPv6 Internet connectivity - it also works over IPv4.
+
+    {% include badge.html
+    color="warning"
+    icon="far fa-question-circle"
+    tooltip="The project is currently in early stages but it is being actively developed."
+    text="Experimental"
+    %}
+    {% include badge.html
+    color="danger"
+    icon="fas fa-exclamation-triangle"
+    link=""
+    tooltip="Yggdrasil doesn't provide anonymity by default. Your peers know your IP address unless you configure it to only use Tor/I2P peers."
+    text="Not anonymous by default"
+    %}
+  </li>
+</ul>
--- a/_includes/sections/selfhosted-cloud.html
+++ b/_includes/sections/selfhosted-cloud.html
@ -0,0 +1,43 @@
+<h1 id="mycloud" class="anchor"><a href="#mycloud"><i class="fas fa-link anchor-icon"></i></a> Self-Hosted Cloud Server Software</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own.</strong>
+</div>
+
+{% include cardv2.html
+  title="Nextcloud"
+  image="/assets/img/svg/3rd-party/nextcloud.svg"
+  description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
+  website="https://nextcloud.com/"
+  privacy-policy="https://nextcloud.com/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
+  windows="https://nextcloud.com/install/#install-clients"
+  mac="https://nextcloud.com/install/#install-clients"
+  linux="https://nextcloud.com/install/#install-clients"
+  freebsd="https://www.freshports.org/www/nextcloud/"
+  openbsd="http://openports.se/www/nextcloud"
+  netbsd="http://pkgsrc.se/www/php-nextcloud"
+  fdroid="https://f-droid.org/packages/com.nextcloud.client/"
+  googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
+  ios="https://itunes.apple.com/us/app/nextcloud/id1125420102"
+  github="https://github.com/nextcloud"
+%}
+
+{% include cardv2.html
+  title="Tahoe-LAFS"
+  image="/assets/img/svg/3rd-party/tahoe-lafs.svg"
+  image-dark="/assets/img/svg/3rd-party/tahoe-lafs-dark.svg"
+  website="https://www.tahoe-lafs.org/"
+  forum="https://forum.privacytools.io/t/discussion-tahoe-lafs/1662"
+  description="Tahoe-LAFS is a free and open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
+  windows="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+  mac="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+  linux="https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages"
+  netbsd="http://pkgsrc.se/filesystems/tahoe-lafs"
+  git="https://www.tahoe-lafs.org/trac/tahoe-lafs/browser"
+%}
+
+<h3>Worth Mentioning</h3>
+<ul>
+  <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - An open-source and end-to-end encrypted real-time collaborative editor that lets you share folders, media, and documents.</li>
+</ul>
--- a/_includes/sections/social-networks.html
+++ b/_includes/sections/social-networks.html
@ -0,0 +1,81 @@
+<h1 id="social" class="anchor"><a href="#social"><i class="fas fa-link anchor-icon"></i></a> Decentralized Social Networks</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong> If you are currently using Social Networks like Facebook or Twitter, you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+  title="Mastodon - Twitter Alternative"
+  image="/assets/img/svg/3rd-party/mastodon.svg"
+  description='Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like email, users can exist on different servers or even different platforms but still communicate with each other. It also has the most users, and the most diverse (in terms of interests) users, it looks good, and it is easy to setup yourself. If you are looking for a server to join, you are welcome to join our hosted instance: <a href="https://social.privacytools.io/">social.privacytools.io</a>'
+  website="https://joinmastodon.org/"
+  forum="https://forum.privacytools.io/t/discussion-mastodon/289"
+  github="https://github.com/tootsuite/mastodon"
+  windows="https://joinmastodon.org/apps"
+  mac="https://joinmastodon.org/apps"
+  linux="https://joinmastodon.org/apps"
+  freebsd="https://joinmastodon.org/apps"
+  openbsd="https://joinmastodon.org/apps"
+  netbsd="https://joinmastodon.org/apps"
+  android="https://joinmastodon.org/apps"
+  sailfish="https://joinmastodon.org/apps"
+  ios="https://joinmastodon.org/apps"
+  web="https://joinmastodon.org/#getting-started"
+%}
+
+{% include cardv2.html
+  title="diaspora* - Google+ Alternative"
+  image="/assets/img/svg/3rd-party/diaspora.svg"
+  description="diaspora* is based on three key philosophies: Decentralization, Freedom, and Privacy. It is intended to address privacy concerns related to centralized social networks by allowing users set up their own server (or \"pod\") to host content. Pods can then interact to share status updates, photographs, and other social data."
+  website="https://diasporafoundation.org/"
+  forum="https://forum.privacytools.io/t/discussion-diaspora/290"
+  github="https://github.com/diaspora/diaspora"
+  android="https://wiki.diasporafoundation.org/Tools_to_use_with_Diaspora#Android"
+  web="https://diasporafoundation.org/"
+%}
+
+{% include cardv2.html
+  title="Friendica - Facebook Alternative"
+  image="/assets/img/svg/3rd-party/friendica.svg"
+  description="Friendica has an emphasis on extensive privacy settings and easy server installation. It aims to federate with as many other social networks as possible. Currently, Friendica users can integrate contacts from Facebook, Twitter, Diaspora, GNU social, App.net, Pump.io and other services in their social streams."
+  website="https://friendi.ca/"
+  forum="https://forum.privacytools.io/t/discussion-friendica/291"
+  github="https://github.com/friendica/friendica"
+  windows="https://friendi.ca/resources/mobile-clients/"
+  linux="https://friendi.ca/resources/mobile-clients/"
+  android="https://friendi.ca/resources/mobile-clients/"
+  sailfish="https://friendi.ca/resources/mobile-clients/"
+  web="https://friendi.ca/"
+%}
+
+{% include cardv2.html
+  title="PixelFed - Instagram Alternative"
+  image="/assets/img/svg/3rd-party/pixelfed.svg"
+  description='PixelFed is a free and ethical photo sharing platform, powered by ActivityPub federation. Pixelfed is an open-source, federated platform. You can run your own instance or <a href="https://fediverse.party/en/pixelfed/">join an existing one.</a>'
+  website="https://pixelfed.org/"
+  forum="https://forum.privacytools.io/t/discussion-pixelfed/293"
+  github="https://github.com/pixelfed"
+  web="https://pixelfed.org/"
+%}
+
+{% include cardv2.html
+  title="Pleroma - Twitter Alternative"
+  image="/assets/img/svg/3rd-party/pleroma.svg"
+  description="Pleroma is a free, federated social networking server built on open protocols. It is compatible with Mastodon and many other ActivityPub and OStatus implementations."
+  website="https://pleroma.social"
+  forum="https://forum.privacytools.io/t/discussion-pleroma/2307"
+  gitlab="https://git.pleroma.social/pleroma/pleroma/"
+  windows="https://docs-develop.pleroma.social/backend/clients/#desktop"
+  mac="https://docs-develop.pleroma.social/backend/clients/#desktop"
+  linux="https://docs-develop.pleroma.social/backend/clients/#desktop"
+  android="https://docs-develop.pleroma.social/backend/clients/#handheld"
+  fdroid="https://docs-develop.pleroma.social/backend/clients/#handheld"
+  googleplay="https://docs-develop.pleroma.social/backend/clients/#handheld"
+  ios="https://docs-develop.pleroma.social/backend/clients/#handheld"
+  web="https://docs-develop.pleroma.social/backend/clients/#alternative-web-interfaces"
+%}
+
+<h3>Worth Mentioning</h3>
+<ul>
+  <li><a href="https://movim.eu/">Movim</a> - A federated social platform that relies on the XMPP standard and therefore allows you to exchange with many other clients on all devices.</li>
+</ul>
--- a/_includes/sections/social-news-aggregator.html
+++ b/_includes/sections/social-news-aggregator.html
@ -0,0 +1,48 @@
+<h1 id="obb" class="anchor"><a href="#social-news-aggregator"><i class="fas fa-link anchor-icon"></i></a> Social News Aggregators</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using a online bulletin board like Reddit, you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+title="Aether"
+image="/assets/img/svg/3rd-party/aether.svg"
+description='<a href="https://github.com/nehbit/aether/blob/master/LICENSE.md">Aether is a free and open-source</a> decentralized social news aggregator with a built-in voting system.'
+website="https://getaether.net/"
+privacy-policy="https://getaether.net/privacypolicy/"
+forum="https://forum.privacytools.io/t/discussion-aether/1256"
+github="https://github.com/nehbit/aether"
+windows="https://getaether.net/download/"
+mac="https://getaether.net/download/"
+linux="https://getaether.net/download/"
+%}
+
+{% include cardv2.html
+title="Tildes"
+image="/assets/img/svg/3rd-party/tildes.svg"
+description='Tildes is a web-based self-hostable online bulletin board. It is licensed under <a href="https://gitlab.com/tildes/tildes/blob/master/LICENSE">AGPLv3</a>.'
+website="https://tildes.net"
+privacy-policy="https://docs.tildes.net/policies/privacy-policy"
+forum="https://forum.privacytools.io/t/discussion-tildes/1257"
+gitlab="https://gitlab.com/tildes/tildes"
+web="https://tildes.net"
+%}
+
+{% include cardv2.html
+title="Raddle"
+image="/assets/img/png/3rd-party/raddle.png"
+description="Raddle is a public Postmill instance focused on privacy and anti-censorship."
+website="https://raddle.me"
+privacy-policy="https://raddle.me/wiki/privacy_policy"
+forum="https://forum.privacytools.io/t/discussion-raddle/1258"
+gitlab="https://gitlab.com/postmill/"
+web="https://raddle.me"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://beta.akasha.world/">Akasha</a> - A decentralized online bulletin board using <a href="https://www.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a> and <a href="https://www.wikipedia.org/wiki/Ethereum">Ethereum</a>.</li>
+  <li><a href="https://dev.lemmy.ml/">Lemmy</a> - An <a href="https://github.com/dessalines/lemmy/blob/master/LICENSE">AGPL</a>-licensed self-hostable link aggregator intended to work in the <a href="https://www.wikipedia.org/wiki/Fediverse">Fediverse</a>.</li>
+  <li><a href="https://notabug.io/">notabug.io</a> - A <a href="https://github.com/notabugio/notabug/blob/master/LICENSE.md">free and open-source</a> P2P link aggregator with a strong resemblance to old.reddit.com (not to be confused with <a href="https://notabug.org/">NotABug.org</a>).</li>
+</ul>
--- a/_includes/sections/teamchat.html
+++ b/_includes/sections/teamchat.html
@ -0,0 +1,46 @@
+<h1 id="teamchat" class="anchor">
+  <a href="#teamchat">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Team Chat Platforms
+</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If your project or organization currently uses a platform like <a href="https://tosdr.org/#discord">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
+</div>
+
+{%
+  include cardv2.html
+  title="Element"
+  image="/assets/img/svg/3rd-party/element.svg"
+  description='<a href="https://element.io">Element</a> (formerly <a href="https://element.io/blog/welcome-to-element/">Riot</a>) is the reference client for the <a href="https://matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="https://matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.'
+  labels="text==VoIP"
+  website="https://element.io"
+  privacy-policy="https://element.io/privacy"
+  forum="https://forum.privacytools.io/t/discussion-element-io/665"
+  github="https://github.com/vector-im/element-web"
+  windows="https://element.io/get-started"
+  mac="https://element.io/get-started"
+  linux="https://element.io/get-started"
+  fdroid="https://f-droid.org/packages/im.vector.app/"
+  googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
+  ios="https://apps.apple.com/app/vector/id1083446067"
+  web="https://app.element.io"
+%}
+
+{%
+  include cardv2.html
+  title="Rocket.chat"
+  image="/assets/img/svg/3rd-party/rocketchat.svg"
+  description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
+  labels="color==warning::link==https://rocket.chat/docs/user-guides/end-to-end-encryption/::text==Experimental E2EE::tooltip==Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. Federation was also added afterwards, potentially causing room for mistakes.|text==VoIP"
+  website="https://rocket.chat/"
+  privacy-policy="https://rocket.chat/privacy"
+  forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
+  github="https://github.com/rocketchat/"
+  windows="https://rocket.chat/install"
+  mac="https://itunes.apple.com/us/app/rocket-chat/id1086818840"
+  linux="https://rocket.chat/install"
+  fdroid="https://f-droid.org/packages/chat.rocket.android"
+  googleplay="https://play.google.com/store/apps/details?id=chat.rocket.android"
+  ios="https://itunes.apple.com/app/rocket-chat/id1148741252"
+%}
--- a/_includes/sections/tor-operating-systems.html
+++ b/_includes/sections/tor-operating-systems.html
@ -0,0 +1,24 @@
+<h1 id="tor_os" class="anchor"><a href="#tor_os"><i class="fas fa-link anchor-icon"></i></a> Tor-Focused Distributions</h1>
+
+<div class="alert alert-info" role="alert">
+  <strong>These Linux distributions are developed with the purpose of directing all network traffic through Tor.</strong>
+</div>
+
+{% include cardv2.html
+  title="Tails"
+  image="/assets/img/svg/3rd-party/tails.svg"
+  description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.'
+  badges="info:Linux"
+  website="https://tails.boum.org/"
+  git="https://git-tails.immerda.ch/tails/"
+  %}
+
+{% include cardv2.html
+  title="Whonix"
+  image="/assets/img/svg/3rd-party/whonix.svg"
+  description='A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" and a Tor "Gateway". All communication are forced through the Tor network to accomplish this. <a href="https://www.whonix.org/wiki/Qubes/Why_use_Qubes_over_other_Virtualizers">Whonix is best used in conjunction with Qubes.</a>'
+  badges="info:Linux"
+  website="https://www.whonix.org/"
+  tor="http://www.dds6qkxpwdeubwucdiaord2xgbbeyds25rbsgr73tbfpqpt4a6vjwsyd.onion/"
+  github="https://github.com/Whonix"
+%}
--- a/_includes/sections/video-frontends.html
+++ b/_includes/sections/video-frontends.html
@ -0,0 +1,14 @@
+<h1 id="proxies" class="anchor"><a href="#proxies"><i class="fas fa-link anchor-icon"></i></a> Frontends and Proxies</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong> If you are currently using a platform like YouTube, you can keep watching videos without sharing your IP.</strong>
+</div>
+
+{% include cardv2.html
+  title="Invidious"
+  image="/assets/img/svg/3rd-party/invidious.svg"
+  description='Invidious is an alternative front-end to YouTube. It is free software, with no advertising or Javascript dependency to play videos, with lots of other features that allow you to have a complete YouTube experience, sans Google.'
+  website="https://invidio.us"
+  github="https://github.com/omarroth/invidious"
+  web="https://instances.invidio.us"
+%}
--- a/_includes/sections/voice-video-messenger.html
+++ b/_includes/sections/voice-video-messenger.html
@ -0,0 +1,62 @@
+<h1 id="voip" class="anchor"><a href="#voip"><i class="fas fa-link anchor-icon"></i></a> Video/Voice Calling</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using a Video/Voice Calling app like Google Hangouts, Skype, Viber or <a href="https://blog.privacytools.io/protecting-your-privacy-while-using-zoom-at-home/">Zoom</a>, you should pick an alternative here.</strong> Please note that many of the above instant messengers also support {% include badge.html color="info" text="VoIP" %}. The software listed below are <em>primarily</em> Voice/Video focused.
+</div>
+
+{% include cardv2.html
+  title="Linphone"
+  image="/assets/img/svg/3rd-party/linphone.svg"
+  website="https://www.linphone.org/"
+  privacy-policy="https://www.linphone.org/terms-and-privacy"
+  description="Linphone is an open-source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication."
+  forum="https://forum.privacytools.io/t/discussion-linphone/751"
+  github="https://github.com/BelledonneCommunications"
+  windows="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+  linux="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+  mac="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+  fdroid="https://f-droid.org/packages/org.linphone"
+  googleplay="https://play.google.com/store/apps/details?id=org.linphone"
+  ios="https://apps.apple.com/us/app/linphone/id360065638"
+%}
+
+{% include cardv2.html
+  title="Jitsi Meet"
+  image="/assets/img/svg/3rd-party/jitsi.svg"
+  website="https://jitsi.org/jitsi-meet/"
+  privacy-policy="https://jitsi.org/security/"
+  description='Jitsi Meet is a free and open-source multiplatform voice (VoIP), video conferencing, and instant messaging application with optional E2EE. It can be used from the browser, in <a href="https://github.com/jitsi/jitsi-meet-electron/releases">desktop applications</a> or on smartphones. Additional features include screen sharing for presentations and an always-on-top floating call window when minimized. See the <a href="https://github.com/jitsi/jitsi-meet/wiki/Jitsi-Meet-Instances">list of public Jitsi Meet instances</a>.'
+  labels="color==warning::text==Requires WebRTC::tooltip==Our Firefox tweaks recommend disabling WebRTC as it can be used to leak your IP address even behind a VPN, which is why Tor Browser disables it.|color==warning::link==https://github.com/jitsi/lib-jitsi-meet/blob/master/doc/e2ee.md::text==Experimental E2EE::tooltip==E2EE in Jitsi Meet is dependent on Insertable Streams, which is currently supported in Chrome but not Firefox. The mobile apps also do not support E2EE for the moment. Prefer to use the desktop apps instead."
+  forum="https://forum.privacytools.io/t/discussion-jitsi-meet/1577"
+  github="https://github.com/jitsi/jitsi-meet"
+  windows="https://github.com/jitsi/jitsi-meet-electron/releases"
+  linux="https://github.com/jitsi/jitsi-meet-electron/releases"
+  mac="https://github.com/jitsi/jitsi-meet-electron/releases"
+  fdroid="https://f-droid.org/en/packages/org.jitsi.meet/"
+  googleplay="https://play.google.com/store/apps/details?id=org.jitsi.meet"
+  ios="https://apps.apple.com/us/app/jitsi-meet/id1165103905"
+%}
+
+{% include cardv2.html
+  title="Mumble"
+  image="/assets/img/svg/3rd-party/mumble.svg"
+  website="https://mumble.info/"
+  description="Mumble is an open-source, low-latency, and high quality voice chat application primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, <a href=\"https://github.com/mumble-voip/mumble/issues/1813\">it's missing end-to-end encryption</a>, so self-hosting is recommended."
+  forum="https://forum.privacytools.io/t/discussion-mumble/1289"
+  github="https://github.com/mumble-voip/"
+  windows="https://www.mumble.info/downloads"
+  linux="https://www.mumble.info/downloads"
+  mac="https://www.mumble.info/downloads"
+  android="https://www.mumble.info/downloads/#third-party-clients"
+  ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1"
+%}
+
+<h3>Related Information</h3>
+
+<ul>
+  <li>More information about Mumble:</li>
+  <ul>
+  <li><a href="https://wiki.mumble.info/wiki/Running_Murmur">Running Mumble Server</a> and <a href="https://wiki.mumble.info/wiki/Murmur.ini">its config file</a>, particularly <a href="https://wiki.mumble.info/wiki/Murmur.ini#obfuscate">obfuscating IPv4 addresses</a> and <a href="https://wiki.mumble.info/wiki/Murmur.ini#Process_Administrivia">logging</a></li>
+  <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/TorifyHOWTO/Mumble">Torifying Mumble</a>
+  </ul>
+</ul>
--- a/_includes/sections/vpn.html
+++ b/_includes/sections/vpn.html
@ -0,0 +1,113 @@
+<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Recommended VPN Services</h1>
+
+<div class="alert alert-success" role="alert">
+  <strong>Our recommended providers are outside the US, use encryption, accept Bitcoin, support OpenVPN, and have a no logging policy. <a href="/providers/vpn/#criteria">Read our full list of criteria for more information</a>.</strong>
+</div>
+
+<div class="container-fluid">
+
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/mullvad.svg"
+        data-theme-src="/assets/img/svg/3rd-party/mullvad-dark.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Mullvad">
+    </div>
+    <div class="col">
+    <h2 id="mullvad" class="anchor">
+      <a href="#mullvad"><i class="fas fa-link anchor-icon"></i></a> Mullvad
+      {% include badge.html color="info" text="EUR €60/y" %}
+    </h2>
+    <p><strong><a href="https://mullvad.net/">Mullvad.net</a> </strong> is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since <strong>2009</strong>. Mullvad is based in <span class="flag-icon flag-icon-se"></span> Sweden and does not have a free trial.</p>
+    <h5>{% include badge.html color="success" text="35 Countries" %}</h5>
+    <p>Mullvad has <a href="https://mullvad.net/en/servers/">servers in 35 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
+    <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>
+    <h5>{% include badge.html color="success" text="Independently Audited" %}</h5>
+    <p>Mullvad's VPN clients have been audited by Cure53 and Assured AB in a pentest report <a href="https://cure53.de/pentest-report_mullvad_v2.pdf">published at cure53.de</a>. The security researchers concluded:</p>
+    <blockquote class="blockquote">
+      <p class="mb-0">...Cure53 and Assured AB are happy with the results of the audit and the software leaves an overall positive impression. With security dedication of the in-house team at the Mullvad VPN compound, the testers have no doubts about the project being on the right track from a security standpoint.</p>
+    </blockquote>
+    <p>In 2020 a second audit <a href="https://mullvad.net/blog/2020/6/25/results-available-audit-mullvad-app/">was announced</a> and the <a href="https://cure53.de/pentest-report_mullvad_2020_v2.pdf">final audit report</a> was made available on Cure53's website.</p>
+    <h5>{% include badge.html color="success" text="Open Source Clients" %}</h5>
+    <p>Mullvad provides the source code for their desktop and mobile clients in their <a href="https://github.com/mullvad/mullvadvpn-app">GitHub organization</a>.</p>
+    <h5>{% include badge.html color="success" text="Accepts Bitcoin" %}</h5>
+    <p>Mullvad in addition to accepting credit/debit cards and PayPal, accepts <strong>Bitcoin</strong>, <strong>Bitcoin Cash</strong>, and <strong>cash/local currency</strong> as anonymous forms of payment. They also accept Swish and bank wire transfers.</p>
+    <h5>{% include badge.html color="success" text="WireGuard Support" %}</h5>
+    <p>In addition to standard OpenVPN connections, Mullvad supports WireGuard. WireGuard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.</p>
+    <h5>{% include badge.html color="success" text="IPv6 Support" %}</h5>
+    <p>Mullvad supports the future of networking <a href="https://en.wikipedia.org/wiki/IPv6">IPv6</a>. Their network allows users to <a href="https://mullvad.net/en/blog/2014/9/15/ipv6-support/">access services hosted on IPv6</a> as opposed to other providers who block IPv6 connections.</p>
+    <h5>{% include badge.html color="success" text="Remote Port Forwarding" %}</h5>
+    <p>Remote <a href="https://en.wikipedia.org/wiki/Port_forwarding">port forwarding</a> is allowed on Mullvad, see <a href="https://mullvad.net/help/port-forwarding-and-mullvad/">Port forwarding with Mullvad VPN</a>.</p>
+    <h5>{% include badge.html color="success" text="Mobile Clients" %}</h5>
+    <p>Mullvad has published <a href ="https://apps.apple.com/app/mullvad-vpn/id1488466513">App Store</a> and <a href="https://play.google.com/store/apps/details?id=net.mullvad.mullvadvpn">Google Play</a> clients, both supporting an easy-to use interface as opposed to requiring users to manual configure their WireGuard connections. The mobile client on Android is also available in <a href="https://f-droid.org/packages/net.mullvad.mullvadvpn">F-Droid</a>, which ensures that it is compiled with <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">reproducible builds</a>.</p></p>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
+    <p>The Mullvad VPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. The Mullvad website is also accessible via Tor at <a href="http://xcln5hkbriyklr6n.onion/">xcln5hkbriyklr6n.onion</a>.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img src="/assets/img/svg/3rd-party/protonvpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="ProtonVPN">
+    </div>
+    <div class="col">
+    <h2 id="protonvpn" class="anchor">
+      <a href="#protonvpn"><i class="fas fa-link anchor-icon"></i></a> ProtonVPN
+      {% include badge.html color="info" text="Free" %}
+      {% include badge.html color="info" text="Basic USD $48/y" %}
+      {% include badge.html color="secondary" text="Plus USD $96/y" %}
+    </h2>
+    <p><strong><a href="https://protonvpn.com/">ProtonVPN.com</a></strong> is a strong contender in the VPN space, and they have been in operation since <strong>2016</strong>. ProtonVPN is based in <span class="flag-icon flag-icon-ch"></span> Switzerland and offers a limited free pricing tier, as well as premium options. They offer a further 14% discount for buying a 2 year subscription.</p>
+    <h5>{% include badge.html color="success" text="44 Countries" %}</h5>
+    <p>ProtonVPN has <a href="https://protonvpn.com/vpn-servers">servers in 44 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
+    <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>
+    <h5>{% include badge.html color="success" text="Independently Audited" %}</h5>
+    <p>As of January 2020 ProtonVPN has undergone an independent audit by SEC Consult. SEC Consult found some medium and low risk vulnerabilities in ProtonVPN's Windows, Android, and iOS applications, all of which were "properly fixed" by ProtonVPN before the reports were published. None of the issues identified would have provided an attacker remote access to a user's device or traffic. You can view individual reports for each platform at <a href="https://protonvpn.com/blog/open-source/">protonvpn.com</a>.
+    <h5>{% include badge.html color="success" text="Open Source Clients" %}</h5>
+    <p>ProtonVPN provides the source code for their desktop and mobile clients in their <a href="https://github.com/ProtonVPN">GitHub organization</a>.</p>
+    <h5>{% include badge.html color="success" text="Accepts Bitcoin" %}</h5>
+    <p>ProtonVPN does technically accept Bitcoin payments; however, you either need to have an existing account, or contact their support team in advance to register with Bitcoin.</p>
+    <h5>{% include badge.html color="success" text="Mobile Clients" %}</h5>
+    <p>In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for <a href="https://apps.apple.com/us/app/protonvpn-fast-secure-vpn/id1437005085">App Store</a> and <a href="https://play.google.com/store/apps/details?id=ch.protonvpn.android&hl=en_US">Google Play</a> allowing for easy connections to their servers. The mobile client on Android is also available in <a href="https://f-droid.org/en/packages/ch.protonvpn.android">F-Droid</a>, which ensures that it is compiled with <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">reproducible builds</a>.</p>
+    <h5>{% include badge.html color="warning" text="No Port Forwarding" %}</h5>
+    <p>ProtonVPN does not currently support remote port forwarding, which may impact some applications. Especially Peer-to-Peer applications like Torrent clients.</p>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
+    <p>The ProtonVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. ProtonVPN also offers "Tor" servers allowing you to easily connect to onion sites, but we still strongly recommend using <a href="https://www.torproject.org/">the official Tor Browser</a> for this purpose.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img src="/assets/img/svg/3rd-party/ivpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="IVPN">
+    </div>
+    <div class="col">
+    <h2 id="ivpn" class="anchor">
+      <a href="#ivpn"><i class="fas fa-link anchor-icon"></i></a> IVPN
+      {% include badge.html color="info" text="Standard USD $60/y" %}
+      {% include badge.html color="secondary" text="Pro USD $100/y" %}
+    </h2>
+    <p><strong><a href="https://www.ivpn.net">IVPN.net</a></strong> is another premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar and offers a 3 day free trial.</p>
+    <h5>{% include badge.html color="success" text="32 Countries" %}</h5>
+    <p>IVPN has <a href="https://www.ivpn.net/server-locations">servers in 32 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
+    <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>
+    <h5>{% include badge.html color="success" text="Independently Audited" %}</h5>
+    <p>IVPN has undergone a <a href="https://cure53.de/audit-report_ivpn.pdf">no-logging audit from Cure53</a> which concluded in agreement with IVPN's no-logging claim. IVPN has also completed a <a href="https://cure53.de/summary-report_ivpn_2019.pdf">comprehensive pentest report Cure53</a> in January 2020. IVPN has also said they plan to have <a href="https://www.ivpn.net/blog/independent-security-audit-concluded">annual reports</a> in the future.</p>
+    <h5>{% include badge.html color="success" text="Open Source Clients" %}</h5>
+    <p>As of Feburary 2020 <a href="https://www.ivpn.net/blog/ivpn-applications-are-now-open-source">IVPN applications are now open source</a>. Source code can be obtained from their <a href="https://github.com/ivpn">GitHub organization</a>.</p>
+    <h5>{% include badge.html color="success" text="Accepts Bitcoin" %}</h5>
+    <p>In addition to accepting credit/debit cards and PayPal, IVPN accepts <strong>Bitcoin</strong> and <strong>cash/local currency</strong> (on annual plans) as anonymous forms of payment.</p>
+    <h5>{% include badge.html color="success" text="WireGuard Support" %}</h5>
+    <p>In addition to standard OpenVPN connections, IVPN supports WireGuard. WireGuard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.</p>
+    <h5>{% include badge.html color="success" text="Remote Port Forwarding" %}</h5>
+    <p>Remote <a href="https://en.wikipedia.org/wiki/Port_forwarding">port forwarding</a> is possible with a Pro plan. Port forwarding <a href="https://www.ivpn.net/knowledgebase/81/How-do-I-activate-port-forwarding.html">can be activated</a> via the client area. Port forwarding is only available on IVPN when <a href="https://www.ivpn.net/knowledgebase/116/Port-forwarding-is-not-working-why.html">using OpenVPN and is disabled on US servers</a>.</p>
+    <h5>{% include badge.html color="success" text="Mobile Clients" %}</h5>
+    <p>In addition to providing standard OpenVPN configuration files, IVPN has mobile clients for <a href="https://apps.apple.com/us/app/ivpn-serious-privacy-protection/id1193122683">App Store</a> and <a href="https://play.google.com/store/apps/details?id=net.ivpn.client">Google Play</a> allowing for easy connections to their servers. The mobile client on Android is also available in <a href="https://f-droid.org/en/packages/net.ivpn.client">F-Droid</a>, which ensures that it is compiled with <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">reproducible builds</a>.</p>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
+    <p>The IVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. IVPN also provides "<a href="https://www.ivpn.net/antitracker">AntiTracker</a>" functionality, which blocks advertising networks and trackers from the network level.</p>
+    </div>
+  </div>
+</div>
+
+<div class="alert alert-warning" role="alert">
+  <strong>Note: Using a VPN provider will not make you anonymous, but it will give you better privacy in certain situations. A VPN is not a tool for illegal activities. Don't rely on a "no log" policy.</strong>
+</div>
--- a/_includes/sections/warrant-canary.html
+++ b/_includes/sections/warrant-canary.html
@ -0,0 +1,22 @@
+<h1 id="wc" class="anchor"><a href="#wc"><i class="fas fa-link anchor-icon"></i></a> What is a warrant canary?</h1>
+
+<img src="/assets/img/svg/layout/warrant_canary_example.svg" width="450px" class="img-fluid float-right ml-3" alt="Warrant Canary Example">
+
+<p>A warrant canary is a posted document stating that an organization has not received any secret subpoenas during a specific period of time. If this document fails to be updated during the specified time then the user is to assume that the service has received such a subpoena and should stop using the service.</p>
+
+<h4>Warrant Canary Examples:</h4>
+
+<ol>
+  <li><a href="https://proxy.sh/canary">https://proxy.sh/canary</a></li>
+  <li><a href="https://www.ivpn.net/resources/canary.txt">https://www.ivpn.net/resources/canary.txt</a></li>
+  <li><a href="https://www.bolehvpn.net/canary.txt">https://www.bolehvpn.net/canary.txt</a></li>
+  <li><a href="https://www.ipredator.se/static/downloads/canary.txt">https://www.ipredator.se/static/downloads/canary.txt</a></li>
+</ol>
+
+<h4>Related Warrant Canary Information</h4>
+
+<ul>
+  <li><a href="https://www.eff.org/deeplinks/2014/04/warrant-canary-faq">Warrant Canary Frequently Asked Questions</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Warrant_canary#Companies_and_organizations_with_warrant_canaries">Companies and organizations with warrant canaries</a></li>
+  <li><a href="https://www.schneier.com/blog/archives/2015/03/australia_outla.html">Warrant canary criticism by Bruce Schneier and an example of a law against warrant canaries.</a></li>
+</ul>
--- a/_includes/sections/windows10.html
+++ b/_includes/sections/windows10.html
@ -0,0 +1,107 @@
+<h1 id="win10" class="anchor"><a href="#win10"><i class="fas fa-link anchor-icon"></i></a> Don't use Windows 10 - It's a privacy nightmare</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
+</div>
+
+<img src="/assets/img/svg/layout/windows_privacy.svg" width="367" height="369" class="img-fluid float-right ml-3" alt="Windows 10 Privacy">
+
+<ol>
+  <li><strong>Data syncing is by default enabled.</strong>
+    <ul>
+      <li>Browsing history and open websites.</li>
+      <li>Apps settings.</li>
+      <li>WiFi hotspot names and passwords.</li>
+    </ul>
+  </li>
+
+  <li><strong>Your device is by default tagged with a unique advertising ID.</strong>
+    <ul>
+      <li>Used to serve you with personalized advertisements by third-party advertisers and ad networks.</li>
+    </ul>
+  </li>
+
+  <li><strong>Cortana can collect any of your data.</strong>
+    <ul>
+      <li>Your keystrokes, searches and mic input.</li>
+    </ul>
+    <ul>
+      <li>Calendar data.</li>
+    </ul>
+    <ul>
+      <li>Music you listen to.</li>
+    </ul>
+    <ul>
+      <li>Credit Card information.</li>
+    </ul>
+    <ul>
+      <li>Purchases.</li>
+    </ul>
+  </li>
+
+  <li><strong>Microsoft can collect any personal data.</strong>
+    <ul>
+      <li>Your identity.</li>
+    </ul>
+    <ul>
+      <li>Passwords.</li>
+    </ul>
+    <ul>
+      <li>Demographics.</li>
+    </ul>
+    <ul>
+      <li>Interests and habits.</li>
+    </ul>
+    <ul>
+      <li>Usage data.</li>
+    </ul>
+    <ul>
+      <li>Contacts and relationships.</li>
+    </ul>
+    <ul>
+      <li>Location data.</li>
+    </ul>
+    <ul>
+      <li>Content like emails, instant messages, caller list, audio and video recordings.</li>
+    </ul>
+  </li>
+
+  <li><strong>Your data can be shared.</strong>
+    <ul>
+      <li>When downloading Windows 10, you are authorizing Microsoft to share any of above-mentioned data with any third-party, with or without your consent.</li>
+    </ul>
+  </li>
+</ol>
+
+<p><a class="btn btn-warning" href="https://www.winprivacy.de/english-home/">Download: W10Privacy</a></p>
+
+<p>This tool uses some known methods that attempt to disable major tracking features in Windows 10.</p>
+
+<h3>Related Information</h3>
+
+<ul>
+  <li><a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement</a> - Microsoft collects, uses and discloses personal information as described here. This allows OneDrive data, Cortana searches, and MS browser history to be sold to third parties.</li>
+  <li><a href="https://support.microsoft.com/en-us/help/4468233/cortana-and-privacy-microsoft-privacy">Cortana and privacy</a> - To personalize your experience and provide the best possible suggestions, Cortana accesses your email and other communications and collects data about your contacts (People), like their title, suffix, first name, last name, middle name, nicknames, and company name. If you call, email, or text someone or they call, email, or text you, Cortana collects that person’s email address or phone number.</li>
+</ul>
+
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+      <h3>Some good news</h3>
+      <ul>
+        <li><a href="https://github.com/crazy-max/WindowsSpyBlocker/releases">WindowsSpyBlocker</a> - Open-source tool that blocks data collection.</li>
+        <li><a href="https://www.ghacks.net/2015/08/14/comparison-of-windows-10-privacy-tools/">Comparison of Windows 10 Privacy tools</a> - ghacks.net</li>
+      </ul>
+    </div>
+
+    <div class="col-md-6">
+      <h3>More bad news</h3>
+      <ul>
+        <li><a href="https://thehackernews.com/2016/02/microsoft-windows10-privacy.html">
+            Windows 10 Sends Your Data 5500 Times Every Day Even After Tweaking Privacy Settings</a> - The Hacker News.</li>
+        <li><a href="https://arstechnica.com/information-technology/2015/08/even-when-told-not-to-windows-10-just-cant-stop-talking-to-microsoft/">Even when told not to, Windows 10 just can't stop talking to Microsoft. It's no wonder that privacy activists are up in arms.</a> - Ars Technica.</li>
+        <li><a href="https://www.techdirt.com/articles/20150820/06171332012/windows-10-reserves-right-to-block-pirated-games-unauthorized-hardware.shtml">Windows 10 Reserves The Right To Block Pirated Games And 'Unauthorized' Hardware.</a> - Techdirt.</li>
+      </ul>
+    </div>
+  </div>
+</div>
--- a/_includes/sponsors/gold.html
+++ b/_includes/sponsors/gold.html
@ -0,0 +1,32 @@
+<div class="d-flex flex-wrap justify-content-around">
+  <a class="m-3" href="https://safing.io" target="_blank" rel="noreferrer">
+    <img
+      src="/assets/img/svg/3rd-party/sponsors/safing.svg"
+      {% unless page.url == '/sponsors/' %}data-theme-src="/assets/img/svg/3rd-party/sponsors/safing-dark.svg"{% endunless %}
+      height="70rem"
+      title="Safing Privacy Network - Launching on Kickstarter January 2nd, 2020"
+      alt="Safing Privacy Network - Safing.io Logo" />
+  </a>
+  <a class="m-3" href="https://www.oeck.com" target="_blank" rel="noreferrer">
+    <img
+      src="/assets/img/png/3rd-party/sponsors/oeck.png"
+      {% unless page.url == '/sponsors/' %}data-theme-src="/assets/img/png/3rd-party/sponsors/oeck-dark.png"{% endunless %}
+      height="70rem"
+      title="Oeck - A new type of VPN - Unique, fast and private."
+      alt="Insurgo Logo" />
+  </a>
+  <a class="m-3" href="https://insurgo.ca" target="_blank" rel="noreferrer">
+    <img
+      src="/assets/img/png/3rd-party/sponsors/insurgo.png"
+      height="70rem"
+      title="Insurgo Technologies Libres / Open Technologies — Empower yourself!"
+      alt="Insurgo Logo" />
+  </a>
+  <a class="m-3" href="https://joindeleteme.com" target="_blank" rel="noreferrer">
+    <img
+      src="/assets/img/png/3rd-party/sponsors/deleteme.png"
+      height="70rem"
+      title="DeleteMe is a hands-free subscription service that removes your personal information from data brokers and prevents it from being sold online."
+      alt="DeleteMe Logo" />
+  </a>
+</div>
--- a/_includes/sponsors/list.html
+++ b/_includes/sponsors/list.html
@ -0,0 +1,11 @@
+<ul class="d-flex flex-wrap list-group-flush">
+  <li class="list-group-item flex-fill">Alex</li>
+  <li class="list-group-item flex-fill">Daw-Ran Liou</li>
+  <li class="list-group-item flex-fill">Greg Werbin</li>
+  <li class="list-group-item flex-fill">Michael DeMichillie</li>
+  <li class="list-group-item flex-fill">Nathan Myers</li>
+  <li class="list-group-item flex-fill">PablO</li>
+  <li class="list-group-item flex-fill">Syfaer</li>
+  <li class="list-group-item flex-fill">the0</li>
+  <li class="list-group-item flex-fill">Troy Vassalotti</li>
+</ul>
--- a/_includes/sponsors/silver.html
+++ b/_includes/sponsors/silver.html
@ -0,0 +1,36 @@
+<div class="col-6 col-sm-4 col-md-3 my-3">
+  <div class="d-flex justify-content-start">
+    <div><a href="https://techlore.tech"><img src="/assets/img/svg/3rd-party/sponsors/techlore.svg" class="mx-3" width="64" height="64" title="Techlore, Home of Go Incognito" alt="Techlore Logo"></a></div>
+    <div class="d-flex flex-column align-self-center">
+    <p class="my-0"><strong>Techlore</strong></p>
+    <a href="https://techlore.tech" class="my-0">https://techlore.tech</a>
+    </div>
+  </div>
+</div>
+<div class="col-6 col-sm-4 col-md-3 my-3">
+  <div class="d-flex justify-content-start">
+    <div><a href="https://www.awesomeresources.co.uk/"><img src="/assets/img/png/3rd-party/sponsors/awesomeresources.png" class="mx-3" width="64" height="64" alt="Awesome Resources Logo"></a></div>
+    <div class="d-flex flex-column align-self-center">
+    <p class="my-0"><strong>Awesome Resources Ltd</strong></p>
+    <a href="https://www.awesomeresources.co.uk/" class="my-0">https://www.awesomeresources.co.uk</a>
+    </div>
+  </div>
+</div>
+<div class="col-6 col-sm-4 col-md-3 my-3">
+  <div class="d-flex justify-content-start">
+    <div><a href="https://www.looktotheright.com"><img src="/assets/img/png/3rd-party/sponsors/looktotheright.png" class="mx-3" width="64" height="64" title="Providing Google Ads/Paid Search/PPC services and Custom SEO solutions to businesses in the Greater Raleigh, NC area, Santiago, Chile & Globally." alt="Look To The Right Logo"></a></div>
+    <div class="d-flex flex-column align-self-center">
+    <p class="my-0"><strong>Look To The Right</strong></p>
+    <a href="https://www.looktotheright.com" class="my-0">https://looktotheright.com</a>
+    </div>
+  </div>
+</div>
+<div class="col-6 col-sm-4 col-md-3 my-3">
+  <div class="d-flex justify-content-start">
+    <div><a href="https://www.scams.info"><img src="/assets/img/png/3rd-party/sponsors/scamsinfo.png" class="mx-3" width="64" height="64" title="An Overview of the Safest Online Gambling Sites in the UK" alt="scams.info"></a></div>
+    <div class="d-flex flex-column align-self-center">
+    <p class="my-0"><strong>scams.info</strong></p>
+    <a href="https://www.scams.info" class="my-0">https://www.scams.info</a>
+    </div>
+  </div>
+</div>
--- a/_includes/team.html
+++ b/_includes/team.html
@ -0,0 +1,50 @@
+<div class="col-12 col-sm-6 col-lg-4 {% unless include.emeritus %}col-xl-3{% endunless %}">
+  <div class="card mb-3 mx-4 mx-sm-0" itemprop="member" itemscope itemtype="http://schema.org/Person">
+    {% if include.avatar %}<img src="{{ site.baseurl }}/assets/img/{{ include.avatar | split: "." | last }}/team/{{ include.avatar }}" class="card-img-top" itemprop="image" alt="{% if include.nick %}{{ include.nick }}{% else %}{{ include.name }}{% endif %}">{% endif %}
+    <div class="card-body">
+
+      <h5 class="card-title mt-0" itemprop="name">
+      {% if include.nick %}
+        {{ include.nick }}</h5>
+      <meta itemprop="alternateName" content="{{ include.name }}" />
+      {% else %}
+        {{ include.name }}</h5>
+      {% endif %}
+
+      <h6 class="card-subtitle mb-2 text-muted" itemprop="jobTitle">{% if include.role %}{{ include.role }}{% elsif include.emeritus %}Former Contributor{% else %}Contributor{% endif %}</h6>
+      {% if include.bio %}<p class="card-text" itemprop="description">{{ include.bio | default: "<i>Hmm, this user hasn't written a bio quite yet :(</i>" }}</p>{% endif %}
+      <div class="mx-n2">
+        {% if include.email %}
+        <a href="{{ include.email }}" aria-label="Email" class="mx-2 text-decoration-none" itemprop="email">
+          <i class="fas fa-envelope" aria-hidden="true" title="{{ include.email }}"></i>
+        </a>
+        {% endif %}
+        {% if include.website %}
+        <a href="{{ include.website }}" aria-label="Website" class="mx-2 text-decoration-none" itemprop="url">
+          <i class="fas fa-link" aria-hidden="true" title="Website"></i>
+        </a>
+        {% endif %}
+        {% if include.keys %}
+        <a href="{{ include.keys }}" aria-label="Keys" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fas fa-key" aria-hidden="true" title="Keys"></i>
+        </a>
+        {% endif %}
+        {% if include.mastodon %}
+        <a href="{{ include.mastodon }}" aria-label="Mastodon" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fab fa-mastodon" aria-hidden="true" title="Mastodon Profile"></i>
+        </a>
+        {% endif %}
+        {% if include.twitter %}
+        <a href="https://twitter.com/{{ include.twitter }}" aria-label="Twitter" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fab fa-twitter" aria-hidden="true" title="Twitter Profile"></i>
+        </a>
+        {% endif %}
+        {% if include.blog %}
+        <a href="https://blog.privacytools.io/author/{{ include.blog }}" aria-label="Blog" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fas fa-pen-nib" aria-hidden="true" title="PrivacyTools Blog Author"></i>
+        </a>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</div>
--- a/_layouts/default.html
+++ b/_layouts/default.html
@ -0,0 +1,11 @@
+---
+layout: minimal
+---
+<div class="container" role="main">
+  <main>
+  {{ content }}
+  </main>
+  <footer>
+  {% include footer.html %}
+  </footer>
+</div>
--- a/_layouts/minimal.html
+++ b/_layouts/minimal.html
@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+{% include head.html %}
+<body data-spy="scroll" data-target="#navbar">
+  <script src="/assets/js/applytheme.js?v=1"></script>
+  <header>
+  {% include nav.html %}
+  <div id="top" class="py-4"></div>
+  </header>
+  {{ content }}
+  {% include scripts.html %}
+</body>
+</html>
--- a/_layouts/page.html
+++ b/_layouts/page.html
@ -0,0 +1,12 @@
+---
+layout: default
+---
+
+{% include breadcrumbs.html %}
+
+<div class="jumbotron p-5">
+  <h1 class="display-4">{{ page.title }}</h1>
+  {% if page.description and page.hidedesc != true %}<p class="lead">{{ page.description }}</p>{% endif %}
+</div>
+
+{{ content }}
--- a/_sass/_vars.scss
+++ b/_sass/_vars.scss
@ -0,0 +1,27 @@
+/* Variables */
+
+/* Cards */
+$card-shadow:         0 3px 10px 0 rgba(150, 150, 150, .2);
+$card-succes-border:  rgba(40, 167, 69, .5);
+$card-primary-border: rgba(0, 123, 255, .5);
+$card-warning-border: rgba(255, 193, 7, .5);
+
+/* Blockquote */
+$blockquote-border:   #eee;
+
+/* Share button */
+$share-btn:           #fff;
+$share-btn-shadow:    0 2px 0 0 rgba(0, 0, 0, .2);
+$share-btn-hover:     #eee;
+$share-btn-active:    #e2e2e2;
+
+/* Social */
+$twitter:             #55acee;
+$mastodon:            #3088d4;
+$facebook:            #3b5998;
+$mix:                 #ff8126;
+$reddit:              #ff5700;
+$linkedin:            #4875b4;
+$email:               #444;
+$diaspora:            #2f3537;
+$tor:                 #7d4698;
--- a/_sass/bootstrap.scss
+++ b/_sass/bootstrap.scss
--- a/_sass/flag-icon.scss
+++ b/_sass/flag-icon.scss
--- a/_sass/fontawesome.scss
+++ b/_sass/fontawesome.scss
--- a/_sass/ptio-font.scss
+++ b/_sass/ptio-font.scss
@ -0,0 +1,60 @@
+/*
+  Icon Font: ptio-font
+*/
+
+@font-face {
+  font-family: "ptio-font";
+  src: url("../webfonts/ptio-font.eot");
+  src: url("../webfonts/ptio-font.eot?#iefix") format("embedded-opentype"),
+       url("../webfonts/ptio-font.woff2") format("woff2"),
+       url("../webfonts/ptio-font.woff") format("woff"),
+       url("../webfonts/ptio-font.ttf") format("truetype"),
+       url("../webfonts/ptio-font.svg#ptio-font") format("svg");
+  font-weight: normal;
+  font-style: normal;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  @font-face {
+    font-family: "ptio-font";
+    src: url("../webfonts/ptio-font.svg#ptio-font") format("svg");
+  }
+}
+
+[data-icon]:before { content: attr(data-icon); }
+
+[data-icon]:before,
+.ptio-f-droid:before,
+.ptio-i2p-garlic:before,
+.ptio-ios:before,
+.ptio-linux:before,
+.ptio-macos:before,
+.ptio-mix:before,
+.ptio-netbsd:before,
+.ptio-openbsd:before,
+.ptio-sailfish-os:before,
+.ptio-tor:before {
+  display: inline-block;
+  font-family: "ptio-font";
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  line-height: 1;
+  text-decoration: inherit;
+  text-rendering: optimizeLegibility;
+  text-transform: none;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  font-smoothing: antialiased;
+}
+
+.ptio-f-droid:before { content: "\f100"; }
+.ptio-i2p-garlic:before { content: "\f10c"; }
+.ptio-ios:before { content: "\f101"; }
+.ptio-linux:before { content: "\f102"; }
+.ptio-macos:before { content: "\f103"; }
+.ptio-mix:before { content: "\f107"; }
+.ptio-netbsd:before { content: "\f104"; }
+.ptio-openbsd:before { content: "\f105"; }
+.ptio-sailfish-os:before { content: "\f106"; }
+.ptio-tor:before { content: "\f10b"; }
--- a/_sass/sortable-theme-bootstrap.scss
+++ b/_sass/sortable-theme-bootstrap.scss
@ -0,0 +1,90 @@
+/* line 2, ../sass/_sortable.sass */
+table[data-sortable] {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+/* line 6, ../sass/_sortable.sass */
+table[data-sortable] th {
+  vertical-align: bottom;
+  font-weight: bold;
+}
+/* line 10, ../sass/_sortable.sass */
+table[data-sortable] th, table[data-sortable] td {
+  text-align: left;
+  padding: 10px;
+}
+/* line 14, ../sass/_sortable.sass */
+table[data-sortable] th:not([data-sortable="false"]) {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -o-user-select: none;
+  user-select: none;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  -webkit-touch-callout: none;
+  cursor: pointer;
+}
+/* line 26, ../sass/_sortable.sass */
+table[data-sortable] th:after {
+  content: "";
+  visibility: hidden;
+  display: inline-block;
+  vertical-align: inherit;
+  height: 0;
+  width: 0;
+  border-width: 5px;
+  border-style: solid;
+  border-color: transparent;
+  margin-right: 1px;
+  margin-left: 10px;
+  float: right;
+}
+/* line 40, ../sass/_sortable.sass */
+table[data-sortable] th[data-sorted="true"]:after {
+  visibility: visible;
+}
+/* line 43, ../sass/_sortable.sass */
+table[data-sortable] th[data-sorted-direction="descending"]:after {
+  border-top-color: inherit;
+  margin-top: 8px;
+}
+/* line 47, ../sass/_sortable.sass */
+table[data-sortable] th[data-sorted-direction="ascending"]:after {
+  border-bottom-color: inherit;
+  margin-top: 3px;
+}
+
+/* line 5, ../sass/sortable-theme-bootstrap.sass */
+table[data-sortable].sortable-theme-bootstrap {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  background: white;
+}
+/* line 12, ../sass/sortable-theme-bootstrap.sass */
+table[data-sortable].sortable-theme-bootstrap thead th {
+  border-bottom: 2px solid #e0e0e0;
+}
+/* line 15, ../sass/sortable-theme-bootstrap.sass */
+table[data-sortable].sortable-theme-bootstrap tbody td {
+  border-top: 1px solid #e0e0e0;
+}
+/* line 18, ../sass/sortable-theme-bootstrap.sass */
+table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"] {
+  color: #3a87ad;
+  background: #d9edf7;
+  border-bottom-color: #bce8f1;
+}
+/* line 23, ../sass/sortable-theme-bootstrap.sass */
+table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="descending"]:after {
+  border-top-color: #3a87ad;
+}
+/* line 26, ../sass/sortable-theme-bootstrap.sass */
+table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="ascending"]:after {
+  border-bottom-color: #3a87ad;
+}
+/* line 31, ../sass/sortable-theme-bootstrap.sass */
+table[data-sortable].sortable-theme-bootstrap.sortable-theme-bootstrap-striped tbody > tr:nth-child(odd) > td {
+  background-color: #f9f9f9;
+}
--- a/assets/css/dark.scss
+++ b/assets/css/dark.scss
@ -0,0 +1,196 @@
+---
+---
+@import '_vars';
+
+$dark-900: #181b21;
+$dark-800: #22262e;
+$dark-700: #343a46;
+$dark-600: #464f60;
+$light: #d8d8d8;
+$primary: #345e8e;
+$danger: #b63f4a;
+$secondary: $dark-600;
+$success: #2c7f40;
+$warning: #c6a339;
+$info: #218899;
+
+
+/*
+ * HTML
+ */
+
+body {
+  background: $dark-900;
+  color: $light;
+}
+a {
+  color: lighten($primary, 25%);
+}
+a:hover {
+  color: lighten($primary, 10%);
+}
+img {
+  filter: saturate(80%);
+}
+
+
+/*
+ * Bootstrap
+ */
+
+.alert a {
+  color: lighten($primary, 30%);
+}
+
+.bg-secondary, .btn-secondary, .badge-secondary { background-color: $secondary !important; }
+.btn-secondary, .card-secondary .card-header { border-color: $secondary !important; }
+.alert-secondary, .btn-secondary:hover {
+  color: $light;
+  background-color: darken($secondary, 10%);
+  border-color: darken($secondary, 10%);
+}
+
+.bg-primary, .btn-primary, .badge-primary { background-color: $primary !important; }
+.btn-primary, .card-primary .card-header { border-color: $primary !important; }
+.text-primary { color: $primary !important; }
+.alert-primary, .btn-primary:hover {
+  color: $light;
+  background-color: darken($primary, 10%);
+  border-color: darken($primary, 10%);
+}
+
+.bg-warning, .btn-warning, .badge-warning { background-color: $warning !important; }
+.btn-warning, .card-warning .card-header { border-color: $warning !important; }
+.btn-warning:hover { color: $dark-700 !important }
+.text-warning { color: $warning !important; }
+.card-warning > .text-dark { color: $dark-900 !important; }
+.alert-warning a { color: darken($primary, 6%); }
+.badge-warning a { color: $primary; }
+.alert-warning, .btn-warning:hover {
+  color: $dark-900;
+  background-color: darken($warning, 8%);
+  border-color: darken($warning, 8%);
+}
+
+.bg-info, .btn-info, .badge-info { background-color: $info !important; }
+.btn-info, .card-info .card-header { border-color: $info !important; }
+.text-info { color: $info !important; }
+.alert-info, .btn-info:hover {
+  color: $light;
+  background-color: darken($info, 10%);
+  border-color: darken($info, 10%);
+}
+
+.bg-success, .btn-success, .badge-success { background-color: $success !important; }
+.btn-success, .card-success .card-header { border-color: $success !important; }
+.text-success { color: $success !important; }
+.alert-success, .btn-success {
+  color: $light;
+  background-color: darken($success, 10%);
+  border-color: darken($success, 10%);
+}
+
+.bg-danger, .btn-danger, .badge-danger { background-color: $danger !important; }
+.btn-danger, .card-danger .card-header { border-color: $danger !important; }
+.text-danger { color: $danger !important; }
+.alert-danger, .btn-danger:hover {
+  color: $light;
+  background-color: darken($danger, 10%);
+  border-color: darken($danger, 10%);
+}
+
+.btn-tor { background: desaturate($tor, 10%); }
+.btn-tor:hover { background: darken($tor, 5%); }
+
+.card {
+  box-shadow: none !important;
+}
+
+.dropdown-item:hover {
+  color: $light;
+  background-color: $dark-800;
+}
+
+.form-control,
+.form-control:focus {
+  color: $light;
+  background: $dark-800;
+  border-color: $dark-800;
+}
+
+.form-control[readonly],
+.form-control:disabled {
+  background: $dark-800;
+}
+
+.card,
+.jumbotron,
+.list-group-item,
+ol.breadcrumb {
+  background: $dark-800;
+}
+
+.blockquote {
+  border-color: $dark-800;
+}
+
+.bg-dark {
+  background-color: $dark-800 !important;
+}
+
+.dropdown-item {
+  color: $light;
+}
+
+.list-group-item {
+  border-color: $dark-700;
+}
+
+.text-dark {
+  color: $light !important;
+}
+
+table[data-sortable].sortable-theme-bootstrap {
+  color: $light;
+  background-color: $dark-800;
+}
+table[data-sortable].sortable-theme-bootstrap th,
+table[data-sortable].sortable-theme-bootstrap td {
+  border-color: $dark-600 !important;
+}
+table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"] {
+  color: $light;
+  background: $dark-700;
+}
+table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="ascending"]::after, {
+  border-bottom-color: $light;
+}
+table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="descending"]::after {
+  border-top-color: $light;
+}
+
+
+/*
+ * Other
+ */
+
+.nav-dropdown {
+  color: $light;
+  background-color: $dark-900;
+  border-color: $dark-800;
+}
+
+.nav-theme-icon:before {
+  color: $warning;
+  font-size: 1em;
+  content: "\f185";
+}
+
+.twitter { background: desaturate($twitter, 25%); }
+.mastodon { background: desaturate($mastodon, 25%); }
+.facebook { background: desaturate($facebook, 25%); }
+.mix { background: desaturate($mix, 25%); }
+.reddit { background: desaturate($reddit, 25%); }
+.linkedin { background: desaturate($linkedin, 25%); }
+.email { background: desaturate($email, 25%); }
+.diaspora { background: desaturate($diaspora, 25%); }
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@ -0,0 +1,408 @@
+---
+---
+
+@import '_vars';
+@import 'bootstrap';
+@import 'flag-icon';
+@import 'fontawesome';
+@import 'ptio-font';
+@import 'sortable-theme-bootstrap';
+
+body {
+  word-wrap: break-word;
+}
+
+dt {
+  overflow-wrap: break-word;
+}
+
+.card {
+  box-shadow: $card-shadow !important;
+}
+
+/* Make links and long strings responsive */
+a,
+.long-string-list {
+  li {
+    word-wrap: break-word;
+  }
+}
+
+.card-ol {
+  padding-left: 1.25rem;
+}
+
+/*.card-success, */
+.card-success {
+  .card-header {
+    border-color: $card-succes-border !important;
+  }
+}
+
+.card-primary {
+  .card-header {
+    border-color: $card-primary-border !important;
+  }
+}
+
+.card-warning  {
+  .card-header {
+    border-color: $card-warning-border !important;
+  }
+}
+
+.card-list {
+  margin-top: 2em;
+  margin-bottom: 2em;
+  margin-left: 1em;
+  margin-right: 1em;
+}
+
+.blockquote {
+  border-left: 5px solid $blockquote-border;
+  font-size: 1.2rem;
+  line-height: 1.35;
+  padding: 10px 20px;
+}
+
+.theme-dropdown {
+  .dropdown-menu {
+    display: block;
+    margin-bottom: 20px;
+    position: static;
+  }
+}
+
+.theme-showcase {
+  p > .btn {
+    margin: 5px 0;
+  }
+
+  .navbar {
+    .container {
+      width: auto;
+    }
+  }
+}
+
+.anchor, .page-header h1 {
+  margin-top: 3.5rem;
+  margin-bottom: 2rem;
+  &:target {
+    margin-top: -4rem;
+    padding-top: 7.5rem;
+  }
+}
+
+h2, h3:not(.h5), h4, h5 {
+  margin-top: 1.5rem;
+  margin-bottom: 1rem;
+}
+
+.h5 {
+  margin-bottom: 0rem;
+}
+
+.header-404 {
+  font-size: 10rem;
+}
+
+.anchor-icon {
+  font-size: .8em;
+}
+
+.panel-item {
+  float: right;
+  margin-left: 5px;
+}
+
+.panel-pic {
+  float: left;
+  margin-right: 15px;
+}
+
+.panel-icon {
+  float: right;
+  margin: 15px;
+  font-size: 5.5em;
+}
+
+.panel-font {
+  font-size: 120px;
+}
+
+.share-btn {
+  border: 0;
+  box-shadow: $share-btn-shadow;
+  color: $share-btn;
+  display: inline-block;
+  opacity: .9;
+  outline: none;
+  padding: 1em;
+  text-align: center;
+  width: 8em;
+
+  &:hover {
+    color: $share-btn-hover;
+  }
+
+  &:active {
+    box-shadow: none;
+    color: $share-btn-active;
+    outline: none;
+    position: relative;
+    top: 2px;
+  }
+}
+
+#top {
+  margin-bottom: 3rem !important;
+}
+
+.twitter { background: $twitter; }
+.mastodon { background: $mastodon; }
+.facebook { background: $facebook; }
+.mix { background: $mix; }
+.reddit { background: $reddit; }
+.linkedin    { background: $linkedin; }
+.email { background: $email; }
+.diaspora { background: $diaspora; }
+
+.footer-divider {
+  margin-top: 3em;
+  margin-bottom: 3em;
+  border: none;
+  height: 1px;
+  background-color: #343A40;
+}
+
+.copyright-text {
+  margin-top: 1em;
+  margin-bottom: 3em;
+  text-align: justify;
+}
+
+.no-text-wrap {
+  white-space: nowrap;
+}
+
+.hover-text-decoration-none:hover {
+  text-decoration: none;
+  -webkit-text-decoration-skip: object;
+}
+
+.table td, .table th {
+  vertical-align: middle;
+}
+
+
+.btn-icon {
+  display: flex;
+  justify-content: center;
+  font-size: 1.5rem;
+  padding: 0.5rem;
+  border-radius: 0.25rem;
+  display: flex;
+  height: 2.4rem;
+  width: 2.4rem;
+  color: #eee;
+}
+.btn-icon:hover {
+  text-decoration: none;
+  color: #fff;
+}
+
+.btn-tor {
+  background: $tor;
+}
+.btn-tor:hover {
+  background: darken($tor, 5%);
+}
+
+.icon-btn {
+  padding: 0px;
+}
+
+.flow-root {
+  display: flow-root;
+}
+
+/*
+ * Bootstrap 4.2+ features
+ */
+
+.text-decoration-none {
+  text-decoration: none !important;
+}
+
+.mx-n2 {
+  margin-left: -0.5rem;
+  margin-right: -0.5rem;
+}
+
+
+
+/*
+ * Navbar
+ */
+
+#navbar {
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 1140px;
+  padding: .75rem 3rem;
+  color: rgba(255,255,255,0.5);
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+#navbar .menu {
+  position: relative;
+}
+
+.menu {
+  display: flex;
+  justify-content: space-between;
+}
+
+.nav-anchor {
+  display: inline;
+  color: inherit;
+}
+
+.nav-anchor:hover {
+  text-decoration: none;
+}
+
+.nav-anchor:hover,
+.nav-summary:hover,
+.nav-details[open] > summary > .nav-summary {
+  color: rgba(255,255,255,0.8);
+}
+
+.nav-dropdown {
+  color: var(--dark);
+  background-color: var(--light);
+  padding: .5rem 0;
+  margin-top: .5rem;
+  position: absolute;
+  border: 1px solid #dee2e6;
+  border-radius: .25rem;
+  box-shadow: 0 .5rem 1rem rgba(0,0,0,.15);
+  z-index: 10;
+}
+
+#nav-right > details > .nav-dropdown {
+  right: 0;
+}
+
+.nav-details {
+  display: inline;
+  position: relative;
+}
+
+.nav-details > summary {
+  list-style: none;
+}
+.nav-details > summary::-webkit-details-marker {
+  display: none;
+}
+
+#nav-right > .nav-details,
+#nav-right > .nav-anchor {
+  padding-left: 0.5rem;
+}
+#nav-left > .nav-details,
+#nav-left > .nav-anchor {
+  padding-right: 0.5rem;
+}
+
+input#nav-toggle,
+#nav-toggle-label {
+  display: none;
+}
+
+#nav-home-mobile {
+  display: none;
+}
+
+#nav-switch-theme {
+  /* We will make it visible with JavaScript
+   * as it does not work without it */
+  display: none;
+  cursor: pointer;
+}
+
+/*
+ * Mobile hamburger menu
+ */
+
+@media only screen and (max-width: 992px) {
+  .menu,
+  .nav-details,
+  .nav-anchor {
+    display: block;
+  }
+  .menu {
+    margin-top: 0.5rem;
+  }
+  #nav-home {
+    display: none;
+  }
+  #nav-home-mobile {
+    display: inline;
+  }
+  input#nav-toggle:checked ~ .menu {
+    display: none;
+  }
+  input#nav-toggle + label {
+    display: block;
+    cursor: pointer;
+    margin-bottom: 0;
+  }
+  .nav-dropdown {
+    display: block;
+    position: relative;
+    max-height: 15.75em;
+    overflow-y: auto;
+    left: 0;
+    right: 0;
+  }
+  #nav-right > .nav-details,
+  #nav-right > .nav-anchor,
+  #nav-left > .nav-details,
+  #nav-left > .nav-anchor {
+    padding: 0 0;
+  }
+  #navbar {
+    padding: 1rem 3rem;
+  }
+}
+
+@media only screen and (max-width: 768px) {
+  #navbar {
+    padding: 1rem 2rem;
+  }
+}
+
+@media only screen and (max-width: 575px) {
+  #navbar {
+    padding: 1rem 1rem;
+  }
+}
+
+@media only screen and (max-height: 350px) {
+  .nav-dropdown {
+    max-height: 8em;
+  }
+}
+
+.nav-theme-icon:before {
+  color: var(--warning);
+  font-size: 0.875em;
+  content: "\f186";
+}
--- a/Show More
+++ b/Show More