Add files via upload

.github/CODEOWNERS

@@ -4,29 +4,14 @@
 /pages/ @privacytoolsIO/editorial
 /_includes/sections/ @privacytoolsIO/editorial
 /index.html @privacytoolsIO/editorial
-/font/ @dawidpotocki
 
 # Administration Related Files
-/pages/donate.html @JonahAragon @BurungHantu1605
+/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/ @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

.github/CONTRIBUTING.md

@@ -1,114 +1,70 @@
 # Contributing Guidelines
 
-Please read this document in full before contributing.
+Please read this 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/privacytoolsIO/.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.
+- Open Source / free software is preferred but not required.
+- Must list source code in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md) (if applicable)
 - 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.
+Note: This criteria applies to all of privacytools.io
-
 ### 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 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).
+- 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).
+- 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)
+- preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl`)
+
 
 ### 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)
+- Must be acessable via free software (i.e 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)
+- Accessable Using Free Software (i.e IMAP)
 
 ### Hardware
-
+- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivlant (if applicable)
-- 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 avalible.
-- 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
+- Must be free software
 
 ### Encryption
-
 - Only verifiable encryption is to be trusted
 
-### Operating Systems
+### OSes
-
 - 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.
+- Provider logos are 200px x 70px ([example](https://www.privacytools.io/assets/img/provider/AirVPN.png))
-- Provider logo dimensions are 384px x 128px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg))
+- Tool logos are 120px x 120px ([example](https://www.privacytools.io/assets/img/tools/ChatSecure.png))
-- Tool logo dimensions are 120px x 120px ([SVG example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytoolsIO/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/privacytoolsIO/privacytools.io/issues/1444).

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+liberapay: privacytools.io
+patreon: privacytools
+custom: https://www.privacytools.io/donate/

.github/ISSUE_TEMPLATE/1_Software_Suggestion.md

@@ -12,16 +12,3 @@ labels: 🆕 software suggestion
 **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.

.github/ISSUE_TEMPLATE/2_Software_Removal.md

@@ -7,15 +7,3 @@ 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.

.github/ISSUE_TEMPLATE/3_Discussion.md

@@ -0,0 +1,13 @@
+<!--
+    Is there already a discussion about this on the forum (https://forum.privacytools.io/search)?
+    If not, please open a new discussion there. Thank you!
+-->
+
+---
+name: "💬 Discussion"
+about: Discuss the website or any mentioned software in general.
+title: "💬 Discussion | "
+labels: 💬 discussion, feedback wanted
+---
+
+<!-- Remember to stay civil! -->

.github/ISSUE_TEMPLATE/4_Content_Correction.md

@@ -1,21 +0,0 @@
----
-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.

.github/ISSUE_TEMPLATE/4_Feature.md

@@ -1,8 +1,9 @@
 ---
 name: "✨ Feature Suggestion"
-about: Suggest a new feature/section/page for the website.
+about: Suggest a new feature for the website.
 title: "✨ Feature Suggestion | "
 labels: ✨ enhancement
 ---
 
-## Description
+## Description:
+

.github/ISSUE_TEMPLATE/5_Website_Issues.md

@@ -1,19 +1,10 @@
 ---
 name: "🌐 Website Issue"
-about: Report a bug with the website. (NO CONTENT ISSUES)
+about: Report an issue with the website.
 title: "🌐 Website Issue | "
-labels: 🌐 website issue
+labels: 🌐 website issue, high priority
 ---
 
-<!--
-
-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/privacytoolsIO/services/issues/new)
-This is ONLY for reporting bugs or technical issues with www.privacytools.io.
-
--->
-
 ## Description
 
 <!--

.github/ISSUE_TEMPLATE/7_DNS_provider.md

@@ -0,0 +1,36 @@
+---
+name: "🗄️ encrypted DNS provider suggestion"
+about: Suggest a new encrypted DNS provider.
+title: "🗄️ DNS provider suggestion | "
+labels: 🌐 website issue, 🗄️ DNS
+---
+
+<!-- Please feel free to overwrite these comments -->
+
+## Basic Information
+
+**Name:** 
+**Filtering:** <!-- What is being filtered? Is it opt-in with separate address or not? -->
+**Privacy policy:** <!-- Link, especially when there is logging -->
+**Protocols:** <!-- at least DoH or DoT? DNSCrypt? -->
+**Server/Location:** <!-- Where is the provider based? Where are their servers located? Anycast if there are multiple servers answering to the same address -->
+**Source:** <!-- link to the source code, preferred, but optional -->
+**Type:** <!-- Non-profit, commercial, hobby project? -->
+**Website:** 
+
+## Description
+
+<!-- Why should we list your suggestion? Anything else, that you wish us to know? -->
+
+
+### Required features:
+
+<!-- DoH and DoT are supported natively by platforms like Firefox and Android 9+ -->
+
+* [ ] 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. -->
+
+#### Desired features
+
+* [ ] supports QNAME minimization <!-- if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +0,0 @@
-contact_links:
-  - name: Services issues
-    url: https://github.com/privacytoolsIO/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.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,19 @@
-<!-- PLEASE READ OUR CODE OF CONDUCT (https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md) AND CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
+<!-- PLEASE READ OUR CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/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. -->
+Resolves: #none <!-- The number of the issue that is resolved by this pull request. If there is none, feel free to delete this line -->
 
 #### 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/privacytoolsIO/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
+- [ ] I have [listed the source code](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md).
+
+- [ ] This project is [free/libre software](https://www.wikipedia.org/wiki/Free_software).
+
+- [ ] This project has an [associated discussion](https://github.com/privacytoolsIO/privacytools.io/issues).
 
 * Netlify preview for the mainly edited page: <!-- link or Non Applicable? Edit this in afterwards -->
 
-* Code repository of the project (if applicable):
+* Code Repository (if applicable): 

.gitignore

@@ -1,10 +1,3 @@
 _site/
 .sass-cache/
-.jekyll-metadata
 .DS_Store
-font/assets/
-font/_sass/
-font/.fontcustom-manifest.json
-assets/webfonts/ptio-font-preview.html
-vendor
-.bundle

.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 2.4.1
+
+# Assume bundler is being used, therefore
+# the `install` step will run `bundle install` by default.
+script: ./build.sh
+
+sudo: false # route your build to the container-based infrastructure for a faster build
+
+cache: bundler # caching bundler gem packages will speed up build

.well-known/librehost.json

@@ -2,14 +2,14 @@
     "@context" : "http://schema.org",
     "@type" : "Organization",
     "organizationType" : "Informal collective",
-    "name" : "PrivacyTools",
+    "name" : "privacytools.io",
     "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.",
+    "description": "privacytools.io 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/",
+    "privacyPolicyUrl" : "https://www.privacytools.io/privacy-policy/",
     "termsOfServiceUrl" : "-",
     "isServiceProvider" : true,
     "foundingDate": "2015",

Gemfile.lock

@@ -219,7 +219,7 @@ GEM
     ruby-enum (0.7.2)
       i18n
     ruby_dep (1.5.0)
-    rubyzip (2.0.0)
+    rubyzip (1.2.3)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)

README.md

@@ -1,44 +1,33 @@
-<a href="https://www.privacytools.io">
+[![privacytools](./assets/img/layout/logo.png)](https://www.privacytools.io/)
-	<img src="assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="PrivacyTools" />
-</a>
 
 _Encryption Against Global Mass Surveillance._
 
-[![Netlify Status](https://api.netlify.com/api/v1/badges/afd98777-c205-4928-a301-f57a1448113f/deploy-status)](https://app.netlify.com/sites/privacytools-io/deploys)
+[![Build Status](https://travis-ci.com/privacytoolsIO/privacytools.io.svg?branch=master)](https://travis-ci.com/privacytoolsIO/privacytools.io)
 
 # 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...
+It's important for a website like privacytools.io 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 please.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) or [our Discourse community](https://forum.privacytools.io/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. Thank you for participating.
+**Talk to us please.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. Thank you for participating.
 
 You can submit your suggestions here on GitHub [(Issues)](https://github.com/privacytoolsIO/privacytools.io/issues) and also in our [subreddit](https://www.reddit.com/r/privacytoolsIO/). Please refer to the [Contributing Guidelines](.github/CONTRIBUTING.md) before submitting. Thank you.
 
-## Developing
+## Building
 
-1. Install the latest stable version of [Ruby](https://www.ruby-lang.org/en/downloads/).
+1. Install [Ruby](https://www.ruby-lang.org/en/documentation/installation/)
-1. Install [Bundler](https://bundler.io/) v2.0.1:
+1. Install [bundler](https://bundler.io/) by running `gem install bundler`.
-	* `gem install bundler -v 2.0.1`
+1. Run `bundle install` to install the required dependencies.
-1. Install the required dependencies:
+1. Use `bundle exec jekyll build` to build the website. The output can be found in the `_site` directory.  Live preview is also possible by running `bundle exec jekyll serve`
-	* `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
+# Support privacytools.io
 
 - [Donate.](https://www.privacytools.io/donate/)
 - [Liberapay](https://liberapay.com/privacytools.io/donate) or [Patreon.](https://www.patreon.com/privacytools)
 - [Spread the word.](https://www.privacytools.io/#participate)
-- [Join our Discourse community.](https://forum.privacytools.io/)
+- [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.
 
-# Sponsors
-
-- [Safing](https://safing.io/)
-
 # 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)
@@ -49,6 +38,5 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri
 - [Русский / 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
+# License
-
+[Creative Commons Zero v1.0 Universal](https://www.privacytools.io/LICENSE.txt)
-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/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt) in this repository.

SECURITY.md

@@ -0,0 +1,35 @@
+# Security Policies and Procedures
+
+This document outlines security procedures and policies for the `privacytools.io` repository/code and all services hosted by privacytools.io, such as Mastodon, Matrix, Riot, et cetera.
+
+## Reporting a Bug
+
+We take all security bugs related to our code and our infrastructure very seriously. Thank you for improving the security of our projects and services. We appreciate your efforts and responsible disclosure, and will make every effort to acknowledge your contributions.
+
+Report any security bugs by emailing the services administrator at [admin@privacytools.io](mailto:admin@privacytools.io).
+
+The administrative team will acknowledge your message within 48 hours, and will provide a detailed response within 72 hours detailing the next steps for handling your report. After our initial reply we will make every effort to keep you informed of the progress towards a fix and announcement, and we may ask for additional information or guidance.
+
+Please report any security bugs in third-party projects to the person or team maintaining that project.
+
+The following are out of scope and should **not** be attacked/performed:
+
+* Excessive Automated Scans
+* Denial of Service Attacks
+* Social Engineering Attacks
+* Reports against infrastructure outside our control
+* User or admin accounts not owned by the tester
+
+## Disclosure Policy
+
+When we receive a security report, that report will be assigned to an administrative team member. That person will coordinate the fix, release, and announcement process, involving the following steps:
+
+1. Confirm the problem and determine affected services.
+2. Audit infrastructure and/or code to find any potential similar problems.
+3. Prepare fixes for all releases currently in production, which will be implemented as quickly as possible.
+
+Additionally, if user data was directly affected or compromised, we will inform affected users to the best of our ability via email and/or a website notification with more information about the incident.
+
+## Comments on this Policy
+
+Please open a Pull Request or Issue if you would like to discuss any changes to this policy.

_config.yml

@@ -1,8 +1,6 @@
-title: PrivacyTools - Encryption Against Global Mass Surveillance
+title: Privacy Tools - Encryption Against Global Mass Surveillance
-name: PrivacyTools
+description: You are being watched. Knowledge, encryption and privacy tools to protect you against global mass surveillance.
-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:
@@ -10,4 +8,3 @@ plugins:
 sitemap:
 file: "/sitemap.xml"
 include: [".well-known"]
-exclude: ["font", "vendor"]

_includes/breadcrumbs.html

@@ -1,23 +0,0 @@
-<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>

_includes/card.html

@@ -1,4 +1,4 @@
-<div class="col-xl-4 col-lg-6 col-md-12 mb-4">
+<div class="col-xl-4 col-lg-6 col-md-12 mb-2">
     <div class="card card-{{include.color}}">
         {% if include.color == "warning" %}
         <div class="card-header text-dark bg-{{include.color}}">
@@ -31,15 +31,13 @@
               <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}}">
+                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">Website:
                     {% if include.website %}
                         {{include.website}}
                     {% else %}

_includes/cardv2.html

@@ -30,13 +30,10 @@
     <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"
+        alt="{{include.title}}"
       >
       {{ include.description }}
       {% if include.labels %}
@@ -61,43 +58,33 @@
       {% endif %}
     </p>
     <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
-      <div class="d-flex flex-shrink-0 mr-1">
+      <div class="flex-shrink-0 mr-2">
         <a
           href="{{include.website}}"
-          rel="noopener"
+          class="btn btn-primary mt-1">
-          class="btn btn-primary mt-1 mr-1">
           <i class="fas fa-external-link-alt fa-fw"></i>
           Website
         </a>
         {% if include.forum %}
           <a
             href="{{include.forum}}"
-            rel="noopener"
+            class="btn btn-success mt-1">
-            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="hover-text-decoration-none mt-1 mr-1"
             data-toggle="tooltip"
             data-placement="bottom"
-            data-original-title="Requires specific software to access: torproject.org">
+            data-original-title="Requires specific software to access: torproject.org"
-            <span class="ptio-tor btn-tor btn-icon"></span>
+            href="{{include.tor}}">
-          </a>
+            <img
-        {% endif %}
+              class="mt-2"
-        {% if include.i2p %}
+              alt="Tor"
-          <a
+              src="/assets/img/layout/tor.png"
-            href="{{include.i2p}}"
+              width="35"
-            rel="noopener"
+              height="35">
-            class="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>
@@ -105,7 +92,7 @@
       <div class="mt-2">
           {% if include.windows %}
             {% if include.windows != "" %}
-              <a href="{{ include.windows }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.windows }}">
                 <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -115,27 +102,27 @@
 
           {% if include.mac %}
             {% if include.mac != "" %}
-              <a href="{{ include.mac }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.mac }}">
-                <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
+                <i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
+              <i class="fab fa-apple 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">
+              <a href="{{ include.linux }}">
-                <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
+                <i class="fab fa-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>
+              <i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
-          {% if include.freebsd %}
+          {% if include.bsd %}
-            {% if include.freebsd != "" %}
+            {% if include.bsd != "" %}
-              <a href="{{ include.freebsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.bsd }}">
                 <i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -143,29 +130,9 @@
             {% 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">
+              <a href="{{ include.firefox }}">
                 <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -175,7 +142,7 @@
 
           {% if include.chrome %}
             {% if include.chrome != "" %}
-              <a href="{{ include.chrome }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.chrome }}">
                 <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -185,7 +152,7 @@
 
           {% if include.safari %}
             {% if include.safari != "" %}
-              <a href="{{ include.safari }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.safari }}">
                 <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -195,7 +162,7 @@
 
           {% if include.opera %}
             {% if include.opera != "" %}
-              <a href="{{ include.opera }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.opera }}">
                 <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -205,7 +172,7 @@
 
           {% if include.edge %}
             {% if include.edge != "" %}
-              <a href="{{ include.edge }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.edge }}">
                 <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -213,29 +180,9 @@
             {% 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">
+              <a href="{{ include.android }}">
                 <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -245,31 +192,31 @@
 
           {% if include.ios %}
             {% if include.ios != "" %}
-              <a href="{{ include.ios }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.ios }}">
-                <i class="ptio-ios fa-2x fa-fw d-inline pr-1"></i>
+                <i class="fab fa-app-store-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>
+              <i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
-          {% if include.sailfish %}
+          {% if include.fire %}
-            {% if include.sailfish != "" %}
+            {% if include.fire != "" %}
-              <a href="{{ include.sailfish }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.fire }}">
-                <i class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></i>
+                <i class="fas fa-fire 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>
+              <i class="fas fa-fire 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">
+              <a href="{{ include.web }}">
-                <i class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></i>
+                <i class="fas fa-desktop 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>
+              <i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
@@ -278,25 +225,25 @@
           {{include.icon3}}
 
           {% if include.github %}
-            <a href="{{include.github}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.github}}">
               <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">
+            <a href="{{include.gitlab}}">
               <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">
+            <a href="{{include.git}}">
               <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">
+            <a href="{{include.source}}">
               <i class="fas fa-code-branch fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}

_includes/footer.html

@@ -6,37 +6,37 @@
 
   <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">
+      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/" class="share-btn email" title="Email">
-        <i class="fas fa-envelope"></i>
+        <i class="fas fa-envelope pl-3"></i>
       </a>
 
-      <a href="https://www.facebook.com/sharer/sharer.php?u={{ site.production_url }}" class="share-btn facebook" title="Facebook">
+      <a href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io" class="share-btn facebook" title="Facebook">
-        <i class="fab fa-facebook-f"></i>
+        <i class="fab fa-facebook-f pl-3"></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">
+      <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://www.privacytools.io/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
-        <i class="fab fa-twitter"></i>
+        <i class="fab fa-twitter pl-3"></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">
+      <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn mastodon" title="Mastodon">
-        <i class="fab fa-mastodon"></i>
+        <i class="fab fa-mastodon pl-3"></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">
+      <a href="https://reddit.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
-        <i class="fab fa-reddit-alien"></i>
+        <i class="fab fa-reddit-alien pl-3"></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">
+      <a href="https://www.linkedin.com/shareArticle?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
-        <i class="fab fa-linkedin-in"></i>
+        <i class="fab fa-linkedin-in pl-3"></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">
+      <a href="http://www.stumbleupon.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn stumbleupon" title="StumbleUpon">
-        <i class="ptio-mix"></i>
+        <i class="fab fa-stumbleupon pl-3"></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*">
+      <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn diaspora" title="Diaspora*">
-        <i class="fas fa-asterisk"></i>
+        <i class="fas fa-asterisk pl-3"></i>
       </a>
     </div>
   </div>
@@ -44,32 +44,29 @@
   <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">
+  <input type="text" value="www.privacytools.io - encryption against global mass surveillance" onclick="this.focus();this.select()" class="form-control input-lg">
   <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">
+    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center d-flex justify-content-center">
-      <span class="fab fa-creative-commons-zero fa-2x mr-2"></span>
+      <a href="https://www.privacytools.io/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-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;."><img alt="CC0" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
-      <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">
+    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
-      <span class="far fa-address-card fa-2x mr-2"></span>
+      <a href="https://www.kopimi.com/" data-toggle="tooltip" data-placement="top" data-original-title="kopimi (copyme), symbol showing that you want to be copied. use kopimi in your own fancy. kopimi may be put on homepages or blogs, in books, in software, as sound logos in music or whatever."><img alt="kopimi" src="/assets/img/layout/kopimi.png" width="32" height="33">kopimi</a>
-      <a href="/about/">About Us &amp; Contact</a>
     </div>
 
-    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
+    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
-      <span class="fas fa-donate fa-2x mr-2"></span>
+      <i class="far fa-envelope fa-2x"></i>
-      <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>
+      <a href="/contact/">Contact</a>
+    </div>
+
+    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
+      <i class="fas fa-heart fa-2x text-danger"></i>
+      <a 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 cost for server and domain." href="/donate/">Donate</a>
     </div>
   </div>
 
@@ -79,18 +76,14 @@
       JavaScript Licenses
     </a>
     <p class="mt-2">
-      <strong>No Ads, No Google Analytics, {% if page.title != "Shop" %}No Affiliates, {% endif %}No Cross-Site Requests.</strong>
+      <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>
+      <em>privacytools.io 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>
+      <a href="/privacy-policy/">View our privacy policy</a>.
     </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/privacytoolsIO/brand">Brand Assets &amp; Guidelines</a>
-    </small>
 
   </div>
 </footer>

_includes/head.html

@@ -5,61 +5,44 @@
   <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',''}}">
+  <meta name="msapplication-TileColor" content="#da532c">
+  <meta name="msapplication-TileImage" content="/assets/img/favicons/mstile-144x144.png">
+  <meta name="msapplication-config" content="/assets/img/favicons/browserconfig.xml">
+  <meta name="theme-color" content="#ffffff">
 
   <!-- title -->
   {% if page.title %}
-  <title>{{ page.title }} | {{ site.name }}</title>
+  <title>{{ page.title }} | privacytools.io</title>
-  <meta property="og:title" content="{{ page.title }} | {{ site.name }}" />
+  <meta property="og:title" content="{{ page.title }} | privacytools.io" />
   {% 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:image" content="https://www.privacytools.io/assets/img/layout/ogimage.jpg" />
   <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 }}" />
+  <meta property="og:site_name" content="privacytools.io" />
-
-  {% if page.url == "/" or page.url == "/about/" %}
-  <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/privacytoolsIO"
-    ]
-  }
-  </script>
-  {% endif %}
 
   <!-- icons -->
-  <link rel="apple-touch-icon" sizes="180x180" href="/assets/img/png/favicons/apple-touch-icon.png?v=2">
+  <link rel="apple-touch-icon" sizes="57x57" href="/assets/img/favicons/apple-touch-icon-57x57.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="/assets/img/png/favicons/favicon-32x32.png?v=2">
+  <link rel="apple-touch-icon" sizes="60x60" href="/assets/img/favicons/apple-touch-icon-60x60.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/assets/img/png/favicons/favicon-16x16.png?v=2">
+  <link rel="apple-touch-icon" sizes="72x72" href="/assets/img/favicons/apple-touch-icon-72x72.png">
-  <link rel="manifest" href="/assets/img/png/favicons/site.webmanifest?v=2">
+  <link rel="apple-touch-icon" sizes="76x76" href="/assets/img/favicons/apple-touch-icon-76x76.png">
-  <link rel="mask-icon" href="/assets/img/png/favicons/safari-pinned-tab.svg?v=2" color="#3498db">
+  <link rel="apple-touch-icon" sizes="114x114" href="/assets/img/favicons/apple-touch-icon-114x114.png">
-  <link rel="shortcut icon" href="/assets/img/png/favicons/favicon.ico?v=2">
+  <link rel="apple-touch-icon" sizes="120x120" href="/assets/img/favicons/apple-touch-icon-120x120.png">
-  <meta name="msapplication-TileColor" content="#3498db">
+  <link rel="apple-touch-icon" sizes="144x144" href="/assets/img/favicons/apple-touch-icon-144x144.png">
-  <meta name="msapplication-config" content="/assets/img/png/favicons/browserconfig.xml?v=2">
+  <link rel="apple-touch-icon" sizes="152x152" href="/assets/img/favicons/apple-touch-icon-152x152.png">
-  <meta name="theme-color" content="#ffffff">
+  <link rel="apple-touch-icon" sizes="180x180" href="/assets/img/favicons/apple-touch-icon-180x180.png">
-
+  <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-32x32.png" sizes="32x32">
+  <link rel="icon" type="image/png" href="/assets/img/favicons/android-chrome-192x192.png" sizes="192x192">
+  <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-96x96.png" sizes="96x96">
+  <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-16x16.png" sizes="16x16">
+  <link rel="manifest" href="/assets/img/favicons/manifest.json">
+  <link rel="shortcut icon" href="/assets/img/favicons/favicon.ico">
 
   <!-- CSS stylesheets -->
-  <link href="/assets/css/style.css?v=9" rel="stylesheet">
+  <link href="/assets/css/style.css?v=5" rel="stylesheet">
-  <link id="dark-css" href="/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)">
+  <link id="dark-css" href="/assets/css/dark.css?v=2" rel="stylesheet" media="(prefers-color-scheme: dark)">
 </head>

_includes/nav.html

@@ -1,16 +1,16 @@
-<nav class="fixed-top bg-dark">
+<div class="fixed-top bg-dark">
-  <div id="navbar" class="d-flex flex-wrap justify-content-between align-items-center">
+  <nav id="navbar">
-    <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>
+    <a id="nav-home-mobile" class="nav-anchor" href="/index.html">
+      <img src="/assets/img/layout/logo_smaller.png" width="148px" height="22px" />
+    </a>
+
+    <div class="menu">
 
-    <div class="menu w-100">
       <div id="nav-left" class="position-relative flex-col">
-        <a class="nav-anchor" href="/">
+        <a class="nav-anchor" href="/index.html">
           <span id="nav-home" class="fas fa-home fa-fw"></span>
         </a>
 
@@ -64,14 +64,14 @@
           <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/#messaging"><span class="fas fa-random fa-fw"></span> Email Alternatives</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/file-sync/"><span class="fas fa-copy fa-fw"></span> Secure File Sync</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>
@@ -87,7 +87,7 @@
           </summary>
           <span class="nav-dropdown">
             <a class="dropdown-item" href="/operating-systems/#os"><span class="fas fa-th-large fa-fw"></span> PC OS</a>
-            <a class="dropdown-item" href="/operating-systems/#live_os"><span class="fas fa-compact-disc fa-fw"></span> PC Live OS</a>
+            <a class="dropdown-item" href="/operating-systems/#live_os"><span class="fas fa-compact-disc fa-fw"></span> Live CD OS</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>
@@ -100,48 +100,53 @@
 
       <!-- 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>
-        <a href="/shop/" class="nav-anchor">
-          Shop
-        </a>
-        <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="fas fa-language text-danger fa-fw"></span>
-              <span class="sr-only">Language Selection</span>
+              Language
               <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.io/" class="dropdown-item">English</a>
-            <a href="https://privacytools.twngo.xyz/" rel="nofollow noopener" class="dropdown-item">繁體中文</a>
+            <a href="https://privacytools.twngo.xyz/" class="dropdown-item">繁體中文</a>
-            <a href="https://victorhck.gitlab.io/privacytools-es/" rel="nofollow noopener" class="dropdown-item">Español</a>
+            <a href="https://victorhck.gitlab.io/privacytools-es/" class="dropdown-item">Español</a>
-            <a href="https://pl.privacytools.io/" rel="nofollow noopener" class="dropdown-item">Polski</a>
+            <a href="https://pl.privacytools.io/" class="dropdown-item">Polski</a>
-            <a href="https://www.privacidade.digital/" rel="nofollow noopener" class="dropdown-item">Português</a>
+            <a href="https://www.privacidade.digital/" 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-sec.rocks/" class="dropdown-item">Deutsch</a>
-            <a href="https://privacytools-it.github.io/" rel="nofollow noopener" class="dropdown-item">Italiano</a>
+            <a href="https://privacytools-it.github.io/" class="dropdown-item">Italiano</a>
-            <a href="https://privacytools.ru" rel="nofollow noopener" class="dropdown-item">Русский</a>
+            <a href="https://privacytools.ru" class="dropdown-item">Русский</a>
-            <a href="https://privacytools.dreads-unlock.fr" rel="nofollow noopener" class="dropdown-item">Français</a>
           </span>
         </details>
+
+        <!-- Services -->
+        <details class="nav-details">
+          <summary>
+            <span class="nav-summary">
+              Services
+              <span class="dropdown-toggle"></span>
+            </span>
+          </summary>
+          <span class="nav-dropdown">
+            <a class="dropdown-item" href="https://forum.privacytools.io/"><span class="fab fa-discourse fa-fw"></span> Discourse - Forum</a>
+            <a class="dropdown-item" href="https://git.privacytools.io/"><span class="fab fa-git fa-fw"></span> Gitea - Git-Repository Manager</a>
+            <a class="dropdown-item" href="https://social.privacytools.io/"><span class="fas fa-retweet fa-fw"></span> Mastodon - Social Network</a>
+            <a class="dropdown-item" href="https://chat.privacytools.io/"><span class="fas fa-comment fa-fw"></span> Matrix - Federated Chat</a>
+            <a class="dropdown-item" href="https://bin.privacytools.io/"><span class="fas fa-clipboard fa-fw"></span> PrivateBin - Encrypted Pastebin</a>
+            <a class="dropdown-item" href="https://search.privacytools.io/"><span class="fas fa-search fa-fw"></span> Searx - Privacy Friendly Search</a>
+            <a class="dropdown-item" href="https://write.privacytools.io/"><span class="fas fa-pen-alt fa-fw"></span> Write Freely - Federated Blog</a>
+          </span>
+        </details>
+
+        <a href="https://blog.privacytools.io/" class="nav-anchor">Blog </a>
+        <a href="/donate/" class="nav-anchor">
+          Donate <span class="fas fa-heart text-danger fa-fw"></span>
+        </a>
+        <a id="nav-switch-theme" class="nav-anchor" href="javascript:void(0)" onClick="changeColorScheme()">
+          Theme <span class="nav-theme-icon fas fa-fw"></span>
+        </a>
       </div>
     </div>
-  </div>
+  </nav>
-</nav>
+</div>

_includes/panel.html

@@ -1,4 +1,4 @@
-<div class="col-xl-4 col-lg-6 col-md-12 mb-4">
+<div class="col-xl-4 col-lg-6 col-md-12 mb-2">
     <div class="card card-{{include.color}}">
         {% if include.color == "warning" %}
         <div class="card-header text-dark bg-{{include.color}}">
@@ -11,4 +11,4 @@
             {{include.body}}
         </div>
     </div>
-</div>
+</div>

_includes/product.html

@@ -1,12 +0,0 @@
-<div class="col-md-4">
-  <div class="card m-3">
-    <img src="/assets/img/png/merch/{{include.image}}" class="card-img-top">
-    <div class="card-body">
-      <h5 class="card-title mt-1">{{include.title}}</h5>
-      <h6 class="card-subtitle mb-2 text-muted">{% if include.sale %}<strong>{{include.sale}}</strong> <del>{% endif %}{{include.price}}{% if include.sale %}</del>{% endif %}</h6>
-      <p class="card-text">{{include.description}}</p>
-      <a href="{{include.link}}" class="btn btn-primary">Purchase</a>
-      <p class="card-text mt-3">Fulfilled by <span class="badge badge-secondary">{{include.vendor}}</span></p>
-    </div>
-  </div>
-</div>

_includes/scripts.html

@@ -2,7 +2,7 @@
 <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>
+<script src="/assets/js/main.js?v=3"></script>
 
 <!--
   Matomo is the leading open-source analytics platform:
@@ -11,4 +11,4 @@
   - User privacy protection
 -->
 
-<noscript><img src="https://stats.privacytools.io/matomo.php?idsite=1&amp;rec=1" class="border-0" alt=""/></noscript>
+<noscript><img src="https://stats.privacytools.io/matomo.php?idsite=1&amp;rec=1" style="border:0" alt=""/></noscript>

_includes/sections/android-addons.html

@@ -1,33 +1,39 @@
 <h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> Android Privacy Add-ons</h1>
 
+<div class="alert alert-success" role="alert">
+  <strong>Improve your privacy with these add-ons for Android.</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/png/3rd-party/netguard.png" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
+      <img src="/assets/img/addons/Blokada.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Blokada">
     </div>
     <div class="col">
-    <h3>Control your traffic with <a href="https://www.netguard.me/">NetGuard</a></h3>
+    <h3>Block ads with <a href="https://blokada.org/">Blokada</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>
+    <p><strong>Blokada</strong> works across all of your apps, not only the browser. It doesn't require root, supports both wifi and mobile networks, and is perfectly safe and simple to use. Just turn it on, and it will do the job silently!
     </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">
+      <img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
     </div>
     <div class="col">
-    <h3>Tor for Android with <a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>
+    <h3>Control your traffic with <a href="https://www.netguard.me/">NetGuard</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. <strong>Root Mode:</strong> Orbot can be configured to transparently proxy all of your Internet traffic through Tor. You can also choose which specific apps you wish to use through Tor.</p>
+    <p><strong>NetGuard</strong> provides simple and advanced ways to block certain apps' access to the internet without the help of root privileges. Applications and addresses can individually be allowed or denied access to your Wi-Fi and/or mobile connection, allowing you to control which apps are able to call home or not.
     </div>
   </div>
 
-</div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img src="/assets/img/addons/Orbot.png" height="70" width="200" 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. <strong>Root Mode:</strong> Orbot can be configured to transparently proxy all of your Internet traffic through Tor. You can also choose which specific apps you want to use through Tor.
+    </div>
+  </div>
 
-<h2>See also</h2>
+</div>
-
-<ul>
-  <li>
-    <a href="/providers/dns#clients">Our DNS client recommendations</a>, which have information on enabling encrypted DNS on Android.
-  </li>
-</ul>

_includes/sections/browser-addons.html

@@ -1,117 +1,124 @@
 <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">
+<div class="alert alert-primary" 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>.
+  <strong>Improve your privacy with these browser add-ons.</strong>
 </div>
 
-{% include cardv2.html
-title="uBlock Origin: Block Ads and Trackers"
-image="/assets/img/svg/3rd-party/ublock_origin.svg"
-description="<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."
-website="https://addons.mozilla.org/firefox/addon/ublock-origin/"
-forum="https://forum.privacytools.io/t/discussion-ublock-origin/266"
-github="https://github.com/gorhill/uBlock/"
-firefox="https://addons.mozilla.org/en-US/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"
-forum="https://forum.privacytools.io/t/discussion-https-everywhere/268"
-github="https://github.com/EFForg/https-everywhere"
-firefox="https://addons.mozilla.org/en-US/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/"
-forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
-gitlab="https://git.synz.io/Synzvato/decentraleyes"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/decentraleyes"
-chrome="https://chrome.google.com/webstore/detail/decentraleyes/ldpochfccmkkmhdbclfhpagapcfdljkj"
-opera="https://addons.opera.com/en/extensions/details/decentraleyes"
-%}
-
-{% 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/en-US/firefox/addon/cookie-autodelete"
-chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
-%}
-
-{% 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/"
-forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270"
-github="https://github.com/tosdr/"
-firefox="https://addons.mozilla.org/en-US/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/en/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."
-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/en-US/firefox/addon/torproject-snowflake"
-chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
-%}
 
 {% include cardv2.html
 title="Privacy Badger: Stop Tracking"
-image="/assets/img/svg/3rd-party/privacy_badger.svg"
+image="/assets/img/addons/privacy-badger.png"
 description="<strong>Privacy Badger</strong> is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse."
 website="https://www.eff.org/privacybadger"
 forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
 github="https://github.com/EFForg/privacybadger"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17"
+firefox=""
-chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbdbbnkijodmdjhbjlgp"
+chrome=""
-opera="https://addons.opera.com/en/extensions/details/privacy-badger/"
+opera=""
+android=""
 %}
 
+{% include cardv2.html
+title="uBlock Origin: Block Ads and Trackers"
+image="/assets/img/addons/ublock-origin.png"
+description="<strong>uBlock Origin</strong> is an efficient <a href=https://github.com/gorhill/uBlock/wiki/Blocking-mode>wide-spectrum-blocker</a> that's 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."
+website="https://addons.mozilla.org/firefox/addon/ublock-origin/"
+forum="https://forum.privacytools.io/t/discussion-ublock-origin/266"
+github="https://github.com/gorhill/uBlock/"
+firefox=""
+chrome=""
+safari=""
+opera=""
+edge=""
+android=""
+%}
+
+{% include cardv2.html
+title="Cookie AutoDelete: Automatically Delete Cookies"
+image="/assets/img/addons/cookie-autodelete.png"
+description="<strong>Cookie AutoDelete</strong> automatically removes cookies when they are no longer used by open browser tabs. With the cookies, lingering sessions, as well as information used to spy on you, will be expunged."
+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=""
+chrome=""
+%}
+
+{% include cardv2.html
+title="HTTPS Everywhere: Secure Connections"
+image="/assets/img/addons/https-everywhere.png"
+description="<strong>HTTPS Everywhere</strong> encrypts your communications with many major websites, making your browsing more secure. A collaboration between The Tor Project and the Electronic Frontier Foundation."
+website="https://www.eff.org/https-everywhere"
+forum="https://forum.privacytools.io/t/discussion-https-everywhere/268"
+github="https://github.com/EFForg/https-everywhere"
+firefox=""
+chrome=""
+android=""
+opera=""
+%}
+
+{% include cardv2.html
+title="Decentraleyes: Block Content Delivery Networks"
+image="/assets/img/addons/decentraleyes.png"
+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/"
+forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
+gitlab="https://git.synz.io/Synzvato/decentraleyes"
+firefox=""
+chrome=""
+opera=""
+%}
+
+{% include cardv2.html
+title="Terms of Service; Didn’t Read: Be Informed"
+image="/assets/img/addons/tosdr.png"
+description="<strong>Terms of Service; Didn’t Read</strong> “I have read and agree to the Terms” is the biggest lie on the web. This addon aims to fix that by grading websites based on their Terms of Service agreements and gives short summaries."
+website="https://tosdr.org/"
+forum="https://forum.privacytools.io/t/discussion-decentraleyes/270"
+github="https://github.com/tosdr/"
+firefox=""
+chrome=""
+opera=""
+safari=""
+%}
+
+{% include cardv2.html
+title="Snowflake"
+image="/assets/img/addons/snowflake.png"
+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."
+website="https://snowflake.torproject.org"
+forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
+git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
+firefox=""
+chrome=""
+%}
+
+
 <h2>For Power Users Only</h2>
 
 <div class="alert alert-warning" role="alert">
-  <strong>These addons require quite a lot of interaction from the user. Some sites may not work properly without careful configuration.</strong>
+  <strong>These addons require quite a lot of interaction from the user. Some sites will not work properly until you have configured the add-ons.</strong>
 </div>
 
 {% include cardv2.html
 title="uMatrix: Stop Cross-Site Requests"
-image="/assets/img/png/3rd-party/umatrix.png"
+image="/assets/img/addons/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."
 website="https://addons.mozilla.org/firefox/addon/umatrix/"
 forum="https://forum.privacytools.io/t/discussion-umatrix/271"
 github="https://github.com/gorhill/uMatrix"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/umatrix"
+firefox=""
-chrome="https://chrome.google.com/webstore/detail/umatrix/ogfcmafjalglgifnmanfmnieipoejdcf"
+chrome=""
-opera="https://addons.opera.com/en/extensions/details/umatrix"
+opera=""
 %}
 
 {% include cardv2.html
 title="NoScript Security Suite: Be in total control"
-image="/assets/img/svg/3rd-party/noscript.svg"
+image="/assets/img/addons/noscript.png"
 description="<strong>NoScript</strong> is a highly customizable plugin to selectively allow JavaScript, Java, and Flash to run only on websites you trust. Not for casual users, it requires technical knowledge to configure."
 website="https://addons.mozilla.org/firefox/addon/noscript/"
 forum="https://forum.privacytools.io/t/discussion-noscript-security-suite/272"
 github="https://github.com/hackademix/noscript"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/noscript"
+firefox=""
-chrome="https://chrome.google.com/webstore/detail/noscript/doojmbjmlfjjnbmnoijecmcbfeoakpjm"
+chrome=""
 %}

_includes/sections/browser-fingerprint.html

@@ -4,6 +4,8 @@
   <strong>Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.</strong>
 </div>
 
+<img src="/assets/img/layout/browser-fingerprint.png" width="439" height="350" class="img-fluid float-right" alt="Fingerprint image" style="margin-left:20px;">
+
 <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/">Panopticlick</a> to test your browser to see how unique it is.</p>
 
 <p>
@@ -12,7 +14,7 @@
 </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>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 the TBB, 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> like Privacy Badger and uBlock Origin. 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>
 
@@ -27,5 +29,5 @@
 <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>
+  <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>

_includes/sections/browser-recommendation.html

@@ -1,135 +1,32 @@
-<h1 id="browser" class="anchor">
+<h1 id="browser" class="anchor"><a href="#browser"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations</h1>
-  <a href="#browser"><span class="fas fa-link anchor-icon"></span></a>
-  Browser Recommendations For Desktop
-</h1>
 
 {% include cardv2.html
-title="Firefox"
+title="Mozilla Firefox"
-image="/assets/img/svg/3rd-party/firefox_browser.svg"
+image="/assets/img/tools/Firefox.png"
-description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
+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>.'
+recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a href="#about_config"><i class="fas fa-link"></i> about:config</a> and get the <a href="#addons"><i class="fas fa-link"></i> privacy add-ons</a>.'
-website="https://firefox.com"
+website="https://www.firefox.com/"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
-source="https://hg.mozilla.org/mozilla-central/"
+github="https://github.com/mozilla"
-windows="https://www.mozilla.org/firefox/windows/"
+windows=""
-mac="https://www.mozilla.org/firefox/mac/"
+mac=""
-linux="https://www.mozilla.org/firefox/linux/"
+linux=""
-freebsd="https://www.freshports.org/www/firefox"
+android=""
-openbsd="http://openports.se/www/mozilla-firefox"
+ios=""
-netbsd="http://pkgsrc.se/www/firefox"
+bsd=""
 %}
 
 {% include cardv2.html
 title="Tor Browser - Provides Anonymity"
-image="/assets/img/svg/3rd-party/tor_browser.svg"
+image="/assets/img/tools/Tor-Browser.png"
-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/"
-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/"
-forum="https://forum.privacytools.io/t/discussion-firefox/279"
-source="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/"
-tor="http://expyuzz4wqqyqhjn.onion/"
+forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
-forum="https://forum.privacytools.io/t/discussion-tor-browser-for-android-browsers/1522"
+git="https://trac.torproject.org/projects/tor"
-git="https://gitweb.torproject.org/tor-browser.git/"
+windows=""
-android="https://www.torproject.org/download/#android"
+mac=""
-fdroid="https://guardianproject.info/fdroid/"
+linux=""
-googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
+android=""
+ios=""
+bsd=""
 %}
-
-{% 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>
-    <a href="https://play.google.com/store/apps/details?id=com.google.android.webview&hl=en_US">
-      <span class="badge badge-warning" data-toggle="tooltip" title="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.">
-        <span class="fas fa-exclamation-triangle"></span>
-        Keep Android WebView up-to-date
-      </span>
-    </a>
-  </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/"
-forum="https://forum.privacytools.io/t/discussion-firefox/279"
-source="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/#security-advisories">issues</a> with Onion Browser due to iOS limitations.'
-website="https://onionbrowser.com/"
-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"
-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>

_includes/sections/browser-tweaks.html

@@ -6,7 +6,7 @@
 
 <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>Press the button "I'll be careful, I promise!"</li>
   <li>Follow the instructions below...</li>
 </ol>
 
@@ -28,6 +28,15 @@
   <dt>privacy.trackingprotection.enabled = true</dt>
   <dd>This is Mozilla's new built-in tracking protection. It uses Disconnect.me filter list, which is redundant if you are already using uBlock Origin 3rd party filters, therefore you should set it to false if you are using the add-on functionalities.</dd>
 
+  <dt>browser.cache.offline.enable = false</dt>
+  <dd>Disables offline cache.</dd>
+
+  <dt>browser.safebrowsing.malware.enabled = false</dt>
+  <dd>Disable Google Safe Browsing malware checks. Security risk, but privacy improvement.</dd>
+
+  <dt>browser.safebrowsing.phishing.enabled = false</dt>
+  <dd>Disable Google Safe Browsing and phishing protection. Security risk, but privacy improvement.</dd>
+
   <dt>browser.send_pings = false</dt>
   <dd>The attribute would be useful for letting websites track visitors' clicks.</dd>
 
@@ -37,6 +46,8 @@
   <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.battery.enabled = false</dt>
+  <dd>The battery status of your device could be tracked.</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>
@@ -63,7 +74,26 @@
   </ul>
   </dd>
 
+  <dt>network.cookie.lifetimePolicy = 2</dt>
+  <dd>
+  cookies are deleted at the end of the session
+  <ul>
+    <li>0 = Accept cookies normally</li>
+    <li>1 = Prompt for each cookie</li>
+    <li>2 = Accept for current session only</li>
+    <li>3 = Accept for N days</li>
+  </ul>
+  </dd>
 
+  <dt>network.http.referer.trimmingPolicy = 2</dt>
+  <dd>
+  Send only the scheme, host, and port in the <code>Referer</code> header
+  <ul>
+    <li>0 = Send the full URL in the <code>Referer</code> header</li>
+    <li>1 = Send the URL without its query string in the <code>Referer</code> header</li>
+    <li>2 = Send only the scheme, host, and port in the <code>Referer</code> header</li>
+  </ul>
+  </dd>
 
   <dt>network.http.referer.XOriginPolicy = 2</dt>
   <dd>
@@ -101,10 +131,18 @@
   </ul>
   </dd>
 
+  <dt>extensions.pocket.enabled = false</dt>
+  <dd>Disables Pocket completely.</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>extensions.blocklist.url = https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%20/%20/</dt>
+  <dd>
+  <p>Limit the amount of identifiable information sent when requesting the Mozilla harmful extension blocklist.
+  <p>Optionally, the blocklist can be disabled entirely by setting <code>extensions.blocklist.enabled</code> to false for increased privacy, but decreased security. <a href="https://old.reddit.com/r/privacytoolsIO/comments/9uqeew/firefox_tip_sanitize_firefox_blocklist_url_so_it/">Source</a></p>
+  </dd>
+</dl>
 
 <h3 id="user.js">Firefox user.js Templates</h3>
 <ul>
@@ -115,7 +153,6 @@
 <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="http://kb.mozillazine.org/Category:Security_and_privacy-related_preferences">mozillazine.org</a> - Security and privacy-related preferences. </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>

_includes/sections/browser-webrtc.html

@@ -23,7 +23,7 @@
   <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>
+<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>
@@ -40,7 +40,7 @@
 
 <h3>How to fix the WebRTC Leak 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>
+<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>
 

_includes/sections/calendar-contacts-sync.html

@@ -4,64 +4,43 @@
   <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>
 
-{%
+<div class="row mb-2">
-  include cardv2.html
+
+  {% include card.html color="success"
   title="Nextcloud"
-  image="/assets/img/svg/3rd-party/nextcloud.svg"
+  image="/assets/img/provider/Nextcloud.png"
-  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."
+  url="https://nextcloud.com/"
-  website="https://nextcloud.com/"
+  footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
-  forum="https://forum.privacytools.io/t/discussion-nextcloud-calender-contacts-sync-tools/1535"
+  description="NextCloud 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."
-  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 card.html color="primary"
-  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/"
-  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"
+  image="/assets/img/misc/email.png"
-  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.'
+  url="../email"
-  website="/providers/email"
+  website="Email Providers section"
-%}
+  footer="OS: depends on email provider."
+  description="Many email providers also offer calendar and or contacts sync services. Refer to the <a href=\"../email\">Email Providers section</a> to choose an email provider and check if they also offer calendar and or contacts sync."
+  %}
+
+  {% include card.html color="warning"
+  title="EteSync"
+  image="/assets/img/provider/etesync.png"
+  url="https://www.etesync.com/"
+  footer="Client OS: Android, Web. Server OS: Linux."
+  description="EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free."
+  %}
+
+</div>
 
 <h3>Worth Mentioning</h3>
 
 <ul>
   <li>
-    <a href="https://fruux.com/">fruux</a> - A unified contacts/calendaring system that works across platforms and devices.
+    <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).
+    <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/#encrypt">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>

_includes/sections/cloud-storage.html

@@ -6,26 +6,37 @@
 
 {% include cardv2.html
 title="Nextcloud - Choose your hoster"
-image="/assets/img/svg/3rd-party/nextcloud.svg"
+image="/assets/img/provider/Nextcloud.png"
-description="<strong>Nextcloud</strong> is a suite of client-server software for creating your own file hosting services on a private server you control. Nextcloud is free and open-source, and supports end-to-end encryption with many of its clients. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
+description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients."
 website="https://nextcloud.com/"
 forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
 github="https://github.com/nextcloud"
-windows="https://nextcloud.com/install/#install-clients"
+windows=""
-mac="https://nextcloud.com/install/#install-clients"
+mac=""
-linux="https://nextcloud.com/install/#install-clients"
+linux=""
-freebsd="https://www.freshports.org/www/nextcloud/"
+bsd=""
-openbsd="http://openports.se/www/nextcloud"
+ios=""
-netbsd="http://pkgsrc.se/www/php-nextcloud"
+android=""
-ios="https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8"
+fire=""
-fdroid="https://f-droid.org/packages/com.nextcloud.client/"
+%}
-googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
+
+{% include cardv2.html
+title="Least Authority S4 - For Experts"
+image="/assets/img/provider/S4.png"
+description="S4 (Simple Secure Storage Service) is Least Authority's verifiably secure off-site backup system for individuals and businesses. 100% client-side encryption and open source transparency. 250GB for $9.95/month or 5TB for $25.95/month. Servers are hosted with Amazon S3 in the US."
+website="https://leastauthority.com/"
+forum="https://forum.privacytools.io/t/discussion-least-authority-s4/288"
+github="https://github.com/LeastAuthority"
+windows=""
+mac=""
+linux=""
+bsd=""
 %}
 
 
 <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. <span class="badge badge-warning" data-toggle="tooltip" title="Cryptomator's mobile apps are not open-source."><a href="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</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>

_includes/sections/dns.html

@@ -1,14 +1,43 @@
-<h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Encrypted Domain Name System (DNS) Resolvers</h1>
+<h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Domain Name System (DNS)</h1>
+
+{% include cardv2.html
+title="OpenNIC - Service"
+image="/assets/img/tools/OpenNIC.png"
+description="OpenNIC is an alternate network information center/alternative DNS root which lists itself as an alternative to ICANN and its registries. Like all alternative root DNS systems, OpenNIC-hosted domains are unreachable to the vast majority of the Internet."
+website="https://www.opennic.org/"
+forum="https://forum.privacytools.io/t/discussion-opennic/338"
+github="https://github.com/OpenNIC"
+%}
+
+{% include cardv2.html
+title="Njalla - Domain Registration"
+image="/assets/img/provider/Njalla.png"
+description="Njalla only needs your email or jabber address in order to register a domain name for you. Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service."
+website="https://njal.la/"
+tor="http://njalladnspotetti.onion"
+forum="https://forum.privacytools.io/t/discussion-njalla/339"
+%}
+
+{% include cardv2.html
+title="DNSCrypt - Tool"
+image="/assets/img/tools/DNSCrypt.png"
+description="A protocol for securing communications between a client and a DNS resolver. The DNSCrypt protocol uses high-speed high-security elliptic-curve cryptography and is very similar to DNSCurve, but focuses on securing communications between a client and its first-level resolver."
+website="https://dnscrypt.info/"
+forum="https://forum.privacytools.io/t/discussion-dnscrypt/340"
+github="https://github.com/jedisct1/dnscrypt-proxy"
+%}
+
+<h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> Encrypted ICANN DNS Providers</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>Note: Using an encrypted DNS resolver will not make you anonymous, nor hide your internet traffic from your Internet Service Provider. But, it 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.</strong>
+  <strong>Note: Using an encrypted DNS resolver will not make you anonymous, nor hide your internet traffic from your Internet Service Provider. But it 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.</strong>
 </div>
 
 <div 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-sorted="true" data-sorted-direction="ascending">ICANN DNS Provider</th>
         <th data-sortable="true">Server Locations</th>
         <th data-sortable="false">Privacy Policy</th>
         <th data-sortable="true">Type</th>
@@ -18,7 +47,6 @@
         <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>
@@ -33,10 +61,8 @@
           </span>
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://adguard.com/en/privacy/dns.html" href="https://adguard.com/en/privacy/dns.html">
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            href="https://adguard.com/en/privacy/dns.html">
-            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Commercial</td>
@@ -44,26 +70,12 @@
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
+        <td>Ads, trackers, malicious domains</td>
         <td>
-          <span class="no-text-wrap">
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/AdguardTeam/AdGuardDNS/" href="https://github.com/AdguardTeam/AdGuardDNS/">
-            Ads, trackers,
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </span>
-          <span class="no-text-wrap">
-            malicious domains
-          </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://flops.ru/en/about.html">Serveroid, LLC</a>
-          </span>
-        </td>
       </tr>
 
       <tr>
@@ -72,26 +84,22 @@
         </td>
         <td>
           <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-fi"></span>
+            <span class="flag-icon flag-icon-ch"></span>
-            Finland,
+            Switzerland,
-          </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
+            Japan,
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-de"></span>
+            Germany
           </span>
         </td>
         <td>
-          <div
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"No logs."'>
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            title="&quot;No logs.&quot;"
+          </a>
-            data-toggle="tooltip"
-            data-placement="bottom">
-            <span class="fas fa-globe"></span>
-          </div>
         </td>
         <td>Hobby Project</td>
         <td>No</td>
@@ -106,33 +114,12 @@
         </td>
         <td>Yes</td>
         <td>Yes</td>
+        <td>Ads, trackers, malicious domains <span class="badge badge-warning" data-toggle="tooltip" data-original-title="And some wildcard, IDN, and non-ASCII domains."><a href="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"><i class="fas fa-exclamation-triangle"></i></a></span></td>
         <td>
-          <span class="no-text-wrap">
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/ookangzheng/blahdns/" href="https://github.com/ookangzheng/blahdns/">
-            Ads, trackers,
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </span>
-          <span class="no-text-wrap">
-            malicious domains
-            <span class="badge badge-warning" data-toggle="tooltip" data-original-title="And some wildcard and IDN domains."><a href="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"><i class="fas fa-exclamation-triangle"></i></a></span>
-          </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.datacenterlight.ch/">Data Center Light</a>,
-          </span>
-          <span class="no-text-wrap">
-            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
-          </span>
-        </td>
       </tr>
 
       <tr>
@@ -146,20 +133,21 @@
           </span>
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.cloudflare.com/privacypolicy/" href="https://www.cloudflare.com/privacypolicy/">
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            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='"We will collect limited DNS query data that is sent to the resolvers. This data does not contain user IP addresses or any other personally identifiable information, and the bulk of the data is only stored for 24 hours."' href="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/privacy-policy/">Some</a></td>
-        <td>DoH, DoT</td>
+        <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
         <td>No</td>
-        <td>?</td>
+        <td>
-        <td>Self</td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/cloudflare/dns" href="https://github.com/cloudflare/dns">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
       </tr>
 
       <tr>
@@ -173,12 +161,8 @@
           </span>
         </td>
         <td>
-          <div
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data."'>
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            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>
@@ -188,7 +172,6 @@
         <td>Yes</td>
         <td data-value="No">?</td>
         <td>?</td>
-        <td>Self</td>
       </tr>
 
       <tr>
@@ -202,10 +185,8 @@
           </span>
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc" href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc">
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc">
-            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Hobby Project</td>
@@ -221,17 +202,8 @@
         </td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>
+        <td>Based on server choice</td>
-          <span class="no-text-wrap">
-            Based on server choice
-          </span>
-        </td>
         <td>?</td>
-        <td>
-          <span class="no-text-wrap">
-            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
-          </span>
-        </td>
       </tr>
 
       <tr>
@@ -245,10 +217,8 @@
           </span>
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://appliedprivacy.net/privacy-policy" href="https://appliedprivacy.net/privacy-policy">
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            href="https://appliedprivacy.net/privacy-policy">
-            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Non-Profit</td>
@@ -265,16 +235,11 @@
         <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="nextdns">
-          <a href="https://www.nextdns.io/">NextDNS</a>
+          <a href="https://www.nextdns.io/">nextdns</a>
         </td>
         <td>Anycast (based in
           <span class="no-text-wrap">
@@ -283,26 +248,17 @@
           </span>
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.nextdns.io/privacy" href="https://www.nextdns.io/privacy">
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            href="https://www.nextdns.io/privacy">
-            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Commercial</td>
-        <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>
-          <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>
+        <td>Based on user choice</td>
-          <span class="no-text-wrap">
-            Based on server choice
-          </span>
-        </td>
         <td>?</td>
-        <td>Self</td>
       </tr>
 
       <tr>
@@ -325,10 +281,8 @@
           </span>
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://nixnet.xyz/privacy/" href="https://nixnet.xyz/privacy/">
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            href="https://nixnet.xyz/privacy/">
-            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
@@ -337,26 +291,15 @@
           </a>
         </td>
         <td>No</td>
-        <td>DoH, DoT</td>
+        <td>DoT</td>
         <td>Yes</td>
         <td>Yes</td>
+        <td>Based on server choice</td>
         <td>
-          <span class="no-text-wrap">
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://git.nixnet.xyz/NixNet/dns" href="https://git.nixnet.xyz/NixNet/dns">
-            Based on server choice
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </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>
@@ -370,10 +313,8 @@
           </span>
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://powerdns.org/doh/privacy.html" href="https://powerdns.org/doh/privacy.html">
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            href="https://powerdns.org/doh/privacy.html">
-            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Hobby Project</td>
@@ -383,22 +324,15 @@
         <td>No</td>
         <td>No</td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/PowerDNS/pdns" href="https://github.com/PowerDNS/pdns">
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            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> <span class="badge badge-warning" data-toggle="tooltip" title="Founders include the Global Cyber Alliance, composed of the City of London Police and Manhattan District Attorney's Office"><i class="fas fa-exclamation-triangle"></i></span>
+          <a href="https://quad9.net/">Quad9</a> <span class="badge badge-warning" data-toggle="tooltip" title="Founders include the Global Cyber Alliance, comprised of the City of London Police and Manhattan District Attorney's Office"><i class="fas fa-exclamation-triangle"></i></span>
         </td>
         <td>Anycast (based in
           <span class="no-text-wrap">
@@ -407,10 +341,8 @@
           </span>
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://quad9.net/policy/" href="https://quad9.net/policy/">
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            href="https://quad9.net/policy/">
-            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Non-Profit</td>
@@ -418,18 +350,8 @@
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>
+        <td>Malicious domains</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>
@@ -443,10 +365,8 @@
           </span>
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://securedns.eu/#privacy" href="https://securedns.eu/#privacy">
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            href="https://securedns.eu/#privacy">
-            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Hobby Project</td>
@@ -454,56 +374,8 @@
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>
+        <td>Based on server choice</td>
-          <span class="no-text-wrap">
-            Based on server choice
-          </span>
-        </td>
         <td>?</td>
-        <td>
-          <span class="no-text-wrap">
-            <a href="https://www.digitalocean.com/">DigitalOcean, Inc.</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>
@@ -513,27 +385,13 @@
         <td>Anycast (based in
           <span class="no-text-wrap">
             <span class="flag-icon flag-icon-dk"></span>
-            Denmark),
+            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
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"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."'>
-            class="btn-secondary btn-icon"
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-            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;"
+          </a>
-            data-toggle="tooltip"
-            data-placement="bottom">
-            <span class="fas fa-globe"></span>
-          </div>
         </td>
         <td>Hobby Project</td>
         <td>No</td>
@@ -542,13 +400,84 @@
         <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>
+
+<h4>Terms</h4>
+
+<ul>
+  <li>DNS-over-TLS (DoT) - 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. DoT has two modes:</li>
+    <ul>
+        <li>Oppurtunistic mode: the client attempts to form a DNS-over-TLS connection to the server on port 853 without performing certificate validation. If it fails, it will use unencrypted DNS. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="In other words automatic mode leaves your DNS traffic vulnerable to SSL strip and MITM attacks"><i class="fas fa-exclamation-triangle"></i></span></li>
+        <li>Strict mode: the client connects to a specific hostname and performs certificate validation for it. If it fails, no DNS queries are made until it succeeds.</li>
+    </ul>
+  <li>DNS-over-HTTPS (DoH) - Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="DoH contains metadata such as user-agent (which may include system information) that is sent to the DNS server."><a href="https://tools.ietf.org/html/rfc8484#section-8.2"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+  <li>DNSCrypt - An older yet robust method of encrypting DNS.</li>
+</ul>
+
+<h4>How to verify DNS is encrypted</h4>
+
+<ul>
+  <li>DoH / DoT
+    <ul>
+      <li>Check <a href="https://www.dnsleaktest.com/">DNSLeakTest.com</a>. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title="Your DNS provider may not appear with their own name, so compare the responses to what you know or can find about your DNS provider. Just ensure you don't see your ISP or old unencrypted DNS provider."><i class="fas fa-exclamation-triangle"></i></span></li>
+      <li>Check the website of your DNS provider. They may have a page for telling "you are using our DNS." Examples include <a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard</a> and <a href="https://1.1.1.1/help">Cloudflare</a>.</li>
+      <li>If using Firefox's trusted recursive resolver (TRR), navigate to <code>about:networking#dns</code>. If the TRR column says "true" for some fields, you are using DoH. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title='Some fields will say "false" depending on the the value of network.trr.mode in about:config'><a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+    </ul>
+  </li>
+  <li>dnscrypt-proxy - Check <a href="https://github.com/jedisct1/dnscrypt-proxy/wiki/Checking">dnscrypt-proxy's wiki on how to verify that your DNS is encrypted</a>.
+  </li>
+  <li>DNSSEC - Check <a href="https://dnssec.vs.uni-due.de/">DNSSEC Resolver Test by Matthäus Wander</a>.</li>
+  <li>QNAME Minimization - Run <code><a href="https://en.wikipedia.org/wiki/Dig_(command)">dig</a> +short txt qnamemintest.internet.nl</code> from the command-line (taken from <a href="https://nlnetlabs.nl/downloads/presentations/unbound_qnamemin_oarc24.pdf">this NLnet Labs presentation</a>). You should see this display: <code>"HOORAY - QNAME minimisation is enabled on your resolver :)!"</code></li>
+</ul>
+
+<h3>Worth Mentioning and Additional Information</h3>
+
+<ul>
+  <li><strong>Encrypted DNS clients for desktop:</strong>
+    <ul>
+      <li><em>Firefox</em> comes with built-in DoH support with Cloudflare set as the default resolver, but can be configured to use any DoH resolver. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title='"Cloudflare has agreed to collect only a limited amount of data about the DNS requests that are sent to the Cloudflare Resolver for Firefox via the Firefox browser."'><a href="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/firefox/"><i class="fas fa-exclamation-triangle"></i></a></span> Currently Mozilla is <a href="https://blog.mozilla.org/futurereleases/2019/07/31/dns-over-https-doh-update-detecting-managed-networks-and-user-choice/">conducting studies</a> before enabling DoH by default for all US-based Firefox users.</li>
+          <ul>
+              <li>DNS over HTTPS can be enabled in Menu -> Preferences (<code>about:preferences</code>) -> Network Settings -> Enable DNS over HTTPS. Set "Use Provider" to "Custom", and enter your DoH provider's address.</li>
+              <li>Advanced users may enable it in <code>about:config</code> by setting <code>network.trr.custom_uri</code> and <code>network.trr.uri</code> as the address you find from the documentation of your DoH provider and <code>network.trr.mode</code> as <code>2</code>. It may also be desirable to set <code>network.security.esni.enabled</code> to <code>True</code> in order to enable encrypted SNI and make sites supporting ESNI a bit more difficult to track.</li>
+          </ul>
+    </ul>
+  </li>
+  <li><strong>Encrypted DNS clients for mobile:</strong>
+    <ul>
+      <li><em>Android 9</em> comes with a DoT client by <a href="https://support.google.com/android/answer/9089903">default</a>. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="...but with some caveats"><a href="https://www.quad9.net/private-dns-quad9-android9/"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+        <ul>
+          <li>We recommend selecting <em>Private DNS provider hostname</em> and entering the DoT address from documentation of your DoT provider to enable strict mode (see Terms above). <span class="badge badge-warning" data-toggle="tooltip" data-original-title="If you are on a network blocking access to port 853, Android will error about the network not having internet connectivity."><i class="fas fa-exclamation-triangle"></i></span></li>
+        </ul>
+      <li><em><a href="https://apps.apple.com/app/id1452162351">DNSCloak</a></em> - An <a href="https://github.com/s-s/dnscloak">open-source</a> DNSCrypt and DoH client for iOS by <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"A charitable non-profit host organization for international Free Software projects."' href="https://techcultivation.org/">the Center for the Cultivation of Technology gemeinnuetzige GmbH</a>.</li>
+      <li><em><a href="https://git.frostnerd.com/PublicAndroidApps/smokescreen/blob/master/README.md">Nebulo</a></em> - An open-source application for Android supporting DoH and DoT. It also supports caching DNS responses and locally logging DNS queries.</li>
+    </ul>
+  </li>
+  <li><strong>Local DNS servers:</strong>
+    <ul>
+      <li><em><a href="https://namecoin.info/">Namecoin</a></em> - A decentralized DNS open-source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
+      <li><em><a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby">Stubby</a></em> - An open-source application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.</li>
+    </ul>
+  </li>
+  <li><strong>Network wide DNS servers:</strong>
+    <ul>
+      <li><em><a href="https://pi-hole.net/">Pi-hole</a></em> - A network-wide DNS server mainly for the Raspberry Pi. Blocks ads, tracking, and malicious domains for all devices on your network.</li>
+      <li><em><a href="https://gitlab.com/quidsup/notrack">NoTrack</a></em> - A network-wide DNS server like Pi-hole for blocking ads, tracking, and malicious domains.</li>
+    </ul>
+  </li>
+  <li><strong>Further reading:</strong>
+    <ul>
+      <li>On Firefox, DoH and ESNI</li>
+          <ul>
+              <li><a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver">Trusted Recursive Resolver (DoH) on MozillaWiki</a></li>
+              <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1500289">Firefox bug report requesting the ability to use ESNI without DoH</a></li>
+              <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1542754">Firefox bug report requesting the ability to use Android 9+'s Private DNS (DoT) and benefit from encrypted SNI without having to enable DoH</a></li>
+              <li><a href="https://blog.cloudflare.com/encrypted-sni/">Encrypt it or lose it: how encrypted SNI works on Cloudflare blog</a></li>
+          </ul>
+      <li><a href="https://www.isc.org/blogs/qname-minimization-and-privacy/">QNAME Minimization and Your Privacy</a> by the Internet Systems Consortium (ISC)</li>
+      <li><a href="https://www.isc.org/dnssec/">DNSSEC and BIND 9</a> by the ISC</li>
+    </ul>
+  </li>
+</ul>

_includes/sections/email-alternatives.html

@@ -0,0 +1,33 @@
+<h1 id="messaging" class="anchor"><a href="#messaging"><i class="fas fa-link anchor-icon"></i></a> Email Alternatives</h1>
+
+{% include cardv2.html
+title="Bitmessage"
+image="/assets/img/tools/Bitmessage.png"
+description="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless,
+meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data."
+website="https://bitmessage.org/"
+forum="https://forum.privacytools.io/t/discussion-bitmessage/661"
+github="https://github.com/Bitmessage/PyBitmessage"
+windows=""
+mac=""
+linux=""
+%}
+
+{% include cardv2.html
+title="RetroShare"
+image="/assets/img/tools/RetroShare.png"
+description="Retroshare creates encrypted connections to your friends. Nobody can spy on you. Retroshare is completely decentralized. This means there are no central servers. It is entirely Open-Source and free. There are no costs, no ads and no Terms of Service."
+website="https://retroshare.cc/"
+forum="https://forum.privacytools.io/t/discussion-retroshare/662"
+github="https://github.com/RetroShare/RetroShare"
+windows=""
+mac=""
+linux=""
+%}
+
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://i2pbote.xyz/">I2P-Bote</a> - End-to-end encrypted decentralized mail system within the I2P network.</li>
+</ul>

_includes/sections/email-clients.html

@@ -2,32 +2,28 @@
 
 {% include cardv2.html
 title="Thunderbird"
-image="/assets/img/svg/3rd-party/thunderbird.svg"
+image="/assets/img/tools/Thunderbird.png"
-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."
+description="Thunderbird is a free, open source, cross-platform email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client developed by community, previously by the Mozilla Foundation."
 website="https://www.thunderbird.net/"
 forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
 source="https://hg.mozilla.org/comm-central/"
-windows="https://www.thunderbird.net/en-US/"
+windows=""
-mac="https://www.thunderbird.net/en-US/"
+mac=""
-linux="https://www.thunderbird.net/en-US/"
+linux=""
-freebsd="https://www.freshports.org/mail/thunderbird/"
+bsd=""
-openbsd="http://openports.se/mail/mozilla-thunderbird"
-netbsd="http://pkgsrc.se/mail/thunderbird"
 %}
 
 {% include cardv2.html
 title="Claws Mail"
-image="/assets/img/png/3rd-party/claws_mail.png"
+image="/assets/img/tools/Claws-Mail.png"
 description="Claws Mail is a free and open source, GTK-based email and news client. It offers easy configuration and an abundance of features. It is included with Gpg4win, an encryption suite for Windows."
 website="https://www.claws-mail.org/"
 forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
 git="https://git.claws-mail.org/"
-windows="https://www.claws-mail.org/win32/"
+windows=""
-mac="https://www.claws-mail.org/faq/index.php/Installation_and_Configuration#What_do_I_need_to_compile_Claws_Mail.3F"
+mac=""
-linux="https://www.claws-mail.org/downloads.php?section=downloads"
+linux=""
-freebsd="https://www.freshports.org/mail/claws-mail/"
+bsd=""
-openbsd="http://openports.se/mail/claws-mail"
-netbsd="http://pkgsrc.se/mail/claws-mail"
 %}
 
 

_includes/sections/email-providers.html

@@ -24,26 +24,13 @@
 
       <tr>
         <td data-value="disroot">
-          <img
+          <img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
-            alt="Disroot"
-            src="/assets/img/svg/3rd-party/disroot.svg"
-            data-theme-src="/assets/img/svg/3rd-party/disroot-dark.svg"
-            width="200"
-            height="70">
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-            class="btn-secondary btn-icon"
-            href="https://disroot.org">
-            <span class="fas fa-globe"></span>
-          </a>
         </td>
         <td data-value="2015">2015</td>
-        <td>
+        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span> Netherlands
-          </span>
-        </td>
         <td data-value="1000">1 GB</td>
         <td data-value="0"><span class="label label-warning">Free</span></td>
         <td data-value="1"><span class="label label-success">Accepted</span></td>
@@ -53,80 +40,46 @@
 
       <tr>
         <td data-value="kolabnow">
-          <img
+          <img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
-            alt="Kolab Now"
-            src="/assets/img/svg/3rd-party/kolab_now.svg"
-            data-theme-src="/assets/img/svg/3rd-party/kolab_now-dark.svg"
-            width="200"
-            height="70">
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-            class="btn-secondary btn-icon"
-            href="https://kolabnow.com">
-            <span class="fas fa-globe"></span>
-          </a>
         </td>
         <td data-value="2010">2010</td>
-        <td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-ch"></span> Switzerland
-          </span>
-        </td>
         <td data-value="2048">2 GB</td>
         <td data-value="6000">$ 60</td>
         <td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="0"><span class="label label-primary">No</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="mailbox">
+          <img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
+
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
+        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
+        <td data-value="2000">2 GB</td>
+        <td data-value="1444">12 €</td>
+        <td data-value="1"><span class="label label-success">Accepted</span></td>
         <td data-value="1"><span class="label label-success">Built-in</span></td>
         <td data-value="1"><span class="label label-success">Yes</span></td>
       </tr>
 
-      <tr>
-        <td data-value="mailbox">
-          <img alt="mailbox.org" src="/assets/img/svg/3rd-party/mailboxorg.svg" width="200" height="70">
-
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://mailbox.org">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span> Germany
-          </span>
-        </td>
-        <td data-value="2000">2 GB</td>
-        <td data-value="1444">12 €</td>
-        <td data-value="0"><span class="label label-success">No</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
       <tr>
         <td data-value="mailfence">
-          <img
+          <img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
-            alt="Mailfence"
-            src="/assets/img/svg/3rd-party/mailfence.svg"
-            data-theme-src="/assets/img/svg/3rd-party/mailfence-dark.svg"
-            width="200"
-            height="70">
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-            href="https://mailfence.com"
-            class="btn-secondary btn-icon">
-            <span class="fas fa-globe"></span>
-          </a>
         </td>
         <td data-value="2013">2013</td>
-        <td>
+        <td><span class="flag-icon flag-icon-be"></span> Belgium</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-be"></span> Belgium
-          </span>
-        </td>
         <td data-value="500">500 MB</td>
         <td data-value="0"><span class="label label-warning">Free</span></td>
         <td data-value="1"><span class="label label-success">Accepted</span></td>
@@ -135,22 +88,30 @@
       </tr>
 
       <tr>
-        <td data-value="posteo">
+        <td data-value="neomailbox">
-          <img alt="Posteo" src="/assets/img/svg/3rd-party/posteo.svg" width="200" height="70">
+          <img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-            class="btn-secondary btn-icon"
+        </td>
-            href="https://posteo.de">
+        <td data-value="2003">2003</td>
-            <span class="fas fa-globe"></span>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-          </a>
+        <td data-value="1000">1 GB</td>
+        <td data-value="4995">$ 49.95</td>
+        <td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="1"><span class="label label-success">Built-in</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="posteo">
+          <img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
         </td>
         <td data-value="2009">2009</td>
-        <td>
+        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span> Germany
-          </span>
-        </td>
         <td data-value="2000">2 GB</td>
         <td data-value="1444">12 €</td>
         <td data-value="0"><span class="label label-primary">No</span></td>
@@ -160,29 +121,14 @@
 
       <tr>
         <td data-value="protonmail">
-          <img alt="ProtonMail" src="/assets/img/svg/3rd-party/protonmail.svg" width="200" height="70">
+          <img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70">
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonmail.com" href="https://protonmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-            class="btn-secondary btn-icon"
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonirockerxow.onion. Requires specific software to access: torproject.org" href="https://protonirockerxow.onion"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
-            href="https://protonmail.com">
-            <span class="fas fa-globe"></span>
-          </a>
-          <a
-            class="btn-tor btn-icon mt-1"
-            href="https://protonirockerxow.onion"
-            title="Requires specific software to access: torproject.org"
-            data-toggle="tooltip"
-            data-placement="bottom">
-            <span class="ptio-tor"></span>
-          </a>
         </td>
         <td data-value="2013">2013</td>
-        <td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-ch"></span> Switzerland
-          </span>
-        </td>
         <td data-value="500">500 MB</td>
         <td data-value="0"><span class="label label-warning">Free</span></td>
         <td data-value="1"><span class="label label-success">Accepted</span></td>
@@ -192,26 +138,14 @@
 
       <tr>
         <td data-value="runbox">
-          <img
+          <img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
-            alt="Runbox"
+
-            src="/assets/img/png/3rd-party/runbox.png"
-            data-theme-src="/assets/img/png/3rd-party/runbox-dark.png"
-            width="200"
-            height="70">
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-            class="btn-secondary btn-icon"
-            href="https://runbox.com">
-            <span class="fas fa-globe"></span>
-          </a>
         </td>
         <td data-value="1999">1999</td>
-        <td>
+        <td><span class="flag-icon flag-icon-no"></span> Norway</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-no"></span> Norway
-          </span>
-        </td>
         <td data-value="1000">1 GB</td>
         <td data-value="1995">$ 19.95</td>
         <td data-value="1"><span class="label label-primary">Accepted</span></td>
@@ -221,21 +155,13 @@
 
       <tr>
         <td data-value="soverin">
-          <img alt="Soverin" src="/assets/img/svg/3rd-party/soverin.svg" width="200" height="70">
+          <img alt="Soverin" src="/assets/img/provider/Soverin.png" width="200" height="70">
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://soverin.net/" href="https://soverin.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-            class="btn-secondary btn-icon"
-            href="https://soverin.net">
-            <span class="fas fa-globe"></span>
-          </a>
         </td>
         <td data-value="2015">2015</td>
-        <td>
+        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span> Netherlands
-          </span>
-        </td>
         <td data-value="25000">25 GB</td>
         <td data-value="3489">29 €</td>
         <td data-value="0"><span class="label label-success">No</span></td>
@@ -245,55 +171,29 @@
 
       <tr>
         <td data-value="startmail">
-          <img
+          <img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
-            alt="StartMail"
-            src="/assets/img/svg/3rd-party/startmail.svg"
-            data-theme-src="/assets/img/svg/3rd-party/startmail-dark.svg"
-            width="200"
-            height="70">
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-            class="btn-secondary btn-icon"
-            href="https://startmail.com">
-            <span class="fas fa-globe"></span>
-          </a>
         </td>
         <td data-value="2014">2014</td>
-        <td>
+        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span> Netherlands
-          </span>
-        </td>
         <td data-value="10000">10 GB</td>
         <td data-value="5995">$ 59.95</td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="0"><span class="label label-success">Accepted</span></td>
         <td data-value="1"><span class="label label-success">Built-in</span></td>
         <td data-value="1"><span class="label label-success">Yes</span></td>
       </tr>
 
       <tr>
         <td data-value="tutanota">
-          <img
+          <img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70">
-            alt="Tutanota"
-            src="/assets/img/svg/3rd-party/tutanota.svg"
-            data-theme-src="/assets/img/svg/3rd-party/tutanota-dark.svg"
-            width="200"
-            height="70">
         </td>
         <td>
-          <a
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.tutanota.com" href="https://www.tutanota.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-            class="btn-secondary btn-icon"
-            href="https://tutanota.com">
-            <span class="fas fa-globe"></span>
-          </a>
         </td>
         <td data-value="2011">2011</td>
-        <td>
+        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span> Germany
-          </span>
-        </td>
         <td data-value="1000">1 GB</td>
         <td data-value="0"><span class="label label-warning">Free</span></td>
         <td data-value="0"><span class="label label-primary">No</span></td>
@@ -310,12 +210,17 @@
 <ul>
   <li><a href="https://www.confidantmail.org/">Confidant Mail</a> - An open-source non-SMTP cryptographic email system optimized for large file attachments. It is a secure and spam-resistant alternative to regular email and online file drop services. It
     uses <a href="https://theprivacyguide.org/tutorials/gpg.html">GNU Privacy Guard (GPG)</a> for content encryption and authentication, and TLS 1.2 with ephemeral keys for transport encryption.</li>
+</ul>  <h3>Become Your Own Email Provider with Mail-in-a-Box</h3>
+<a href="https://mailinabox.email/"><img src="/assets/img/provider/Mail-in-a-Box.png" width="200" height="70" class="img-fluid float-left" alt="Mail-in-a-Box" style="margin-right:10px;"></a>
+<p>Take it a step further and get control of your email with this easy-to-deploy mail server in a box. Mail-in-a-Box lets you become your own mail service provider in a few easy steps. It's sort of like making your own Gmail, but one you control from top
+to bottom. Technically, Mail-in-a-Box turns a fresh cloud computer into a working mail server. But you don't need to be a technology expert to set it up. <strong>More: <a href="https://mailinabox.email/">https://mailinabox.email/</a></strong></p>
+
+<h3>Related Information</h3>
+
+<ul>
+  <li><a href="https://www.wired.com/2011/10/ecpa-turns-twenty-five/">Aging 'Privacy' Law Leaves Cloud E-Mail Open to Cops</a> - Data stored in the cloud for longer than 6 months is considered abandoned and may be accessed by intelligence agencies without
+    a warrant. Learning: Use an external email client like Thunderbird or Enigmail, download your emails and store them locally. Never leave them on the server.</li>
+  <li><a href="https://www.eff.org/deeplinks/2012/04/may-firstriseup-server-seizure-fbi-overreaches-yet-again">With May First/Riseup Server Seizure, FBI Overreaches Yet Again</a></li>
+  <li><a href="https://www.autistici.org/ai/crackdown/">Autistici/Inventati server compromised</a> - The cryptographic services offered by the Autistici/Inventati server have been compromised on 15th June 2004. It was discovered on 21st June 2005. One year
+    later. During an enquiry on a single mailbox, the Postal Police may have tapped for a whole year every user's private communication going through the server autistici.org/inventati.org.</li>
 </ul>
-
-<h3>Become Your Own Email Provider</h3>
-
-<a href="https://mailinabox.email/"><img src="/assets/img/svg/3rd-party/mail-in-a-box.svg" width="80rem" class="img-fluid float-left mr-3" alt="Mail-in-a-Box"></a>
-<p><strong>Mail-in-a-Box</strong> lets you become your own mail service provider in a few easy steps. It's sort of like making your own Gmail, but one you control from top to bottom. Technically, Mail-in-a-Box turns a fresh cloud computer into a working mail server. But you don't need to be a technology expert to set it up. <strong>More: <a href="https://mailinabox.email/">https://mailinabox.email/</a></strong></p>
-
-<a href="https://mailcow.email/"><img src="/assets/img/svg/3rd-party/mailcow.svg" width="80rem" class="img-fluid float-left mr-3" alt="Mailcow"></a>
-<p><strong>Mailcow</strong> is a slightly more advanced mail server perfect for those with a bit more Linux experience. It has everything you need in a Docker container: A mailserver with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support. <strong>More: <a href="https://mailcow.github.io/mailcow-dockerized-docs/">Mailcow Dockerized docs</a></strong></p>

_includes/sections/file-encryption.html

@@ -1,61 +1,48 @@
 <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>
+  <strong>If you are currently not using encryption software for your hard disk, emails or file archives, you should pick an encryption software here.</strong>
 </div>
 
-{%
+<div class="row mb-2">
-  include cardv2.html
+
+  {% include card.html color="success"
   title="VeraCrypt - Disk Encryption"
-  image="/assets/img/svg/3rd-party/veracrypt.svg"
+  image="/assets/img/tools/VeraCrypt.png"
-  image-dark="/assets/img/svg/3rd-party/veracrypt-dark.svg"
+  url="https://veracrypt.fr/"
-  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."
+  footer="OS: Windows, macOS, Linux."
-  website="https://veracrypt.fr/"
+  description="VeraCrypt 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
-  forum="https://forum.privacytools.io/t/discussion-veracrypt-file-encryption/1532"
+  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
-  git="https://www.veracrypt.fr/code/"
+  raised by the initial TrueCrypt code audit have been addressed."
-  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 card.html color="primary"
-  include cardv2.html
   title="GNU Privacy Guard - Email Encryption"
-  image="/assets/img/svg/3rd-party/gnupg.svg"
+  image="/assets/img/tools/GnuPG.png"
-  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."
+  url="https://gpgtools.org/"
-  website="https://gnupg.org/"
+  footer="OS: Windows, macOS, Linux, Android, BSD."
-  forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533"
+  description="GnuPG 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
-  git="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git"
+  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
-  windows="https://gpg4win.org/download.html"
+  government. <a href=\"https://gpgtools.org/\">GPGTools for macOS</a>."
-  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 card.html color="warning"
-  include cardv2.html
   title="PeaZip - File Archive Encryption"
-  image="/assets/img/svg/3rd-party/peazip.svg"
+  image="/assets/img/tools/PeaZip.png"
-  description="<strong>PeaZip</strong> is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It also supports 180+ archive formats."
+  url="http://www.peazip.org/"
-  website="http://www.peazip.org"
+  footer="OS: Windows, Linux, BSD."
-  forum="https://forum.privacytools.io/t/discussion-peazip-file-encryption/1534"
+  description="PeaZip is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume
-  source="https://osdn.net/projects/peazip"
+  split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 181 file extensions (as of version 5.5.1).</p>
-  windows="https://www.peazip.org/peazip-64bit.html"
+  <p><strong>macOS alternative:</strong> <a href=\"https://www.keka.io/\">Keka</a> is a free file archiver."
-  linux="https://www.peazip.org/peazip-linux.html"
+  %}
-  freebsd="https://www.freshports.org/archivers/peazip/"
+
-  openbsd="https://www.peazip.org/peazip-bsd.html"
+</div>
-  netbsd="https://www.peazip.org/peazip-bsd.html"
-%}
 
 <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. <span class="badge badge-warning" data-toggle="tooltip" title="Cryptomator's mobile apps are not open-source."><a href="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
+  <li><a href="https://diskcryptor.net/">DiskCryptor</a> - A full disk and partition encryption system for Windows including the ability to encrypt the partition and disk on which the OS is installed.</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://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://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.</a></li>
-  <li><a href="https://www.keka.io/">Keka</a> - A macOS-only, open-source file archiver with the ability to encrypt files.</li>
 </ul>

_includes/sections/file-sharing.html

@@ -2,50 +2,42 @@
 
 {% include cardv2.html
 title="Firefox Send"
-image="/assets/img/svg/3rd-party/firefox_send.svg"
+image="/assets/img/tools/Firefox-Send.png"
-labels="warning:<a href=//send.firefox.com/legal>Warning</a>: IP addresses are retained in logs for 90 days."
-description="Firefox Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether you would like to add a password for an extra layer of security."
 website="https://send.firefox.com/"
+description="Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether to add an optional password for an extra layer of security."
 forum="https://forum.privacytools.io/t/discussion-firefox-send/755"
 github="https://github.com/mozilla/send"
-web="https://send.firefox.com/"
+web=""
-googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsend"
+android=""
 %}
 
 {% include cardv2.html
 title="OnionShare"
-image="/assets/img/svg/3rd-party/onionshare.svg"
+image="/assets/img/tools/OnionShare.png"
 website="https://onionshare.org/"
-tor="http://lldan5gahapx5k7iafb3s4ikijc4ni7gx5iywdflkba5y2ezyg6sjgyd.onion/"
+tor="http://elx57ue5uyfplgva.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."
+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, making it accessible as a Tor onion service, and generating an unguessable URL to access and download the files."
 forum="https://forum.privacytools.io/t/discussion-onionshare/754"
 github="https://github.com/micahflee/onionshare"
-windows="https://onionshare.org/#downloads"
+windows=""
-mac="https://onionshare.org/#downloads"
+mac=""
-linux="https://onionshare.org/#downloads"
+linux=""
-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"
+image="/assets/img/tools/Magic-Wormhole.png"
-website="https://magic-wormhole.readthedocs.io"
+website="https://github.com/warner/magic-wormhole"
-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.\""
+description="Get things from one computer to another, safely. This package 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."
 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"
+windows=""
-mac="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+mac=""
-linux="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+linux=""
-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>. <span class="badge badge-warning" data-toggle="tooltip" title="FramaDrop logs IP addresses and fingerprints the browser for an unclear amount of time."><a href="https://framasoft.org/en/cgu/"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+  <li><a href="https://github.com/schollz/croc">croc</a> - Easily and securely send things from one computer to another.</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>

_includes/sections/file-sync.html

@@ -1,41 +1,30 @@
-<h1 id="sync" class="anchor">
+<h1 id="sync" class="anchor"><a href="#sync"><i class="fas fa-link anchor-icon"></i></a> Secure File Sync Software</h1>
-  <a href="#sync">
-    <i class="fas fa-link anchor-icon"></i>
-  </a>
-  File Sync
-</h1>
 
-{%
+<div class="row mb-2">
-  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"
-%}
 
-{%
+  {% include card.html color="success"
-  include cardv2.html
   title="SparkleShare"
-  image="/assets/img/svg/3rd-party/sparkleshare.svg"
+  image="/assets/img/tools/SparkleShare.png"
-  description="<strong>SparkleShare</strong> creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes, or edits a file."
+  url="https://sparkleshare.org/"
-  website="https://sparkleshare.org/"
+  footer="OS: Windows, macOS, Linux."
-  forum="https://forum.privacytools.io/t/discussion-sparkleshare/1626"
+  description="SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically
-  github="https://github.com/hbons/SparkleShare"
+  kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
-  linux="https://www.sparkleshare.org/"
+  %}    {% include card.html color="primary"
-  mac="https://github.com/hbons/SparkleShare/releases/"
+  title="Syncthing"
-%}
+  image="/assets/img/tools/Syncthing.png"
+  url="https://syncthing.net/"
+  footer="OS: Windows, macOS, Linux, Android, BSD, Solaris."
+  description="Syncthing 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's transmitted over the Internet."
+  %}
+
+</div>
 
 <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.
+    <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>

_includes/sections/fourteen-eyes.html

@@ -1,8 +1,8 @@
 <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">
+<img src="/assets/img/layout/UKUSA.png" width="260" height="115" class="img-fluid float-right" alt="UKUSA Agreement" style="margin-left:10px;">
 
-<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>
+<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"

_includes/sections/header.html

@@ -1,22 +1,11 @@
-<div class="alert alert-success" role="alert">
-  <strong>New!</strong> Financial <a href="https://opencollective.com/privacytoolsio" class="alert-link">contributions</a> to {{ site.name }} are now tax deductible in the US! <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="alert-link">Learn more...</a>
-</div>
-
 <div class="jumbotron p-5">
-  <h1 class="display-4">
+  <h1 class="display-4"><a href="https://www.privacytools.io/" title="privacytools.io"><img src="/assets/img/layout/logo.png" width="600" height="88" class="img-fluid" alt="privacytools.io"></a></h1>
-    <a href="{{ site.production_url }}" title="{{ site.name }}">
+  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. privacytools.io provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
-      <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="">
+<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try search.privacytools.io, 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>

_includes/sections/hosting-provider.html

@@ -2,18 +2,16 @@
 
 {% include cardv2.html
 title="Data Center: Bahnhof"
-image="/assets/img/svg/3rd-party/bahnhof.svg"
+image="/assets/img/provider/bahnhof.png"
-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 us world famous."
-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/"
 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="/assets/img/provider/Njalla.png"
-image-dark="/assets/img/svg/3rd-party/njalla-dark.svg"
+description="Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service and VPS provider."
-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/"
 tor="http://njalladnspotetti.onion"
 forum="https://forum.privacytools.io/t/discussion-njalla/339"
@@ -21,16 +19,16 @@ forum="https://forum.privacytools.io/t/discussion-njalla/339"
 
 {% include cardv2.html
 title="Colocation: DataCell"
-image="/assets/img/png/3rd-party/datacell.png"
+image="/assets/img/provider/datacell.png"
 description="DataCell is a data center providing secure colocating in Switzerland and Iceland."
 website="https://datacell.is/"
 forum="https://forum.privacytools.io/t/discussion-datacell-is/342"
 %}
 
 {% include cardv2.html
-title="VPS, Hosting, & Domain: Orange Website"
+title="VPS & Hosting: Orange Website"
-image="/assets/img/png/3rd-party/orange_website.png"
+image="/assets/img/provider/orange_hosting.png"
 description="Orange Website is an Icelandic web hosting provider that prides themselves in protecting online privacy and free speech."
 website="https://www.orangewebsite.com/"
 forum="https://forum.privacytools.io/t/discussion-orange-website/343"
-%}
+%}

_includes/sections/instant-messenger.html

@@ -1,205 +1,78 @@
-<h1 id="im" class="anchor"><a href="#im"><i class="fas fa-link anchor-icon"></i></a> Encrypted Instant Messengers</h1>
+<h1 id="im" class="anchor"><a href="#im"><i class="fas fa-link anchor-icon"></i></a> Encrypted Instant Messenger</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>
+  <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>
-
-<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>
-
-<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>
-
-<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>
-
-{%
-   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="warning:<a>Requires phone number</a>:Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|success:VoIP"
-   website="https://signal.org/"
-   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"
-%}
-
-{%
-  include cardv2.html
-  title="Keybase"
-  image="/assets/img/svg/3rd-party/keybase.svg"
-  description='Keybase provides a hosted team chat with E2EE. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase can help you prove you own social media accounts though the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
-  labels="warning:<a href=//github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
-  website="https://keybase.io/"
-  forum="https://forum.privacytools.io/t/discussion-keybase/1224"
-  tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
-  github="https://github.com/Keybase"
-  windows="https://keybase.io/docs/the_app/install_windows"
-  mac="https://keybase.io/docs/the_app/install_macos"
-  linux="https://keybase.io/docs/the_app/install_linux"
-  freebsd="https://www.freshports.org/security/keybase/"
-  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage"
-  ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770"
-  firefox="https://addons.mozilla.org/firefox/addon/keybase-for-firefox/"
-  chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
-%}
-
-<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>
-
-    <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>
-
-    <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>
 
-{%
+
-  include cardv2.html
+{% include cardv2.html
-  title="Matrix"
+title="Signal"
-  image="/assets/img/svg/3rd-party/matrix.svg"
+image="/assets/img/tools/Signal.png"
-  image-dark="/assets/img/svg/3rd-party/matrix-dark.svg"
+description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
-  description='<a href="https://matrix.org/docs/guides/introduction">Matrix</a> is an open-source project that publishes the <a href="https://matrix.org/docs/spec">Matrix open standard</a> for secure, decentralized, real-time communication.<br />
+All communications are end-to-end encrypted. Signal is free and open source."
-  <a href="https://en.wikipedia.org/wiki/Riot.im">Riot.im</a> is the popular reference client produced by the Matrix.org team. It offers optional E2EE for 1:1 and group conversations that <strong>must</strong> be turned on by the user. (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security &amp; Privacy → Encrypted). In the future it will be <a href="https://github.com/vector-im/riot-web/issues/6779">on by default.</a>'
+labels="success:VoIP"
-  website="https://about.riot.im/"
+website="https://signal.org/"
-  forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
+forum="https://forum.privacytools.io/t/discussion-signal/664"
-  github="https://github.com/vector-im/riot-web/"
+github="https://github.com/signalapp"
-  windows="https://riot.im/download/desktop/"
+android=""
-  mac="https://riot.im/download/desktop/"
+ios=""
-  linux="https://riot.im/download/desktop/"
-  fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
-  googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
-  ios="https://itunes.apple.com/app/vector.im/id1083446067"
-  web="https://riot.im/app/"
 %}
 
-<div>
-    <h4>Worth Mentioning</h4>
 
-    <ul>
+{% include cardv2.html
-        <li>Other <a href="https://matrix.org/clients">Matrix</a> clients, that may however be less feature complete than Riot.im.</li>
+title="Wire"
-        <li><a href="https://xmpp.org/about">XMPP</a> (Extensible Messaging and Presence Protocol) is an open-source communications protocol that began development in 1999. Since then, XMPP has been extended by the publishing of XEPs (XMPP Extension Protocols). <a href="https://conversations.im/omemo/">OMEMO</a> is the most popular XEP (XMPP extension) for E2EE. Clients are developed by the community and not by the XSF (XMPP Standards Foundation). <span class="badge badge-warning" data-toggle="tooltip" title="VoIP and file transfers/names may not be end-to-end encrypted.">Inconsistent E2EE</span></li>
+image="/assets/img/tools/wire.png"
-        <ul>
+description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
-            <li><a href="https://gajim.org/">Gajim</a></li>
+labels="warning:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text>Warning</a>:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.|success:VoIP"
-            <li><a href="https://conversations.im">Conversations</a></li>
+website="https://wire.com/"
-            <li><a href="https://siskin.im/">Siskin</a></li>
+forum="https://forum.privacytools.io/t/discussion-wire/750"
-            <li>Other <a href="https://omemo.top">OMEMO</a> capable clients for XMPP.</li>
+github="https://github.com/wireapp/"
-        </ul>
+android=""
-        <li><a href="https://www.kontalk.org">Kontalk</a> is a community-driven instant messaging network based on XMPP.</li>
+ios=""
-    </ul>
+mac=""
-
+windows=""
-    <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>
+linux=""
-
+web=""
-    <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), or <a href="https://en.wikipedia.org/wiki/Ethereum">Ethereum</a>'s <a href="https://github.com/ethereum/wiki/wiki/Whisper">Whisper</a> protocol (used with some newer DApps). 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>
-
-
-    <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>
-
-    <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>
-
-{%
-  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"
-  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"
 %}
 
-{%
+<h3>Complete Comparison</h3>
-  include cardv2.html
+<ul>
-  title="Jami"
+	<li><a href="https://securechatguide.org/effguide.html">securechatguide.org</a> - Guide to Choosing a Messenger.</li>
-  image="/assets/img/svg/3rd-party/jami.svg"
+	<li><a href="https://www.securemessagingapps.com/">securemessagingapps.com</a> - Secure Messaging Apps Comparison.</li>
-  description="Encrypted instant messaging and video calling software. Uses <a href=//jami.net/improving-performance-and-security-with-tls-1-3/>TLS 1.3</a> for encryption."
+  <li><a href="https://www.thinkprivacy.io/messengers.html">thinkprivacy.io</a> - Simple Secure Messaging Apps Comparison.</li>
-  labels="success:VoIP"
+</ul>
-  website="https://jami.net/"
-  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"
-%}
 
-{%
-  include cardv2.html
-  title="Tox"
-  image="/assets/img/svg/3rd-party/tox.svg"
-  image-dark="/assets/img/svg/3rd-party/tox-dark.svg"
-  description='Encrypted instant messaging and video calling software. Uses its <a href="https://toktok.ltd/spec.html"> own encryption protocol</a> that has not yet been officially audited by cryptographers.'
-  labels="warning:<a href=//tox.chat/download.html#warning>Experimental</a>:Encryption has not been audited by professional cryptographers|success:VoIP"
-  website="https://tox.chat"
-  forum="https://forum.privacytools.io/t/discussion-tox/2115"
-  windows="https://tox.chat/download.html#oses"
-  mac="https://tox.chat/download.html#oses"
-  linux="https://tox.chat/download.html#oses"
-  freebsd="https://tox.chat/download.html#oses"
-  openbsd="http://openports.se/search.php?so=tox"
-  netbsd="http://pkgsrc.se/search.php?so=tox"
-  fdroid="https://tox.chat/download.html#oses"
-  googleplay="https://tox.chat/download.html#oses"
-  ios="https://tox.chat/download.html#oses"
-%}
 
-<h4>Worth Mentioning</h4>
+<h3>Worth Mentioning</h3>
 
 <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://blog.enuma.io/update/2018/08/08/decentralized-application-messaging-with-whisper.html">Whisper protocol</a> for P2P communication. <span class="badge badge-warning">Experimental</span></li>
+  <li><a href="https://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.
-    <li><a href="https://retroshare.cc">Retroshare</a> - Encrypted instant messaging and voice/video call client. RetroShare supports both <a href="https://www.torproject.org/">Tor</a> and <a href="https://geti2p.net">I2P</a>.</li>
+  <li><a href="https://retroshare.cc/">RetroShare</a> - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </li>
-    <li><a href="https://bitmessage.org">Bitmessage</a> is a decentralized, encrypted, peer-to-peer, trustless communications protocol that can be used by one person to send encrypted messages to another person, or to multiple subscribers.</li>
+  <li><a href="https://xmpp.org/">XMPP</a> - Federated instant messaging protocol with <a href="https://conversations.im/omemo/">OMEMO</a>, OTR, or OpenPGP end-to-end encryption:</li>
+  <ul>
+    <li><a href="https://conversations.im/">Conversations</a> (Android) - An open source Jabber/XMPP client for Android 4.4+ smartphones. <span class="badge badge-success">OMEMO</span></li>
+    <li><a href="https://gajim.org/">Gajim</a> (FreeBSD, Linux, Windows) - An open source fully featured XMPP client. <span class="badge badge-success">OMEMO</span></li>
+    <li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development. <span class="badge badge-success">OMEMO</span> <span class="badge badge-success">VoIP</span></li>
+    <li><a href="https://omemo.top/">Other OMEMO ready clients</a>.</li>
+  </ul>
+  <li><a href="https://www.kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
+  <li><a href="https://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
+  <li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
+  <li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. <span class="badge badge-success">VoIP</span></li>
+  <li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you full control over your communications and an unmatched level of privacy. Jami has <em>text messaging, video and audio calls, file transfer, video conferencing</em>. <span class="badge badge-success">VoIP</span></li>
 </ul>
+
+
+<h3>Related Information</h3>
+
+<ul>
+  <li><a href="https://firstlook.org/theintercept/2015/07/14/communicating-secret-watched/">Chatting in Secret While We're All Being Watched - firstlook.org</a></li>
+  <li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
+  <li>Independent security audits</li>
+  <ul>
+    <li><a href="https://eprint.iacr.org/2016/1013.pdf">A Formal Security Analysis of the Signal Messaging Protocol (2019)</a> by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila</li>
+    <li><a href="https://wire.com/en/security/#audits">Independent security audits</a> on Wire's website</li>
+    <li><a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a></li>
+  </ul>
+</ul>
+

_includes/sections/key-disclosure-law.html

@@ -28,7 +28,7 @@
   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://en.wikipedia.org/wiki/Key_disclosure_law#Belgium">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>
@@ -67,9 +67,9 @@
 
 <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">
+<img src="/assets/img/layout/USA.png" width="200" height="200" class="img-fluid float-right" alt="USA" style="margin-left:10px;">
 
-<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>Services based in the United States are not recommended because of the country's surveillance programs, use of <a href="https://www.eff.org/issues/national-security-letters/faq">National Security Letters</a> (NSLs) and 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>

_includes/sections/live-operating-systems.html

@@ -1,26 +1,38 @@
-<h1 id="live_os" class="anchor"><a href="#live_os"><i class="fas fa-link anchor-icon"></i></a> PC Live Operating Systems</h1>
+<h1 id="live_os" class="anchor"><a href="#live_os"><i class="fas fa-link anchor-icon"></i></a> Live CD Operating Systems</h1>
 
 {% include cardv2.html
 title="Tails"
-image="/assets/img/svg/3rd-party/tails.svg"
+image="/assets/img/tools/Tails.png"
-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.'
+description='Tails is a live operating system, that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and helps to: Use the Internet anonymously and circumvent censorship; Internet connections go through the Tor network; leave no trace on the computer; use state-of-the-art cryptographic tools to encrypt files, emails and instant messaging.'
 badges="info:GNU/Linux"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://tails.boum.org/"
 git="https://git-tails.immerda.ch/tails/"
 %}
 
+{% include cardv2.html
+title="KNOPPIX"
+image="/assets/img/tools/KNOPPIX.png"
+description='Knoppix is an operating system based on Debian designed to be run directly from a CD / DVD (Live CD) or a USB flash drive (Live USB), one of the first of its kind for any operating system. When starting a program, it is loaded from the removable medium and decompressed into a RAM drive. The decompression is transparent and on-the-fly.'
+badges="info:GNU/Linux"
+labels="warning:contrib:This software may depend on or recommend non-free software."
+website="https://www.knopper.net/knoppix/index-en.html"
+source="https://www.knopper.net/knoppix-info/index-en.html"
+%}
+
+{% include cardv2.html
+title="Puppy Linux"
+image="/assets/img/tools/Puppy-Linux.png"
+description='Puppy Linux operating system is a lightweight Linux distribution that focuses on ease of use and minimal memory footprint. The entire system can be run from RAM with current versions generally taking up about 210 MB, allowing the boot medium to be removed after the operating system has started.'
+badges="info:GNU/Linux"
+labels="warning:contrib:This software may depend on or recommend non-free software."
+website="http://puppylinux.org/"
+source="http://distro.ibiblio.org/puppylinux/"
+%}
+
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li>
+  <li><a href="https://distro.ibiblio.org/tinycorelinux/">Tiny Core Linux</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality
-    <a href="https://getfedora.org/">Fedora Workstation</a>
+    provided by extensions.</li>
-    <span class="badge badge-info">GNU/Linux</span>
-    - 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, using GNOME as the default desktop environment.
-  </li>
-  <li>
-    <a href="https://debian.org/">Debian</a>
-    <span class="badge badge-info">GNU/Linux</span>
-    - 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.
-  </li>
 </ul>

_includes/sections/mobile-operating-systems.html

@@ -1,14 +1,13 @@
 <h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> Mobile 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>
+  <strong>Even though the source code of the following OS is provided, installing Google Apps may compromise your setup.</strong>
 </div>
 
 {% include cardv2.html
 title="GrapheneOS"
-image="/assets/img/svg/3rd-party/grapheneos.svg"
+image="/assets/img/tools/GrapheneOS.png"
-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.'
-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"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://grapheneos.org/"
@@ -17,7 +16,7 @@ github="https://github.com/GrapheneOS/"
 
 {% include cardv2.html
 title="LineageOS"
-image="/assets/img/svg/3rd-party/lineageos.svg"
+image="/assets/img/tools/LineageOS.png"
 description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.'
 badges="info:AOSP"
 labels="warning:contrib:This software may depend on or recommend non-free software."
@@ -27,7 +26,7 @@ github="https://github.com/LineageOS"
 
 {% include cardv2.html
 title="Ubuntu Touch"
-image="/assets/img/svg/3rd-party/ubuntu.svg"
+image="/assets/img/tools/Ubuntu-Touch.png"
 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:GNU/Linux"
 labels="warning:contrib:This software may depend on or recommend non-free software."
@@ -39,6 +38,6 @@ github="https://github.com/ubports"
 
 <ul>
   <li><a href="https://www.replicant.us/">Replicant</a> <span class="badge badge-info">AOSP</span> - An open-source operating system based on Android, aiming to replace all proprietary components with free software.</li>
-  <li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free-software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
+  <li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
   <li><a href="https://microg.org/">MicroG</a> <span class="badge badge-info">Add-on Package</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - 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>

_includes/sections/notebooks.html

@@ -1,54 +1,48 @@
 <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>
+  <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"
+image="/assets/img/tools/Joplin.png"
-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."
+description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
 website="https://joplinapp.org/"
 github="https://github.com/laurent22/joplin"
-windows="https://joplinapp.org/#desktop-applications"
+windows=""
-mac="https://joplinapp.org/#desktop-applications"
+mac=""
-linux="https://joplinapp.org/#desktop-applications"
+linux=""
-freebsd="https://www.npmjs.com/package/joplin"
+ios=""
-googleplay="https://joplinapp.org/images/BadgeAndroid.png"
+android=""
-android="https://joplinapp.org/#mobile-applications"
+firefox=""
-ios="https://itunes.apple.com/us/app/joplin/id1315599797"
+chrome=""
-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"
+image="/assets/img/tools/StandardNotes.png"
-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>.'
+description="Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors."
 website="https://standardnotes.org/"
 github="https://github.com/standardnotes"
-windows="https://standardnotes.org/#get-started"
+windows=""
-mac="https://standardnotes.org/#get-started"
+mac=""
-linux="https://standardnotes.org/#get-started"
+linux=""
-ios="https://itunes.apple.com/us/app/standard-notes/id1285392450"
+ios=""
-fdroid="https://f-droid.org/packages/com.standardnotes/"
+android=""
-googleplay="https://play.google.com/store/apps/details?id=com.standardnotes"
+web=""
-web="https://app.standardnotes.org/"
 %}
 
 {% include cardv2.html
 title="Turtl"
-image="/assets/img/svg/3rd-party/turtl.svg"
+image="/assets/img/tools/Turtl.png"
 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/"
 github="https://github.com/turtl"
-windows="https://turtlapp.com/download/"
+windows=""
-mac="https://turtlapp.com/download/"
+mac=""
-linux="https://turtlapp.com/download/"
+linux=""
-googleplay="https://play.google.com/store/apps/details?id=com.lyonbros.turtl"
+android=""
-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>
@@ -60,6 +54,7 @@ chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheih
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://paperwork.cloud/">Paperwork</a> - An open-source and self-hosted solution. For PHP / MySQL servers.</li>
+  <li><a href="https://github.com/notable/notable">Notable</a> - The markdown-based note-taking app that doesn't suck.</li>
+  <li><a href="https://paperwork.cloud/">Paperwork</a> - 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>

_includes/sections/operating-systems.html

@@ -1,12 +1,12 @@
 <h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> PC Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using an operating system like Windows 10, you should pick an alternative here.</strong>
+  <strong>If you are currently using a operating system like Windows 10, you should pick an alternative here.</strong>
 </div>
 
 {% include cardv2.html
 title="Qubes OS"
-image="/assets/img/svg/3rd-party/qubes_os.svg"
+image="/assets/img/tools/Qubes-OS.png"
 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"
 labels="warning:contrib:This software may depend on or recommend non-free software."
@@ -17,7 +17,7 @@ tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
 
 {% include cardv2.html
 title="Fedora Workstation"
-image="/assets/img/svg/3rd-party/fedora.svg"
+image="/assets/img/tools/Fedora.png"
 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, using GNOME as the default desktop environment.'
 badges="info:GNU/Linux"
 labels="warning:contrib:This software may depend on or recommend non-free software."
@@ -27,14 +27,47 @@ git="https://src.fedoraproject.org/"
 
 {% include cardv2.html
 title="Debian"
-image="/assets/img/svg/3rd-party/debian.svg"
+image="/assets/img/tools/Debian.png"
 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:GNU/Linux"
 website="https://www.debian.org/"
+git="https://salsa.debian.org/qa/debsources"
 tor="http://sejnfjrq6szgca7v.onion"
-gitlab="https://salsa.debian.org/qa/debsources"
 %}
 
+<h3>Warning</h3>
+
+<ul>
+  <li><a href="#win10"><i class="fas fa-link"></i> Don't use Windows 10 - It's a privacy nightmare</a></li>
+</ul>
+
+<h4 id="cpuvulns">Remember to check CPU vulnerability mitigations</h4>
+
+<p><em><a href="https://support.microsoft.com/en-us/help/4073757/protect-windows-devices-from-speculative-execution-side-channel-attack">This also affects Windows 10</a>, but it doesn't expose this information or mitigation instructions as easily. MacOS users check <a href="https://support.apple.com/en-us/HT210108">How to enable full mitigation for Microarchitectural Data Sampling (MDS) vulnerabilities on Apple Support</a>.</em></p>
+
+<p>When running a enough recent kernel, you can check the CPU vulnerabilities it detects by <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code>. By using <code>tail -n +1</code> instead of <code>cat</code>, the file names are also visible.</p>
+
+<p>
+    In case you have an Intel CPU, you may notice "SMT vulnerable" display after running the <code>tail</code> command. To mitigate this, disable <a href="https://en.wikipedia.org/wiki/Hyper-threading">hyper-threading</a> from the UEFI/BIOS. You can also take the following mitigation steps below if your system/distribution uses GRUB and supports <code>/etc/default/grub.d/</code>:
+</p>
+
+<ol>
+  <li><code>sudo mkdir /etc/default/grub.d/</code> to create a directory for additional grub configuration</li>
+  <li><code>echo GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT mds=full,nosmt" | sudo tee /etc/default/grub.d/mds.conf</code> to create a new grub config file source with the echoed content</li>
+  <li><code>sudo grub-mkconfig -o /boot/grub/grub.cfg</code> to generate a new grub config file including this new kernel boot flag</li>
+  <li><code>sudo reboot</code> to reboot</li>
+  <li>after the reboot, check <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code> again to see that MDS now says "SMT disabled."</li>
+</ol>
+
+<h5>Further reading</h5>
+
+<ul>
+  <li><a href="https://cpu.fail/">CPU.fail</a></li>
+  <li><a href="https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html">MDS - Microarchitectural Data Sampling on The Linux kernel user's and administrator's guide</a></li>
+  <li><a href="https://mdsattacks.com/">RIDL and Fallout: MDS attacks on mdsattacks.com</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Simultaneous_multithreading">Simultaneous multithreading on Wikipedia</a></li>
+</ul>
+
 <h3>Worth Mentioning</h3>
 
 <ul>

_includes/sections/participate.html

@@ -2,13 +2,13 @@
   <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 rel="me" href="https://social.privacytools.io/@privacytools">our own Mastodon instance</a> or on <a href="https://chat.privacytools.io">Matrix</a> at <code class="highlighter-rouge">#general:privacytools.io</code>.</p>
+<p>It's important for a website like privacytools.io 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 rel="me" href="https://social.privacytools.io/@privacytools">our own Mastodon instance</a> or on <a href="https://chat.privacytools.io">Matrix</a> at <code class="highlighter-rouge">#general:privacytools.io</code>.</p>
 
 <div class="row">
 
   {% include card.html color="success"
   title="Discourse & Reddit"
-  image="/assets/img/svg/3rd-party/discourse.svg"
+  image="/assets/img/icons/discourse.png"
   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>'
@@ -17,7 +17,7 @@
 
   {% include card.html color="primary"
   title="Follow on Mastodon & Twitter"
-  image="/assets/img/svg/3rd-party/mastodon.svg"
+  image="/assets/img/icons/mastodon.png"
   url="https://social.privacytools.io/"
   website="Mastodon"
   extra_button='<a class="btn btn-primary mb-1" href="https://twitter.com/privacytoolsIO">Twitter</a>'
@@ -26,7 +26,7 @@
 
   {% include card.html color="warning"
   title="Develop on GitHub"
-  font="fab fa-github"
+  image="/assets/img/icons/github.png"
   url="https://github.com/privacytoolsIO/privacytools.io"
   website="GitHub"
   description="The complete website source code is available on GitHub. Join our developer team!"

_includes/sections/password-managers.html

@@ -7,71 +7,54 @@
 {%
   include cardv2.html
   title="Bitwarden - Cloud/Self-host"
-  image="/assets/img/svg/3rd-party/bitwarden.svg"
+  image="/assets/img/tools/bitwarden.png"
-  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."
+  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/"
   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://vault.bitwarden.com/download/?app=desktop&platform=linux"
-  linux="https://bitwarden.com/#download"
+  mac="https://vault.bitwarden.com/download/?app=desktop&platform=macos"
-  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/"
+  android="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
-  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"
+  image="/assets/img/tools/keepassxc.png"
   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/"
   forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
   github="https://github.com/keepassxreboot/keepassxc"
-  windows="https://keepassxc.org/download/#windows"
+  web="https://keepassxc.org/"
   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"
+  image="/assets/img/tools/LessPass.png"
-  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."
+  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/"
   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"
+  android="https://play.google.com/store/apps/details?id=com.lesspass.android&hl=en"
-  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.
+    <a href="https://masterpassword.app">Master Password</a> - Master Password is 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>
@@ -81,7 +64,10 @@
   <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>
+</ul>
-    <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>
+<h3>Related Information</h3>
+
+<ul>
+  <li><a href="https://peertube.mastodon.host/videos/watch/4cdedd90-a5b4-4022-b93d-828e85ed58cd">Edward Snowden on Passwords on Peertube</a></li>
 </ul>

_includes/sections/paste-services.html

@@ -2,8 +2,8 @@
 
 {% include cardv2.html
 title="PrivateBin"
-image="/assets/img/svg/3rd-party/privatebin.svg"
+image="/assets/img/tools/PrivateBin.png"
-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."
+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 256bit 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"
@@ -12,8 +12,8 @@ github="https://github.com/PrivateBin/PrivateBin"
 
 {% include cardv2.html
 title="CryptPad"
-image="/assets/img/svg/3rd-party/cryptpad.svg"
+image="/assets/img/provider/CryptPad.png"
-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."
+description="CryptPad is an open source, zero knowledge, realtime collaborative editor. Data is encrypted/decrypted in the browser using 256bit AES."
 website="https://cryptpad.fr/pad/"
 forum="https://forum.privacytools.io/t/discussion-cryptpad/1270"
 github="https://github.com/xwiki-labs/cryptpad"

_includes/sections/privacy-resources.html

@@ -16,7 +16,7 @@
 <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://keybase.io/"><strong>Keybase.io</strong></a> - Get a public key, safely, starting just with someone's social media username.</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>

_includes/sections/productivity-tools.html

@@ -1,84 +1,43 @@
 <h1 id="productivity" class="anchor"><a href="#productivity"><i class="fas fa-link anchor-icon"></i></a> Productivity Tools</h1>
 
-{%
+<div class="row mb-2">
-  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/"
-  forum="https://forum.privacytools.io/t/discussion-cryptpad-productivity-tools/1537"
-  github="https://github.com/xwiki-labs/cryptpad"
-  web="https://cryptpad.fr/"
-%}
 
-{%
+  {% include card.html color="success"
-  include cardv2.html
+    title="CryptPad"
+    image="/assets/img/provider/CryptPad.png"
+
+    description="CryptPad 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."
+
+    url="https://cryptpad.fr/"
+    footer='OS: Linux, macOS, Windows, Web.'
+  %}
+
+  {% include card.html color="primary"
   title="Etherpad"
-  image="/assets/img/svg/3rd-party/etherpad.svg"
+  image="/assets/img/tools/Etherpad.png"
-  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>."
+  url="https://etherpad.org/"
-  website="https://etherpad.org/"
+  footer="OS: Windows, macOS, Linux."
-  forum="https://forum.privacytools.io/t/discussion-etherpad-productivity-tools/1538"
+  description="Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc. <a href=https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad>Sites That Run Etherpad</a>"
-  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 card.html color="warning"
-  include cardv2.html
   title="Write.as"
-  image="/assets/img/svg/3rd-party/writeas.svg"
+  image="/assets/img/tools/WriteAs.png"
-  image-dark="/assets/img/svg/3rd-party/writeas-dark.svg"
+  url="https://write.as/"
-  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/"
-  forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539"
   tor="http://writeas7pm7rcdqg.onion"
-  git="https://code.as/writeas"
+  footer="OS: Windows, macOS, Linux, Android, iOS, Chrome OS, Web."
-  web="https://write.as/pad"
+  description="Write.as 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."
-  windows="https://github.com/writeas/writeas-cli"
+  %}
-  mac="https://github.com/writeas/writeas-cli"
+
-  linux="https://write.as/apps"
+</div>
-  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://disroot.org/">disroot.org</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://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, which is free and OpenSource. 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://www.libreoffice.org/">LibreOffice</a> - Free and open-source office suite.</li>
+  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Visual Studio Code editor without Microsoft's tracking </li>
-  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of 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>
-
-<div class="row mb-2">
-{%
-  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/"
-%}
-</div>

_includes/sections/quotes.html

@@ -2,7 +2,7 @@
   <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>
+  <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/layout/Glenn-Greenwald-Why-privacy-matters.jpg" width="177" height="200" 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>
@@ -14,16 +14,6 @@
    <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>
@@ -35,8 +25,8 @@
 <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>
+  <p>Arguing that you don't care about the right to privacy because you have nothing to hide is no different than saying you don't care about free speech because you have nothing to say.</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>
+  <footer class="blockquote-footer">Edward Snowden on <cite title="Just days left to kill mass surveillance under Section 215 of the Patriot Act. We are Edward Snowden and the ACLU's Jameel Jaffer. AUA."><a href="https://www.reddit.com/r/IAmA/comments/36ru89/just_days_left_to_kill_mass_surveillance_under/crglgh2">Reddit</a></cite></footer>
 </blockquote>
 
 <blockquote class="blockquote">

_includes/sections/resources.html

@@ -33,15 +33,15 @@
   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."
+  description="Find out how your operating system is comprimising your privacy, and what simple alternatives exist."
   %}
 
   {% include card.html color="secondary"
-  title="PrivacyTools Services"
+  title="privacytoolsIO 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!"
+  description="The privacytools.io 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"

_includes/sections/router-firmware.html

@@ -2,19 +2,18 @@
 
 {% include cardv2.html
 title="OpenWrt"
-image="/assets/img/svg/3rd-party/openwrt.svg"
+image="/assets/img/tools/OpenWrt.png"
-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"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://openwrt.org/"
 git="https://git.openwrt.org/"
+github="https://github.com/openwrt"
 %}
 
 {% include cardv2.html
 title="pfSense"
-image="/assets/img/svg/3rd-party/pfsense.svg"
+image="/assets/img/tools/pfSense.png"
-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"
 labels="warning:contrib:This software may depend on or recommend non-free software."
@@ -24,8 +23,7 @@ github="https://github.com/pfsense/"
 
 {% include cardv2.html
 title="LibreCMC"
-image="/assets/img/svg/3rd-party/librecmc.svg"
+image="/assets/img/tools/LibreCMC.png"
-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"
@@ -36,5 +34,5 @@ git="https://gogs.librecmc.org/libreCMC/libreCMC"
 
 <ul>
   <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
-  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A Linux-based open-source firmware compatible with several models of routers and access points.</li>
+  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
 </ul>

_includes/sections/search-engines.html

@@ -1,23 +1,31 @@
 <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>
+  <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 - Decentral"
-image="/assets/img/svg/3rd-party/searx.svg"
+image="/assets/img/provider/searx.png"
-description='searx is an <a href="https://github.com/asciimoo/searx">open-source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. 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>.'
+description='An <a href="https://github.com/asciimoo/searx">open source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">List of Instances</a> or try <a href="https://search.privacytools.io/">search.privacytools.io</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="StartPage - Netherlands"
+image="/assets/img/provider/StartPage.png"
+description="Google search results, with complete privacy protection. Behind StartPage is a European company that has been obsessive about privacy since 2006."
+website="https://www.startpage.com/"
+forum="https://forum.privacytools.io/t/discussion-startpage/284"
+%}
+
 {% include cardv2.html
 title="DuckDuckGo - USA"
-image="/assets/img/svg/3rd-party/duckduckgo.svg"
+image="/assets/img/provider/DuckDuckGo.png"
-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>'
+description='The 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/"
 tor="http://3g2upl4pq6kufc4m.onion"
 forum="https://forum.privacytools.io/t/discussion-duckduckgo/285"
@@ -26,8 +34,8 @@ github="https://github.com/duckduckgo"
 
 {% include cardv2.html
 title="Qwant - France"
-image="/assets/img/svg/3rd-party/qwant.svg"
+image="/assets/img/provider/Qwant.png"
-description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013.'
+description='Qwants philosophy is based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013. <a href="https://www.qwant.com/privacy">Privacy Policy.</a>'
 website="https://www.qwant.com/"
 forum="https://forum.privacytools.io/t/discussion-qwant/286"
 github="https://github.com/Qwant/"
@@ -46,8 +54,8 @@ github="https://github.com/Qwant/"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://yacy.net/">YaCy</a> - A free-software P2P search engine powered by its users.</li>
+  <li><a href="https://yacy.net/">YaCy</a> - A free software P2P search engine powered by its users.</a></li>
-  <li><a href="https://jivesearch.com/">Jive Search</a> - A free-software search engine with a similar look and feel to Google.</li>
+  <li><a href="https://jivesearch.com/">Jive Search</a> - A free software search engine with a similar look and feel to Google.</a></li>
-  <li><a href="https://metager.de/en/">MetaGer</a> - An open-source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>
+  <li><a href="https://metager.de/en/">MetaGer</a> - An open source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>
   <li><a href="https://www.mojeek.com/">Mojeek</a> - Independent and unbiased search results with no user tracking.</li>
 </ul>

_includes/sections/self-contained-networks.html

@@ -4,72 +4,50 @@
   <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
+<div class="row mb-2">
-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
+  {% include card.html color="success"
-title="I2P Anonymous Network"
+  title="Tor"
-image="/assets/img/svg/3rd-party/i2p.svg"
+  image="/assets/img/tools/Tor-Project.png"
-image-dark="/assets/img/svg/3rd-party/i2p-dark.svg"
+  url="https://www.torproject.org/"
-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."
+  tor="http://expyuzz4wqqyqhjn.onion"
-website="https://geti2p.net/"
+  footer='OS: Windows, macOS, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, Android (<a href="https://www.torproject.org/download/#android">Tor Browser</a>, <a href="https://guardianproject.info/apps/orbot/">Proxy other apps with Orbot</a>), <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a>'
-forum="https://forum.privacytools.io/t/discussion-i2p/1590"
+  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."
-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
+  {% include card.html color="primary"
-title="The Freenet Project"
+  title="I2P Anonymous Network"
-image="/assets/img/svg/3rd-party/freenet.svg"
+  image="/assets/img/tools/I2P.png"
-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."
+  url="https://geti2p.net/"
-website="https://freenetproject.org/"
+  footer="OS: Windows, macOS, Linux, Android, BSD / Solaris."
-forum="https://forum.privacytools.io/t/discussion-freenet/1591"
+  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
-windows="https://freenetproject.org/pages/download.html#windows"
+  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."
-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"
+  {% include card.html color="warning"
-openbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
+  title="The Freenet Project"
-netbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
+  image="/assets/img/tools/Freenet.png"
-github="https://github.com/freenet/"
+  url="https://freenetproject.org/"
-%}
+  footer="OS: Windows, macOS, Linux."
+  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."
+  %}
+
+</div>
+
+<h3>Related Information</h3>
+
+<ul>
+  <li><a href="https://darknetdiaries.com/">darknetdiaries.com</a> - True stories from the dark side of the Internet.</li>
+</ul>
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://zeronet.io/">ZeroNet</a> - Open, free, and uncensorable websites, using Bitcoin cryptography and BitTorrent network. <span class="badge badge-danger" data-toggle="tooltip" title="Your IP address isn't hidden by default and won't be, unless you enforce Tor usage.">privacy warning <span class="far fa-question-circle"></span></span></li>
+  <li><a href="https://zeronet.io/">ZeroNet</a> - Open, free and uncensorable websites, using Bitcoin cryptography and BitTorrent network.</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://retroshare.cc/">RetroShare</a> - Open Source cross-platform, Friend-2-Friend and secure 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). <a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">
+  <li><a href="https://ipfs.io/">IPFS</a> - A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. (<a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">important privacy warning</a>)</li>
-    <span class="badge badge-danger" data-toggle="tooltip" title="">
+  <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. <span class="badge badge-warning" data-toggle="tooltip" title="The project is currently in early stages but it is being actively developed.">experimental <i class=\"far fa-question-circle\"></i></span> <span class="badge badge-danger" data-toggle="tooltip" title="Yggdrasil doesn't have a goal of providing anonymity and your peers know your IP address unless you are only using Tor/I2P peers.">privacy warning <i class="far fa-question-circle"></i></span></li>
-    <span class="fas fa-exclamation-triangle"></span>
-        Important privacy warning
-      </span>
-          </a></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. <span class="badge badge-warning" data-toggle="tooltip" title="The project is currently in early stages but it is being actively developed.">experimental <i class=\"far fa-question-circle\"></i></span> <span class="badge badge-danger" data-toggle="tooltip" title="Yggdrasil doesn't have a goal of providing anonymity and your peers know your IP address unless you are only using Tor/I2P peers.">privacy warning <i class="far fa-question-circle"></i></span></li>
 </ul>

_includes/sections/selfhosted-cloud.html

@@ -4,39 +4,37 @@
   <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
+<div class="row mb-2">
-title="Nextcloud"
-image="/assets/img/svg/3rd-party/nextcloud.svg"
-description="<strong>Nextcloud</strong> is a suite of client-server software for creating your own file hosting services on a private server you control. Nextcloud is free and open-source, and supports end-to-end encryption with many of its clients. 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/"
-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?mt=8"
-github="https://github.com/nextcloud"
-%}
 
-{% include cardv2.html
+  {% include card.html color="success"
-title="Tahoe-LAFS"
+  title="Pydio"
-image="/assets/img/svg/3rd-party/tahoe-lafs.svg"
+  image="/assets/img/tools/Pydio.png"
-image-dark="/assets/img/svg/3rd-party/tahoe-lafs-dark.svg"
+  url="https://pydio.com/"
-website="https://www.tahoe-lafs.org/"
+  footer="OS: Windows, macOS, Linux, iOS, Android."
-forum="https://forum.privacytools.io/t/discussion-tahoe-lafs/1662"
+  description="Pydio is open source software that turns instantly any server (on-premise, NAS, cloud IaaS or PaaS) into a file sharing platform for your company. It is an alternative
-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."
+  to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs."
-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"
+  {% include card.html color="primary"
-netbsd="http://pkgsrc.se/filesystems/tahoe-lafs"
+  title="Tahoe-LAFS"
-git="https://www.tahoe-lafs.org/trac/tahoe-lafs/browser"
+  image="/assets/img/tools/Tahoe-LAFS.png"
-%}
+  url="https://www.tahoe-lafs.org/"
+  footer="OS: Windows, macOS, Linux."
+  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."
+  %}
+
+  {% include card.html color="warning"
+  title="Nextcloud"
+  image="/assets/img/provider/Nextcloud.png"
+  url="https://nextcloud.com/"
+  footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
+  description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients."
+  %}
+
+</div>
 
 <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>
+  <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - End-to-end encrypted real time collaboration sharing folders, media, and documents (open-source).</li>
 </ul>

_includes/sections/social-networks.html

@@ -1,82 +1,86 @@
 <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>
+  <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"
+image="/assets/img/tools/Mastodon.png"
-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>'
+description='Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like e-mail. It also has the most users, and the most diverse (in terms of interests) users, looks good, and is easy to setup. Feel 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"
+android=""
-mac="https://joinmastodon.org/apps"
+ios=""
-linux="https://joinmastodon.org/apps"
+web=""
-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"
+image="/assets/img/tools/diaspora.png"
-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."
+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"
+android=""
-web="https://diasporafoundation.org/"
+web=""
 %}
 
 {% include cardv2.html
 title="Friendica - Facebook Alternative"
-image="/assets/img/svg/3rd-party/friendica.svg"
+image="/assets/img/tools/Friendica.png"
 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/"
+windows=""
-linux="https://friendi.ca/resources/mobile-clients/"
+linux=""
-android="https://friendi.ca/resources/mobile-clients/"
+android=""
-sailfish="https://friendi.ca/resources/mobile-clients/"
+web=""
-web="https://friendi.ca/"
 %}
 
 {% include cardv2.html
 title="PixelFed - Instagram Alternative"
-image="/assets/img/svg/3rd-party/pixelfed.svg"
+image="/assets/img/provider/pixelfed.png"
-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>'
+description='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 one.</a>'
-website="https://pixelfed.org/"
+website="https://pixelfed.social/"
 forum="https://forum.privacytools.io/t/discussion-pixelfed/293"
 github="https://github.com/pixelfed"
-web="https://pixelfed.org/"
+web=""
 %}
 
 {% include cardv2.html
-title="Pleroma - Twitter Alternative"
+title="GNU social - Twitter Alternative"
-image="/assets/img/svg/3rd-party/pleroma.svg"
+image="/assets/img/provider/gnu-social.png"
-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."
+description="A social communication software for both public and private communications. It is widely supported and has a large userbase. It is already used by the Free Software Foundation."
-website="https://pleroma.social"
+website="https://gnu.io/social/"
-forum="https://forum.privacytools.io/t/discussion-pleroma/2307"
+forum="https://forum.privacytools.io/t/discussion-gnu-social/292"
-gitlab="https://git.pleroma.social/pleroma/pleroma/"
+github="https://github.com/foocorp/gnu-social"
-windows="https://docs-develop.pleroma.social/backend/clients/#desktop"
+android=""
-mac="https://docs-develop.pleroma.social/backend/clients/#desktop"
+ios=""
-linux="https://docs-develop.pleroma.social/backend/clients/#desktop"
+linux=""
-android="https://docs-develop.pleroma.social/backend/clients/#handheld"
+windows=""
-fdroid="https://docs-develop.pleroma.social/backend/clients/#handheld"
+web=""
-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://www.minds.com/">Minds</a> - An <a href="https://gitlab.com/minds">open-source</a> and distributed social networking service, integrating the blockchain to reward the community.</li>
+  <li><a href="https://www.minds.com/">Minds</a> - An <a href="https://gitlab.com/minds">open source</a> and distributed social networking service, integrating the blockchain to reward the community.</li>
-  <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>
+  <li><a href="https://movim.eu/">Movim</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>
+
+<h3>Related Information</h3>
+<ul>
+  <li><a href="https://addons.mozilla.org/firefox/addon/mastodon-simplified-federation/">Mastodon: Simplified Federation</a> - Firefox Extension to improve usability for remote Mastodon instances.</li>
+  <li><a href="https://justdeleteme.xyz/">JustDeleteMe</a> - A directory of direct links to delete your account from web services.</li>
+  <li><a href="https://forget.codl.fr/">Forget</a> - A service that automatically deletes your old posts on Twitter and Mastodon that everyone has forgotten about.</li>
+</ul>
+
+<h3>Facebook Related</h3>
+<ul>
+  <li><a href="https://www.facebook.com/help/delete_account">Delete your Facebook account</a> - Direct link to delete your Facebook account without being able to reactivate it again.</li>
+  <li><a href="https://deletefacebook.com/">How To Permanently Delete A Facebook Account</a> - This guide will take you through a smooth and successful Facebook account deletion.</li>
+  <li><a href="https://addons.mozilla.org/firefox/addon/facebook-container/">Facebook Container by Mozilla</a> - Prevent Facebook from tracking you around the web.</li>
+  <li><a href="https://www.stopusingfacebook.co/">Stop using Facebook</a> - A curated list of reasons to stop using Facebook and how to do it.</li>
 </ul>

_includes/sections/social-news-aggregator.html

@@ -6,40 +6,52 @@
 
 {% include cardv2.html
 title="Aether"
-image="/assets/img/svg/3rd-party/aether.svg"
+image="/assets/img/tools/aether.png"
-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.'
+description='<a href="https://github.com/nehbit/aether/blob/master/LICENSE.md">Free/libre and open source</a> decentralized social news aggregator with a built in voting system.'
-website="https://getaether.net/"
+website="https://github.com/nehbit/aether"
 forum="https://forum.privacytools.io/t/discussion-aether/1256"
 github="https://github.com/nehbit/aether"
-windows="https://getaether.net/download/"
+windows=""
-mac="https://getaether.net/download/"
+mac=""
-linux="https://getaether.net/download/"
+linux=""
+android=""
+ios=""
+bsd=""
 %}
 
 {% include cardv2.html
 title="Tildes"
-image="/assets/img/svg/3rd-party/tildes.svg"
+image="/assets/img/tools/tildes.png"
 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">GPL 3.0</a>.'
 website="https://tildes.net"
 forum="https://forum.privacytools.io/t/discussion-tildes/1257"
-gitlab="https://gitlab.com/tildes/tildes"
+git="https://gitlab.com/tildes/"
-web="https://tildes.net"
+windows=""
+mac=""
+linux=""
+android=""
+ios=""
+bsd=""
 %}
 
 {% include cardv2.html
 title="Raddle"
-image="/assets/img/png/3rd-party/raddle.png"
+image="/assets/img/tools/raddle.png"
 description="Raddle is a public Postmill instance focused on privacy and anti-censorship."
 website="https://raddle.me"
 forum="https://forum.privacytools.io/t/discussion-raddle/1258"
-gitlab="https://gitlab.com/postmill/"
+git="https://gitlab.com/postmill/"
-web="https://raddle.me"
+windows=""
+mac=""
+linux=""
+android=""
+ios=""
 %}
 
 <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://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>
+  <li><a href="https://notabug.io/">notabug.io</a> - notabug.io is 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>

_includes/sections/teamchat.html

@@ -1,61 +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>
+        <strong>If your project or organization currently uses a platform like <a href="https://web.archive.org/web/20171029114027/https://feedback.discordapp.com/forums/326712-discord-dream-land/suggestions/17094256-implement-whispersystems-encryption-for-voice-and">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="Matrix"
-  image="/assets/img/svg/3rd-party/matrix.svg"
-  image-dark="/assets/img/svg/3rd-party/matrix-dark.svg"
-  description='<a href="https://matrix.org/docs/guides/introduction">Matrix</a> is an open-source project that publishes the <a href="https://matrix.org/docs/spec">Matrix open standard</a> for secure, decentralized, real-time communication.<br />
-  <a href="https://en.wikipedia.org/wiki/Riot.im">Riot.im</a> is the popular reference client produced by the Matrix.org team. It offers optional E2EE for 1:1 and group conversations that <strong>must</strong> be turned on by the user. (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security &amp; Privacy → Encrypted). In the future it will be <a href="https://github.com/vector-im/riot-web/issues/6779">on by default.</a>'
-  website="https://about.riot.im/"
-  forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
-  github="https://github.com/vector-im/riot-web/"
-  windows="https://riot.im/download/desktop/"
-  mac="https://riot.im/download/desktop/"
-  linux="https://riot.im/download/desktop/"
-  fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
-  googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
-  ios="https://itunes.apple.com/app/vector.im/id1083446067"
-  web="https://riot.im/app/"
-%}
-
 {%
   include cardv2.html
   title="Rocket.chat"
-  image="/assets/img/svg/3rd-party/rocketchat.svg"
+  image="/assets/img/tools/rocket.chat.png"
   description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
-  labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental E2EE</a>: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."
+  labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental</a>: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. The federation was also added afterwards potentially causing room for mistakes."
   website="https://rocket.chat/"
   forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
   github="https://github.com/rocketchat/"
-  windows="https://rocket.chat/install"
+  android=""
-  mac="https://itunes.apple.com/us/app/rocket-chat/id1086818840"
+  ios=""
-  linux="https://rocket.chat/install"
+  mac=""
-  fdroid="https://f-droid.org/packages/chat.rocket.android"
+  windows=""
-  googleplay="https://play.google.com/store/apps/details?id=chat.rocket.android"
+  linux=""
-  ios="https://itunes.apple.com/app/rocket-chat/id1148741252"
 %}
 
 {%
   include cardv2.html
   title="Keybase"
-  image="/assets/img/svg/3rd-party/keybase.svg"
+  image="/assets/img/tools/keybase.png"
-  description='Keybase provides a hosted team chat with E2EE. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase can help you prove you own social media accounts through the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
+  description='Keybase provides a hosted team chat with end-to-end encryption. It has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>.'
-  labels="warning:<a href=github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
+  labels="warning:<a href=//github.com/keybase/client/issues/6374>Warning</a>:The server side of Keybase runs on proprietary code and is centralized."
   website="https://keybase.io/"
   forum="https://forum.privacytools.io/t/discussion-keybase/1224"
   tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
   github="https://github.com/Keybase"
-  windows="https://keybase.io/docs/the_app/install_windows"
+  android=""
-  mac="https://keybase.io/docs/the_app/install_macos"
+  ios=""
-  linux="https://keybase.io/docs/the_app/install_linux"
+  mac=""
-  freebsd="https://www.freshports.org/security/keybase/"
+  windows=""
-  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage"
+  linux=""
-  ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770"
+  web=""
-  firefox="https://addons.mozilla.org/firefox/addon/keybase-for-firefox/"
-  chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
 %}
+
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">Wire Pro</a> - Paid team communication with E2EE. <span class="badge badge-warning" data-toggle="tooltip" title="While the free edition of Wire is a recommended platform, we have not tested the Pro edition.">Untested <i class="far fa-question-circle"></i></span></li>
+</ul>

_includes/sections/voice-video-messenger.html

@@ -6,37 +6,35 @@
 
 {% include cardv2.html
 title="Linphone"
-image="/assets/img/svg/3rd-party/linphone.svg"
+image="/assets/img/tools/Linphone.png"
 website="https://www.linphone.org/"
-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."
+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"
+ios=""
-linux="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+android=""
-mac="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+windows=""
-fdroid="https://f-droid.org/packages/org.linphone"
+linux=""
-googleplay="https://play.google.com/store/apps/details?id=org.linphone"
+mac=""
-ios="https://itunes.apple.com/us/app/linphone/id360065638?mt=8"
+web=""
 %}
 
 {% include cardv2.html
 title="Mumble"
-image="/assets/img/svg/3rd-party/mumble.svg"
+image="/assets/img/tools/Mumble.png"
 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."
+description="Mumble is an open source, low-latency, high quality voice chat software 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"
+windows=""
-linux="https://www.mumble.info/downloads"
+linux=""
-mac="https://www.mumble.info/downloads"
+mac=""
-android="https://www.mumble.info/downloads/#third-party-clients"
-ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1"
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://jitsi.org/">Jitsi Meet</a> - Jitsi Meet is a free and open-source multiplatform voice (VoIP), video conferencing, and instant messaging application. <span class="badge badge-warning" data-toggle="tooltip" title="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.">Requires WebRTC</span></li>
+  <li><a href="https://jitsi.org/">Jitsi Meet</a> - Jitsi Meet is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application. <span class="badge badge-warning" data-toggle="tooltip" title="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.">Requires WebRTC</span></li>
 </ul>
 
 <h3>Related Information</h3>

_includes/sections/vpn.html

@@ -1,102 +1,90 @@
-<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Recommended VPN Services</h1>
+<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Recommended VPN Service</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>
+  <strong>Our recommended provider is outside the US, uses encryption, accepts Bitcoin, supports OpenVPN, and has 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
+      <img src="/assets/img/provider/Mullvad.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Mullvad">
-        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>Mullvad <span class="badge badge-info">EUR €60/Year</span></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>
+    <p><strong>Mullvad</strong> is a fast and inexpensive VPN with a serious focus on transparency and security, they have been in operation since <strong>2009</strong>. It is the only VPN provider that currently meets our criteria for recommendation. Mullvad is based in <span class="flag-icon flag-icon-se"></span> Sweden and does not have a free trial. Visit <a href="https://mullvad.net/">mullvad.net</a> to create an account.</p>
-    <h5><span class="badge badge-success">35 Countries</span></h5>
+    <h5><span class="badge badge-success">409+ Servers</span></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>Mullvad has 409 servers in 38 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</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><span class="badge badge-success">WireGuard Support</span></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><span class="badge badge-success">Independently Audited</span></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>
-    <h5><span class="badge badge-success">Open Source Clients</span></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><span class="badge badge-success">Accepts Bitcoin</span></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><span class="badge badge-success">WireGuard Support</span></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><span class="badge badge-success">IPv6 Support</span></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><span class="badge badge-success">Remote Port Forwarding</span></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><span class="badge badge-warning">No Mobile Clients</span></h5>
     <p>While iOS and Android clients are reportedly in the works, mobile users will need to use a traditional OpenVPN client and configuration files, which are a bit more difficult to configure.</p>
     <h5><span class="badge badge-info">Extra Functionality</span></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>ProtonVPN <span class="badge badge-info">Free</span> <span class="badge badge-info">USD $96/year</span></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.</p>
-    <h5><span class="badge badge-success">44 Countries</span></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><span class="badge badge-success">Independently Audited</span></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><span class="badge badge-success">Open Source Clients</span></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><span class="badge badge-success">Accepts Bitcoin</span></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><span class="badge badge-success">Mobile Clients</span></h5>
-    <p>In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for iOS or Android allowing for easy connections to their servers.</p>
-    <h5><span class="badge badge-warning">No Port Forwarding</span></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><span class="badge badge-info">Extra Functionality</span></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>
-      IVPN
-      <span class="badge badge-info">Standard USD $60/Year</span>
-      <span class="badge badge-secondary">Pro USD $100/Year</span>
-    </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><span class="badge badge-success">32 Countries</span></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><span class="badge badge-success">Independently Audited</span></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><span class="badge badge-success">Open Source Clients</span></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><span class="badge badge-success">Accepts Bitcoin</span></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><span class="badge badge-success">Remote Port Forwarding</span></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><span class="badge badge-success">Mobile Clients</span></h5>
-    <p>In addition to providing standard OpenVPN configuration files, IVPN has mobile clients for iOS or Android allowing for easy connections to their servers.</p>
-    <h5><span class="badge badge-info">Extra Functionality</span></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>
+
+<h1 id="vpn" class="anchor"><a href="#worth-mentioning"><i class="fas fa-link anchor-icon"></i></a> Other Providers Worth Mentioning</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/provider/ProtonVPN.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="ProtonVPN">
+    </div>
+    <div class="col">
+    <h2>ProtonVPN <span class="badge badge-info">Free</span> <span class="badge badge-info">USD $96/year</span></h2>
+    <p><strong>ProtonVPN</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. Unfortunately due to its lack of an independent security audit it does not meet the complete criteria for recommendation, see our notes below.</p>
+    <h5><span class="badge badge-danger">Not Audited</span></h5>
+    <p>ProtonVPN has not undergone a security audit by an independent third party, and therefore cannot be strongly recommended at this time. We have still chosen to list it on this page with the assumption that an audit will be published soon:</p>
+    <blockquote class="blockquote">
+      <p class="mb-0">We are currently undergoing a complete security audit of our VPN applications by a reputable Swiss security company. The results of the audit will be summarized in a public report for cases like this.</p>
+      <footer class="blockquote-footer">Marc Loebekken, ProtonVPN AG Legal counsel</footer>
+    </blockquote>
+    <p>We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner.
+    <h5><span class="badge badge-success">442+ Servers</span></h5>
+    <p>ProtonVPN has 442 servers in 33 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</p>
+    <h5><span class="badge badge-success">Accepts Bitcoin</span></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><span class="badge badge-success">Mobile Clients</span></h5>
+    <p>In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for iOS or Android allowing for easy connections to their servers.</p>
+    <h5><span class="badge badge-info">Extra Functionality</span></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 the official Tor Browser 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/provider/IVPN.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="IVPN">
+    </div>
+    <div class="col">
+    <h2>IVPN <span class="badge badge-info">USD $100/Year</span></h2>
+    <p><strong>IVPN</strong> is another strong 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. Unfortunately due to its lack of an independent security audit it does not meet the complete criteria for recommendation, see our notes below.</p>
+    <h5><span class="badge badge-danger">No Security Audit</span></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. However, IVPN has not undergone a more comprehensive security audit by an independent third party, and therefore cannot be strongly recommended at this time. We have still chosen to list it on this page with the assumption that an audit will be published soon: The IVPN team <a href="https://twitter.com/yaelwrites/status/1161796418220089344">reportedly plans to begin the process in September</a>.</p>
+    <p>We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner.
+    <h5><span class="badge badge-success">70+ Servers</span></h5>
+    <p>IVPN has 70 servers in 29 countries at the time of writing this page. Typically the more servers a provider offers, the better. IVPN has a decent (but not exceptional) server count that will most likely provide adequate coverage to most users.</p>
+    <h5><span class="badge badge-success">Accepts Bitcoin</span></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><span class="badge badge-success">Mobile Clients</span></h5>
+    <p>In addition to providing standard OpenVPN configuration files, IVPN has mobile clients for iOS or Android allowing for easy connections to their servers.</p>
+    <h5><span class="badge badge-info">Extra Functionality</span></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 "AntiTracker" functionality, which blocks advertising networks and trackers from the network level.</p>
+    </div>
+  </div>
+
+</div>

_includes/sections/warrant-canary.html

@@ -1,6 +1,6 @@
 <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">
+<img src="/assets/img/layout/warrant-canary.jpg" width="450" height="236" class="img-fluid float-right" alt="Warrant Canary Example" style="margin-left:20px;">
 
 <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>
 

_includes/sections/windows10.html

@@ -4,7 +4,7 @@
   <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">
+<img src="/assets/img/layout/Windows-10-Privacy.png" width="367" height="369" class="img-fluid float-right" alt="Windows 10 Privacy" style="margin-left:10px;">
 
 <ol>
   <li><strong>Data syncing is by default enabled.</strong>
@@ -80,7 +80,7 @@
 <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://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement</a> - Microsoft collects, uses and discloses personal information as described here. This allows One Drive 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>
 
@@ -89,7 +89,7 @@
     <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://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>

_includes/sponsors/gold.html

@@ -1,10 +0,0 @@
-<div class="d-flex flex-wrap justify-content-center">
-  <a class="m-3" href="https://safing.io" target="_blank" rel="noreferrer">
-    <img
-      src="/assets/img/svg/3rd-party/sponsors/safing.svg"
-      data-theme-src="/assets/img/svg/3rd-party/sponsors/safing-dark.svg"
-      width="210rem"
-      title="Safing Privacy Network - Launching on Kickstarter January 2nd, 2020"
-      alt="Safing Privacy Network - Safing.io Logo" />
-  </a>
-</div>

_includes/team.html

@@ -1,51 +0,0 @@
-<div class="col-12 col-sm-6 col-lg-4 col-xl-3">
-  <div class="card mb-3 mx-4 mx-sm-0" itemscope itemtype="http://schema.org/Person">
-    <img src="{{ site.baseurl }}/assets/img/png/team/{{ include.avatar }}" class="card-img-top" itemprop="image" alt="{% if include.nick %}{{ include.nick }}{% else %}{{ include.name }}{% 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 %}
-
-      <meta itemprop="affiliation" content="PrivacyTools" />
-      <h6 class="card-subtitle mb-2 text-muted" itemprop="jobTitle">{{ include.role | default: "Contributor" }}</h6>
-      <p class="card-text" {% if include.bio %}itemprop="description"{% endif %}>{{ include.bio | default: "<i>Hmm, this user hasn't written a bio quite yet :(</i>" }}</p>
-      <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>

_layouts/page.html

@@ -2,8 +2,6 @@
 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 %}

_sass/_vars.scss

@@ -19,9 +19,8 @@ $share-btn-active:    #e2e2e2;
 $twitter:             #55acee;
 $mastodon:            #3088d4;
 $facebook:            #3b5998;
-$mix:                 #ff8126;
+$stumbleupon:         #eb4823;
 $reddit:              #ff5700;
 $linkedin:            #4875b4;
 $email:               #444;
 $diaspora:            #2f3537;
-$tor:                 #7d4698;

_sass/ptio-font.scss

@@ -1,60 +0,0 @@
-/*
-  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"; }

about/javascript/index.html

@@ -0,0 +1,27 @@
+<h3>JavaScript Licenses</h3>
+<table id="jslicense-labels1" border="1">
+  <tr>
+    <td><a href="/assets/js/main.js">main.js</a></td>
+    <td><a href="https://creativecommons.org/publicdomain/zero/1.0/legalcode">CC0-1.0-only</a></td>
+  </tr>
+  <tr>
+    <td><a href="/assets/js/redirects.js">redirects.js</a></td>
+    <td><a href="https://creativecommons.org/publicdomain/zero/1.0/legalcode">CC0-1.0-only</a></td>
+  </tr>
+  <tr>
+    <td><a href="/assets/js/bootstrap.min.js">bootstrap.min.js</a></td>
+    <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+  </tr>
+  <tr>
+    <td><a href="/assets/js/jquery-3.3.1.min.js">jquery-3.3.1.min.js</a></td>
+    <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+  </tr>
+  <tr>
+    <td><a href="/assets/js/popper.min.js">popper.min.js</a></td>
+    <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+  </tr>
+  <tr>
+    <td><a href="/assets/js/sortable.min.js">sortable.min.js</a></td>
+    <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+  </tr>
+</table>

assets/css/dark.scss

@@ -1,15 +1,13 @@
 ---
 ---
-@import '_vars';
+$dark-400: #181b21;
-
+$dark-300: #22262e;
-$dark-900: #181b21;
+$dark-200: #343a46;
-$dark-800: #22262e;
+$dark-100: #464f60;
-$dark-700: #343a46;
-$dark-600: #464f60;
 $light: #d8d8d8;
 $primary: #345e8e;
 $danger: #b63f4a;
-$secondary: $dark-600;
+$secondary: $dark-100;
 $success: #2c7f40;
 $warning: #c6a339;
 $info: #218899;
@@ -20,7 +18,7 @@ $info: #218899;
  */
 
 body {
-  background: $dark-900;
+  background: $dark-400;
   color: $light;
 }
 a {
@@ -39,11 +37,12 @@ img {
  */
 
 .alert a {
-  color: lighten($primary, 30%);
+  color: #214D97;
 }
 
 .bg-secondary, .btn-secondary, .badge-secondary { background-color: $secondary !important; }
 .btn-secondary, .card-secondary .card-header { border-color: $secondary !important; }
+.text-secondary { color: $secondary !important; }
 .alert-secondary, .btn-secondary:hover {
   color: $light;
   background-color: darken($secondary, 10%);
@@ -61,15 +60,12 @@ img {
 
 .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; }
+.card-warning > .text-dark { color: $dark-400 !important; }
-.alert-warning a { color: darken($primary, 6%); }
-.badge-warning a { color: $primary; }
 .alert-warning, .btn-warning:hover {
-  color: $dark-900;
+  color: $light;
-  background-color: darken($warning, 8%);
+  background-color: darken($warning, 10%);
-  border-color: darken($warning, 8%);
+  border-color: darken($warning, 10%);
 }
 
 .bg-info, .btn-info, .badge-info { background-color: $info !important; }
@@ -99,43 +95,39 @@ img {
   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;
+  background-color: $dark-300;
 }
 
 .form-control,
 .form-control:focus {
   color: $light;
-  background: $dark-800;
+  background: $dark-300;
-  border-color: $dark-800;
+  border-color: $dark-300;
 }
 
 .form-control[readonly],
 .form-control:disabled {
-  background: $dark-800;
+  background: $dark-300;
 }
 
 .card,
 .jumbotron,
-.list-group-item,
+.list-group-item {
-ol.breadcrumb {
+  background: $dark-300;
-  background: $dark-800;
 }
 
 .blockquote {
-  border-color: $dark-800;
+  border-color: $dark-300;
 }
 
 .bg-dark {
-  background-color: $dark-800 !important;
+  background-color: $dark-300 !important;
 }
 
 .dropdown-item {
@@ -143,7 +135,7 @@ ol.breadcrumb {
 }
 
 .list-group-item {
-  border-color: $dark-700;
+  border-color: $dark-200;
 }
 
 .text-dark {
@@ -152,15 +144,15 @@ ol.breadcrumb {
 
 table[data-sortable].sortable-theme-bootstrap {
   color: $light;
-  background-color: $dark-800;
+  background-color: $dark-300;
 }
 table[data-sortable].sortable-theme-bootstrap th,
 table[data-sortable].sortable-theme-bootstrap td {
-  border-color: $dark-600 !important;
+  border-color: $dark-100 !important;
 }
 table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"] {
   color: $light;
-  background: $dark-700;
+  background: $dark-200;
 }
 table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="ascending"]::after, {
   border-bottom-color: $light;
@@ -176,8 +168,8 @@ table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted
 
 .nav-dropdown {
   color: $light;
-  background-color: $dark-900;
+  background-color: $dark-400;
-  border-color: $dark-800;
+  border-color: $dark-300;
 }
 
 .nav-theme-icon:before {
@@ -185,12 +177,3 @@ table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted
   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%); }

assets/css/style.scss

@@ -5,7 +5,6 @@
 @import 'bootstrap';
 @import 'flag-icon';
 @import 'fontawesome';
-@import 'ptio-font';
 @import 'sortable-theme-bootstrap';
 
 body {
@@ -127,10 +126,6 @@ h2, h3:not(.h5), h4, h5 {
   font-size: 5.5em;
 }
 
-.panel-font {
-  font-size: 120px;
-}
-
 .share-btn {
   border: 0;
   box-shadow: $share-btn-shadow;
@@ -162,7 +157,7 @@ h2, h3:not(.h5), h4, h5 {
 .twitter { background: $twitter; }
 .mastodon { background: $mastodon; }
 .facebook { background: $facebook; }
-.mix { background: $mix; }
+.stumbleupon { background: $stumbleupon; }
 .reddit { background: $reddit; }
 .linkedin    { background: $linkedin; }
 .email { background: $email; }
@@ -186,55 +181,13 @@ h2, h3:not(.h5), h4, h5 {
   white-space: nowrap;
 }
 
-.hover-text-decoration-none:hover {
+footer {
-  text-decoration: none;
+  img,
-  -webkit-text-decoration-skip: object;
+  i {
+    margin-right: 1rem;
+  }
 }
 
-.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%);
-}
-
-
-
-/*
- * Bootstrap 4.2+ features
- */
-
-.text-decoration-none {
-  text-decoration: none !important;
-}
-
-.mx-n2 {
-  margin-left: -0.5rem;
-  margin-right: -0.5rem;
-}
-
-
 
 /*
  * Navbar
@@ -328,7 +281,6 @@ input#nav-toggle,
   /* We will make it visible with JavaScript
    * as it does not work without it */
   display: none;
-  cursor: pointer;
 }
 
 /*
@@ -356,7 +308,8 @@ input#nav-toggle,
   input#nav-toggle + label {
     display: block;
     cursor: pointer;
-    margin-bottom: 0;
+    margin-top: 0.25rem;
+    float: right;
   }
   .nav-dropdown {
     display: block;
@@ -400,3 +353,8 @@ input#nav-toggle,
   font-size: 0.875em;
   content: "\f186";
 }
+
+.table td, .table th {
+  vertical-align: middle;
+}
+