Don't break up sentences for <strong>

HTML code doesn't belong in en.yml

.github/CODEOWNERS

@@ -8,11 +8,6 @@
 
 # Administration Related Files
 /pages/donate.html @JonahAragon @BurungHantu1605
-/pages/notices.md @JonahAragon
-/pages/sponsors.html @JonahAragon
-/_includes/sponsors/ @JonahAragon
-/assets/img/svg/3rd-party/sponsors/ @JonahAragon
-/README.md @JonahAragon @BurungHantu1605
 /assets/js/redirects.js @JonahAragon
 /.well-known/ @JonahAragon
 /404.html @JonahAragon
@@ -22,11 +17,3 @@
 /.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,22 +1,6 @@
 # Contributing Guidelines
 
-Please read this document in full before contributing.
-
-- [Rules](#rules)
-- [Quality over Quantity](#quality-over-quantity)
-- [Software Criteria](#software-criteria)
-  - [Main (All Software)](#main)
-  - [Providers](#providers)
-    - [DNS](#dns)
-    - [VPN](#vpn)
-    - [Email](#email)
-  - [Hardware](#hardware)
-  - [Software](#software)
-  - [Encryption](#encryption)
-  - [Operating Systems](#operating-systems)
-- [Images](#images)
-- [Licensing](#licensing)
-- [Contributing via email](#contributing-via-email)
+Please read this before contributing.
 
 ## Rules
 
@@ -25,16 +9,14 @@ Please read this document in full before contributing.
 - 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)
+- See also our [Code of Conduct](https://github.com/privacytoolsIO/privacytools.io/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.
@@ -43,10 +25,8 @@ We're trying to keep it simple and promote the best tools, not all of them.
 
 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
@@ -57,9 +37,7 @@ Note: This criteria applies to all of the PrivacyTools website and recommendatio
 - Preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10)
 
 ### VPN
-
 See https://www.privacytools.io/providers/vpn/#criteria for more details.
-
 - Prioritize Products by privacy respecting nationality.
 - Cannot be based in USA or UK.
 - Must be accessible via Open Source Software (e.g. OpenVPN, WireGuard)
@@ -68,47 +46,31 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details.
 - No logging policy
 
 ### Email
-
 - Outside of USA
 - Support SMTP SSL
 - Accessible Using Open Source Software (e.g. allows IMAP)
 
 ### Hardware
-
 - Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or equivalent (if applicable)
 - Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when available.
 - Cannot lock users to a particular platform.
 
 ### Software
-
 - Must be able to download over encrypted network (can be a mirror)
 - Must be Open Source Software
 
 ### Encryption
-
 - Only verifiable encryption is to be trusted
 
-### Operating Systems
-
+### 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 logo dimensions are 384px x 128px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg))
-- 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))
+- Provider logos are 200px x 70px ([example](https://www.privacytools.io/assets/img/provider/AirVPN.png))
+- Tool logos are 120px x 120px ([example](https://www.privacytools.io/assets/img/tools/ChatSecure.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/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 run `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10 -->

.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

@@ -6,8 +6,6 @@ Resolves: #none <!-- A link to the (discussion) issue resolved by this pull requ
 
 #### 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

.gitignore

@@ -6,5 +6,3 @@ 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,11 +2,11 @@
     "@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/",

Gemfile

@@ -1,11 +1,13 @@
 source "https://rubygems.org"
 
 # Install github-pages gem (https://jekyllrb.com/docs/github-pages/)
-gem "github-pages", group: :jekyll_plugins
+gem "jekyll", group: :jekyll_plugins
 
 # Plugins
 group :jekyll_plugins do
   # example: gem "jekyll-feed", "~> 0.6"
+  gem 'jekyll-multiple-languages-plugin'
+  gem 'jekyll-sitemap'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -13,4 +15,3 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.0" if Gem.win_platform?
-

Gemfile.lock

@@ -1,89 +1,16 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.6.0)
+    addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.17.13)
-      ruby-enum (~> 0.5)
     concurrent-ruby (1.1.5)
-    dnsruby (1.61.3)
-      addressable (~> 2.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
     eventmachine (1.2.7)
-    execjs (2.7.0)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (198)
-      activesupport (= 4.2.11.1)
-      github-pages-health-check (= 1.16.1)
-      jekyll (= 3.8.5)
-      jekyll-avatar (= 0.6.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.1.5)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.11.0)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.12.1)
-      jekyll-mentions (= 1.4.1)
-      jekyll-optional-front-matter (= 0.3.0)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.2.0)
-      jekyll-redirect-from (= 0.14.0)
-      jekyll-relative-links (= 0.6.0)
-      jekyll-remote-theme (= 0.3.1)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.5.0)
-      jekyll-sitemap (= 1.2.0)
-      jekyll-swiss (= 0.4.0)
-      jekyll-theme-architect (= 0.1.1)
-      jekyll-theme-cayman (= 0.1.1)
-      jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.1)
-      jekyll-theme-leap-day (= 0.1.1)
-      jekyll-theme-merlot (= 0.1.1)
-      jekyll-theme-midnight (= 0.1.1)
-      jekyll-theme-minimal (= 0.1.1)
-      jekyll-theme-modernist (= 0.1.1)
-      jekyll-theme-primer (= 0.5.3)
-      jekyll-theme-slate (= 0.1.1)
-      jekyll-theme-tactile (= 0.1.1)
-      jekyll-theme-time-machine (= 0.1.1)
-      jekyll-titles-from-headings (= 0.5.1)
-      jemoji (= 0.10.2)
-      kramdown (= 1.17.0)
-      liquid (= 4.0.0)
-      listen (= 3.1.5)
-      mercenary (~> 0.3)
-      minima (= 2.5.0)
-      nokogiri (>= 1.8.5, < 2.0)
-      rouge (= 2.2.1)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.16.1)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (~> 3.0)
-      typhoeus (~> 1.3)
-    html-pipeline (2.12.0)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -100,97 +27,14 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.6.0)
-      jekyll (~> 3.0)
-    jekyll-coffeescript (1.1.1)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.3.1)
-      commonmarker (~> 0.14)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-commonmark-ghpages (0.1.5)
-      commonmarker (~> 0.17.6)
-      jekyll-commonmark (~> 1)
-      rouge (~> 2)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.11.0)
-      jekyll (~> 3.3)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.12.1)
-      jekyll (~> 3.4)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.4.1)
-      html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
-    jekyll-optional-front-matter (0.3.0)
-      jekyll (~> 3.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.2.0)
-      jekyll (~> 3.0)
-    jekyll-redirect-from (0.14.0)
-      jekyll (~> 3.3)
-    jekyll-relative-links (0.6.0)
-      jekyll (~> 3.3)
-    jekyll-remote-theme (0.3.1)
-      jekyll (~> 3.5)
-      rubyzip (>= 1.2.1, < 3.0)
+    jekyll-multiple-languages-plugin (1.6.0)
+      jekyll (>= 2.0, < 4.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.5.0)
-      jekyll (~> 3.3)
     jekyll-sitemap (1.2.0)
       jekyll (~> 3.3)
-    jekyll-swiss (0.4.0)
-    jekyll-theme-architect (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.3)
-      jekyll (~> 3.5)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.1)
-      jekyll (~> 3.3)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.10.2)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
     kramdown (1.17.0)
     liquid (4.0.0)
     listen (3.1.5)
@@ -198,17 +42,6 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.4.0)
-    minima (2.5.0)
-      jekyll (~> 3.5)
-      jekyll-feed (~> 0.9)
-      jekyll-seo-tag (~> 2.1)
-    minitest (5.11.3)
-    multipart-post (2.1.1)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.1.1)
@@ -216,33 +49,21 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rouge (2.2.1)
-    ruby-enum (0.7.2)
-      i18n
     ruby_dep (1.5.0)
-    rubyzip (2.0.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    typhoeus (1.3.1)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages
+  jekyll
+  jekyll-multiple-languages-plugin
+  jekyll-sitemap
   tzinfo-data
 
 BUNDLED WITH

README.md

@@ -1,32 +1,25 @@
-<a href="https://www.privacytools.io">
-	<img src="assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="PrivacyTools" />
-</a>
+[![privacytools](./assets/img/layout/logo.png)](https://www.privacytools.io/)
 
 _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.
 
 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 [Bundler](https://bundler.io/) v2.0.1:
-	* `gem install bundler -v 2.0.1`
-1. Install the required dependencies:
-	* `bundle install`
-1. Build the website (the output can be found in the `_site` directory):
-	* `bundle exec jekyll build`
-1. Serve the website locally with live reloading:
-	* `bundle exec jekyll serve --incremental --livereload`
+1. Install [Ruby](https://www.ruby-lang.org/en/documentation/installation/)
+1. Install [bundler](https://bundler.io/) by running `gem install bundler`.
+1. Run `bundle install` to 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`
 
-# Support
+# Support privacytools.io
 
 - [Donate.](https://www.privacytools.io/donate/)
 - [Liberapay](https://liberapay.com/privacytools.io/donate) or [Patreon.](https://www.patreon.com/privacytools)
@@ -35,10 +28,6 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri
 - [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,6 @@ 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
 
-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.
+The content and original technology of this website is made available under the [Creative Commons Zero v1.0 Universal](https://www.privacytools.io/LICENSE.txt) 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.

_config.yml

@@ -1,13 +1,14 @@
 title: Privacy Tools - Encryption Against Global Mass Surveillance
-name: PrivacyTools
-description: You are being watched. PrivacyTools provides knowledge, encryption, and software recommendations to protect you against global mass surveillance.
+description: You are being watched. Knowledge, encryption and privacy tools to protect you against global mass surveillance.
 url: "https://www.privacytools.io"
-production_url: "https://www.privacytools.io"
 sass:
   style: compressed
 plugins:
   - jekyll-sitemap
+  - jekyll-multiple-languages-plugin
+plugins_dir: "./_plugins"
 sitemap:
 file: "/sitemap.xml"
 include: [".well-known"]
+languages: ["en", "pl"]
 exclude: ["font", "vendor"]

_i18n/en.yml

@@ -0,0 +1,367 @@
+global:
+  further_reading: "Read also:"
+  new: "New"
+  home: "Home"
+  participate: "Participate"
+  language: "Language"
+  download: "Download"
+  related_information: "Related Information"
+  contrib: "This software may depend on or recommend non-free software."
+  theme: "Theme"
+aria:
+  nav_toggle: "Toggle navigation"
+service_descriptions:
+  services: "Services"
+  discourse: "Forum"
+  gitea: "Git-Repository Manager"
+  mastodon: "Social Network"
+  matrix: "Federated Chat"
+  privatebin: "Encrypted Pastebin"
+  searx: "Privacy Friendly Searx"
+  writefreely: "Federated Blog"
+  blog: "Blog"
+provider:
+  provider: "Provider"
+  us_uk: "Avoid US & UK services"
+  cloud_storage: "Cloud Storage"
+  dns: "DNS"
+  email: "Email"
+  hosting: "Hosting"
+  pastebins: "Pastebins"
+  search_engines: "Search Engines"
+  social_networks: "Social Networks"
+  news_aggregators: "Social News Aggregators"
+  vpn: "VPN"
+browser:
+  browser: "Browser"
+  fingerprint: "Fingerprinting Info"
+  privacy_addons: "Browser Add-ons"
+  tweaks: "Firefox Tweaks"
+  recommendations: "Recommendations"
+  webrtc_ip_leak: "WebRTC IP Leak"
+browser_addons:
+  improve_your_privacy: "Improve your privacy with these browser add-ons."
+  privacy_badger: "Privacy Badger"
+  privacy_badger_title: "Privacy Badger: Stop Tracking"
+  privacy_badger_description: "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."
+  ublock_origin: "uBlock Origin"
+  ublock_origin_title: "uBlock Origin: Block Ads and Trackers"
+  ublock_origin_description: "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."
+  cookie_autodelete: "Cookie AutoDelete"
+  cookie_autodelete_title: "Cookie AutoDelete: Automatically Delete Cookies"
+  cookie_autodelete_description: "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."
+  https_everywhere: "HTTPS Everywhere"
+  https_everywhere_title: "HTTPS Everywhere: Secure Connections"
+  https_everywhere_description: "encrypts your communications with many major websites, making your browsing more secure. A collaboration between The Tor Project and the Electronic Frontier Foundation."
+  decentraleyes: "Decentraleyes"
+  decentraleyes_title: "Decentraleyes: Block Content Delivery Networks"
+  decentraleyes_description: "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."
+  terms_of_service_didnt_read: "Terms of Service; Didn’t Read"
+  terms_of_service_didnt_read_title: "Terms of Service; Didn’t Read: Be Informed"
+  terms_of_service_didnt_read_description: "is an addon that aims to fix how \"I have read and agree to the Terms\" is the biggest lie on the web 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 done transparently by a community of reviewers."
+  snowflake: "Snowflake"
+  snowflake_title: "Snowflake"
+  snowflake_description: "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."
+  umatrix: "uMatrix"
+  umatrix_title: "uMatrix: Stop Cross-Site Requests"
+  umatrix_description: "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."
+  noScript_security_suite: "NoScript"
+  noScript_security_suite_title: "NoScript Security Suite: Be in total control"
+  noScript_security_suite_description: "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."
+  for_power_users_only: "For Power Users Only"
+  addon_warning: "These addons require quite a lot of interaction from the user. Some sites will not work properly until you have configured the add-ons."
+  excellent_add_ons: "Recommended Browser Add-ons"
+software:
+  cal_card: "Calendar/Contacts Sync Tools"
+  software: "Software"
+  notebook: "Digital Notebook"
+  email_alt: "Email Alternatives"
+  email_clients: "Email Clients"
+  file_encryption: "File Encryption"
+  file_sharing: "File Sharing"
+  password_managers: "Password Manager"
+  productivity: "Productivity Tools"
+  rtc: "Real-Time Communication"
+  file_sync: "File Sync"
+  metadata_removal: "Metadata Removal Tools"
+  networks: "Self-contained Networks"
+  cloud: "Self-hosted Cloud Server"
+os:
+  os: "OS"
+  android_addons: "Android Privacy Add-ons"
+  windows_10: "Don't use Windows 10"
+  live_cd: "Live CD OS"
+  mobile: "Mobile OS"
+  pc_os: "PC OS"
+  router: "Router Firmware"
+android_addons:
+  description: "Improve your privacy with these add-ons for Android."
+  block_ads: "Block ads with"
+  control_traffic: "Control your traffic with"
+  tor: "Tor for Android with"
+  netguard: "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."
+  orbot: "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."
+  root_mode: "Root Mode:"
+  orbot_root: "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."
+windows_10:
+  header: "Don't use Windows 10 - It's a privacy nightmare"
+  warning: "Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy."
+  alt: "Windows 10 Privacy"
+  data: "Data syncing is by default enabled."
+  data1: "Browsing history and open websites."
+  data2: "Apps settings."
+  data3: "WiFi hotspot names and passwords."
+  ad_id: "Your device is by default tagged with a unique advertising ID."
+  ad_id1: "Used to serve you with personalized advertisements by third-party advertisers and ad networks."
+  cortana: "Cortana can collect any of your data."
+  cortana1: "Your keystrokes, searches and mic input."
+  cortana2: "Calendar data."
+  cortana3: "Music you listen to."
+  cortana4: "Credit card information."
+  cortana5: "Purchases."
+  collection: "Microsoft can collect any personal data."
+  collection1: "Your identity."
+  collection2: "Passwords."
+  collection3: "Demographics."
+  collection4: "Interests and habits."
+  collection5: "Usage data."
+  collection6: "Contacts and relationships."
+  collection7: "Location data."
+  collection8: "Content like emails, instant messages, caller list, audio and video recordings."
+  sharing: "Your data can be shared."
+  sharing1: "When downloading Windows 10, you are authorizing Microsoft to share any of above-mentioned data with any third-party, with or without your consent."
+  tool: "This tool uses some known methods that attempt to disable major tracking features in Windows 10."
+header:
+  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."
+  search: "Try search.privacytools.io, a Privacy-Respecting Search Engine"
+  start_search: "start search"
+footer:
+  spread_the_word: "Spread the word and help your friends"
+  email_title: "Email"
+  facebook_title: "Facebook"
+  twitter_title: "Twitter"
+  mastodon_title: "Mastodon"
+  reddit_title: "reddit"
+  linkedin_title: "LinkedIn"
+  stumbleupon_title: "StumbleUpon"
+  diaspora_title: "Diaspora*"
+  copy_url_description: "Copy URL and Description"
+  for_easy_copy_paste: "For easy copy and paste. Share this text snippet."
+  CC0: "CC0"
+  CC0_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;."
+  contact: "Contact"
+  donate: "Support Us!"
+  donate_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."
+  no_ads: "No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests."
+  socially_motivated: "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."
+  privacy_policy: "View our privacy statement"
+  learn_more: "Learn More"
+  javascript: "JavaScript Licenses"
+resources:
+  tools: "Privacy Tools"
+  classic: "Prefer the classic site? View a single-page layout."
+  providers: "Providers"
+  providers_description: "Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!"
+  browsers: "Web Browsers"
+  browsers_description: "Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks."
+  software: "Software"
+  software_description: "Discover a variety of open source software built to protect your privacy and keep your digital data secure."
+  os: "Operating Systems"
+  os_description: "Find out how your operating system is compromising your privacy, and what simple alternatives exist."
+  services: "privacytoolsIO Services"
+  services_description: "The privacytools.io team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!"
+  sponsors: "Sponsors"
+  donate: "Donate"
+  donate_description: "We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating."
+quotes:
+  header: "Privacy? I don't have anything to hide."
+  quotes: "Quotes"
+privacy_resources:
+  header: "More Privacy Resources"
+  guides: "Guides"
+  guide1: "Surveillance Self-Defense by EFF"
+  guide1_d: "Guide to defending yourself from surveillance by using secure technology and developing careful practices."
+  guide2: "The Crypto Paper"
+  guide2_d: "Privacy, Security and Anonymity for Every Internet User."
+  guide3: "Email Self-Defense by FSF"
+  guide3_d: "A guide to fighting surveillance with GnuPG encryption."
+  guide4: "The Ultimate Privacy Guide"
+  guide4_d: "Excellent privacy guide written by the creators of the bestVPN.com website."
+  guide5: "IVPN Privacy Guides"
+  guide5_d: "These privacy guides explain how to obtain vastly greater freedom, privacy and anonymity through compartmentalization and isolation."
+  guide6: "The Ultimate Guide to Online Privacy"
+  guide6_d: 'Comprehensive "Ninja Privacy Tips" and 150+ tools.'
+  info1: "r/privacytoolsIO Wiki"
+  info1_d: "Our Wiki on reddit.com."
+  info2: "Security Now!"
+  info2_d: "Weekly Internet Security Podcast by Steve Gibson and Leo Laporte."
+  info3: "TechSNAP"
+  info3_d: "Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry."
+  info4: "Open Wireless Movement"
+  info4_d: "A coalition of Internet-freedom advocates, companies, organizations, and technologists working to develop new wireless technologies and to inspire a movement of Internet openness."
+  info5: "Freedom of the Press Foundation"
+  info5_d: "Supporting and defending journalism dedicated to transparency and accountability since 2012."
+  info6: "Erfahrungen.com"
+  info6_d: "German review aggregator website of privacy-related services."
+  info7: "Terms of Service; Didn't Read"
+  info7_d: '"I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.'
+  info8: "privacy.net"
+  info8_d: "What does the US government know about you?"
+  info9: "The Great Cloudwall"
+  info9_d: "Critique and information on why to avoid Cloudflare, a big company with a huge portion of the internet behind it."
+  tool1: "ipleak.net"
+  tool1_d: "IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites."
+  tool2: "The ultimate Online Privacy Test Resource List"
+  tool2_d: "A collection of Internet sites that check whether your web browser leaks information."
+  tool3: "PRISM Break"
+  tool3_d: "We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services."
+  tool4: "Security in-a-Box"
+  tool4_d: "A guide to digital security for activists and human rights defenders throughout the world."
+  tool5: "SecureDrop"
+  tool5_d: "An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation."
+  tool6: "Reset The Net - Privacy Pack"
+  tool6_d: "Help fight to end mass surveillance. Get these tools to protect yourself and your friends."
+  tool7: "Security First"
+  tool7_d: "Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment."
+  tool8: "Osalt"
+  tool8_d: "A directory to help you find open source alternatives to proprietary tools."
+  tool9: "AlternativeTo"
+  tool9_d: "A directory to help find alternatives to other software, with the option to only show open source software."
+  note: "Note: Just being open source does not make software secure!"
+participate:
+  participate: "Participate with suggestions and constructive criticism"
+  up_to_date: "It's important for a website like privacytools.io to stay up-to-date."
+  software_updates: "Keep an eye on software updates for the applications listed on our site."
+  follow_news: "Follow recent news about providers that we recommend."
+  keep_up: "We try our best to keep up, but we're not perfect and the internet is changing fast."
+  find_an_issue: "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: "Talk to us please."
+  find_us_on: "You can also find us on"
+  mastodon: "our own Mastodon instance"
+  or: "or on"
+  at: "at"
+  discourse: "Join our Discourse community to stay up to date on privacy news or make suggestions!"
+  follow: "Follow on"
+  mastodon_follow: "Get the latest privacy-related updates from our Mastodon Feed. Follow us today!"
+  github: "Develop on GitHub"
+  github_d: "The complete website source code is available on GitHub. Join our developer team!"
+  contributors: "Contributor List"
+  thanks: "This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you."
+sponsors:
+  sponsors_ptio: "Sponsors of privacytools.io"
+  community_proj: "The privacytools.io website and services are a community project. There is no advertising, affiliate links, or other forms of monetization."
+  donations_support: "Your donations here directly support hosting this website and compensating contributors to this project."
+  become_a_sponsor: "Become a Sponsor"
+  donate_directly: "Donate Directly"
+  why_sponsor: "Why sponsor privacytools.io?"
+  designed_to_allow: "This sponsorship program is designed to allow companies, organizations, and individuals partner with the privacytools.io team to support our vision of a more privacy-respecting internet and the greater online community."
+  recognize_privacy: "With this exposure and sponsorship, your customers will recognize your intrinsic understanding and commitment to user privacy. Moreover, you'll directly contribute to our mission of spreading privacy-respecting tools and knowledge worldwide!"
+  recognized_on_ptio: "As a sponsor of privacytools.io, your company will be widely recognized in a variety of ways, some of which we've detailed below."
+  general_info: "General Information"
+  stats_pageviews_featured: "This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution."
+  info_link: "Info"
+  bronze_sponsorship: "Bronze Sponsorship"
+  bronze_recognition: "Your name and link along with a small logo or avatar on the sponsors page of this website."
+  silver_sponsorship: "Silver Sponsorship"
+  silver_recognition: "Your medium-sized logo as a link at the top of our sponsors page."
+  gold_sponsorship: "Gold Sponsorship"
+  gold_recognition: "Your medium-sized logo as a link on the privacytools.io homepage and at the very top of our sponsors page."
+  we_will_not_provide: "We will not provide..."
+  details_for_not_provide: "We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above."
+  tax_and_financial_info: "Tax and Financial Information"
+  tax_and_financial_info_details: "Your contribution to privacytools.io will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is <strong>tax-deductible</strong>. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above."
+  more_information: "More Information"
+  questions_to_email: "If you are interested and have further questions, you are welcome to reach out to us directly at"
+donate:
+  opencollective_card_title: "Donate via OpenCollective"
+  opencollective_card_text: "If you are able, please consider contributing to our development and outreach programs. <strong>Contributions via OpenCollective to privacytools.io are tax deductible for US taxpayers.</strong> These funds are transparently and primarily used to cover server costs."
+  opencollective_card_contribute: "Contribute"
+  opencollective_card_moreinfo: "More Info"
+  cta: "Please Donate"
+  ad_free: "Our website is free of advertisements and not affiliated with any listed providers."
+  costs: "Your donation will cover our costs for servers, domains, coffee, beer, and pizza."
+  bitcoin: "We prefer Bitcoin donations to be above $5 due to the state of the network's transaction fees."
+  bitcoin2: "You are welcome to donate any smaller or larger amount on any other cryptocurrency, such as Bitcoin Cash, Ethereum, or Stellar."
+  other_crypto_no_receipt: "You may also contribute via the cryptocurrencies below; however, we will not be able to provide a receipt for your contribution."
+  convert_opencollective: "Your contribution will be considered an anonymous, unrestricted contribution and paid to our Fiscal Host at OpenCollective when we convert to currency."
+  more: "More Cryptocurrencies"
+  the: "The"
+  team: "privacytools.io team"
+  endorse: "does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies."
+  thanks: "Thanks for your support. You are awesome!"
+contact:
+  title: "Contact Us"
+  description: "Contact the privacytoolsIO team if you have any suggestions or are experiencing any issues."
+  editorial_team: "Editorial Team"
+  up_to_date: "It's very important to us to stay up-to-date on the latest changes in the privacy space."
+  reach_out: "If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out."
+  start_discussion: "Start a discussion in our Discourse Forum"
+  open_an_issue: "Open an issue or pull request on GitHub"
+  reddit_suggestion: "Suggest something new on Reddit"
+  transparency: "For complete transparency, software and providers will only be considered for this website after discussions take place on either of the above platforms."
+  on_matrix: "We're now on Matrix! Join us at"
+  on_matrix2: "to chat with us and other members about this site and privacy in general"
+  register_matrix: "If you need a Matrix account, you can sign up with our own homeserver"
+  using: "using"
+  or_matrix_client: "or any Matrix client!"
+  abuse1: "We take the operation of our various services very seriously."
+  abuse2: "Report only abuse here:"
+  searx_issues: "Searx Issues"
+  website_issues: "Website Issues"
+services:
+  title: "Services from privacytools.io"
+  description: "The privacytools.io team is proud to introduce a suite of privacy-centric online services to connect you with other privacy-minded individuals and stay safe and secure online. No advertisers, no Google Analytics, no tracking, no third-party requests of any kind."
+  we_have_the_following_services: "We currently have the following free-to-use services online now."
+  searx: "Searx - Privacy Friendly Search at search.privacytools.io"
+  mastodon: "Mastodon - Tracker Free Social Networking at social.privacytools.io"
+  matrix: "Matrix - Federated private chat at chat.privacytools.io"
+  discourse: "Discourse - Forum at forum.privacytools.io"
+  gitea: "Gitea - Git-Repository Manager at git.privacytools.io"
+  write_freely: "Write Freely - Federated minimalist blog at write.privacytools.io"
+  privatebin: "PrivateBin - Encrypted Pastebin at bin.privacytools.io"
+  more_services_on_the_way: "More services are on the way."
+  beneficial: "If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask."
+  consider: "And of course, if you like our services, please consider"
+  donating: "donating to support our server costs"
+  helps: "any donation helps!"
+router:
+  firmware: "Open Source Router Firmware"
+  openwrt_descr: "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."
+  pfsense_descr: "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."
+  librecmc_descr: "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)."
+  worth_mentioning: "Worth Mentioning"
+  openbsd_descr: "A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security, and integrated cryptography."
+  ddwrt_descr: "A Linux-based open-source firmware compatible with several models of routers and access points."
+pc_os:
+  pc_operating_systems: "PC Operating Systems"
+  ms_warning: "If you are currently using a operating system like Windows 10, you should pick an alternative here."
+  qubesos_descr: "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."
+  debian_descr: "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."
+  fedora_descr: "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."
+  warning: "Warning"
+  win10_nightmare: "Don't use Windows 10 - It's a privacy nightmare"
+  worth_mentioning: "Worth Mentioning"
+  openbsd_descr: "A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security, and integrated cryptography."
+  arch_descr: "A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement."
+  trisquel_descr: "Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed."
+  parabola_descr: "is a completely open source version of Arch Linux."
+  whonix_descr: 'A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.'
+mobile_os:
+  mobile_operating_systems: "Mobile Operating Systems"
+  google_warning: "Even though the source code of the following OS is provided, installing Google Apps may compromise your setup."
+  lineageos_descr: "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."
+  ubuntu_touch_descr: "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>"
+  grapheneos_descr: "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."
+  worth_mentioning: "Worth Mentioning"
+  replicant_descr: "An open-source operating system based on Android, aiming to replace all proprietary components with free software."
+  omnirom_descr: "A free-software operating system for smartphones and tablet computers, based on the Android mobile platform."
+  microg_descr: "A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement."
+  microg_lineage: "The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at"
+live_os:
+  live_cd: "Live CD Operating Systems"
+  tails_descr: "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 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."
+  knoppix_descr: "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."
+  puppy_linux_descr: "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."
+  worth_mentioning: "Worth Mentioning"
+  tiny_core_linux: "Tiny Core Linux"
+  tiny_core_linux_descr: "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 provided by extensions."

_i18n/pl.yml

@@ -0,0 +1,3 @@
+header:
+  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."
+  search: "Try search.privacytools.io, a Privacy-Respecting Search Engine"

_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/cardv2.html

@@ -36,7 +36,7 @@
         height="120"
         width="120"
         class="panel-pic"
-        alt="{{include.title}} logo"
+        alt="{{include.title}}"
       >
       {{ include.description }}
       {% if include.labels %}
@@ -61,43 +61,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 mr-1">
+          class="btn btn-primary mt-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 mr-1">
+            class="btn btn-success mt-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">
-            <span class="ptio-tor btn-tor btn-icon"></span>
-          </a>
-        {% endif %}
-        {% if include.i2p %}
-          <a
-            href="{{include.i2p}}"
-            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: geti2p.net">
-            <span class="ptio-i2p-garlic btn-secondary btn-icon"></span>
+            data-original-title="Requires specific software to access: torproject.org"
+            href="{{include.tor}}">
+            <img
+              class="mt-2"
+              alt="Tor"
+              src="/assets/img/layout/tor.png"
+              width="35"
+              height="35">
           </a>
         {% endif %}
       </div>
@@ -105,7 +95,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 }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -115,7 +105,7 @@
 
           {% if include.mac %}
             {% if include.mac != "" %}
-              <a href="{{ include.mac }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.mac }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -125,7 +115,7 @@
 
           {% if include.linux %}
             {% if include.linux != "" %}
-              <a href="{{ include.linux }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.linux }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -135,7 +125,7 @@
 
           {% if include.freebsd %}
             {% if include.freebsd != "" %}
-              <a href="{{ include.freebsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.freebsd }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -145,7 +135,7 @@
 
           {% if include.openbsd %}
             {% if include.openbsd != "" %}
-              <a href="{{ include.openbsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.openbsd }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-openbsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -155,7 +145,7 @@
 
           {% if include.netbsd %}
             {% if include.netbsd != "" %}
-              <a href="{{ include.netbsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.netbsd }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-netbsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -165,7 +155,7 @@
 
           {% if include.firefox %}
             {% if include.firefox != "" %}
-              <a href="{{ include.firefox }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.firefox }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -175,7 +165,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 }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -185,7 +175,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 }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -195,7 +185,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 }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -205,7 +195,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 }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -215,7 +205,7 @@
 
           {% if include.fdroid %}
             {% if include.fdroid != "" %}
-              <a href="{{ include.fdroid }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.fdroid }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-f-droid fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -225,7 +215,7 @@
 
           {% if include.googleplay %}
             {% if include.googleplay != "" %}
-              <a href="{{ include.googleplay }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.googleplay }}" 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 %}
@@ -235,7 +225,7 @@
 
           {% if include.android %}
             {% if include.android != "" %}
-              <a href="{{ include.android }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.android }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -245,7 +235,7 @@
 
           {% if include.ios %}
             {% if include.ios != "" %}
-              <a href="{{ include.ios }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.ios }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-ios fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -255,7 +245,7 @@
 
           {% if include.sailfish %}
             {% if include.sailfish != "" %}
-              <a href="{{ include.sailfish }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.sailfish }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -265,7 +255,7 @@
 
           {% if include.web %}
             {% if include.web != "" %}
-              <a href="{{ include.web }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.web }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -278,25 +268,25 @@
           {{include.icon3}}
 
           {% if include.github %}
-            <a href="{{include.github}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.github}}" class="text-decoration-none hover-text-decoration-none">
               <i class="fab fa-github fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.gitlab %}
-            <a href="{{include.gitlab}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.gitlab}}" class="text-decoration-none hover-text-decoration-none">
               <i class="fab fa-gitlab fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.git %}
-            <a href="{{include.git}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.git}}" class="text-decoration-none hover-text-decoration-none">
               <i class="fab fa-git-square fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.source %}
-            <a href="{{include.source}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.source}}" class="text-decoration-none hover-text-decoration-none">
               <i class="fas fa-code-branch fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}

_includes/footer.html

@@ -2,95 +2,84 @@
 
   <hr class="footer-divider" />
 
-  <h3 id="participate">Spread the word and help your friends</h3>
+  <h3 id="participate">{% t footer.spread_the_word %}</h3>
 
   <div class="row mb-4">
     <div class="col-12 col-md-6 d-flex justify-content-between">
-      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body={{ site.production_url }}/" class="share-btn email" title="Email">
-        <i class="fas fa-envelope"></i>
+      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/" class="share-btn email" title="{% t footer.email_title %}">
+        <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">
-        <i class="fab fa-facebook-f"></i>
+      <a href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io" class="share-btn facebook" title="{% t footer.facebook_title %}">
+        <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">
-        <i class="fab fa-twitter"></i>
+      <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="{% t footer.twitter_title %}">
+        <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">
-        <i class="fab fa-mastodon"></i>
+      <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="{% t footer.mastodon_title %}">
+        <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">
-        <i class="fab fa-reddit-alien"></i>
+      <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="{% t footer.mastodon_title %}">
+        <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">
-        <i class="fab fa-linkedin-in"></i>
+      <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="{% t footer.linkedin_title %}">
+        <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">
-        <i class="ptio-mix"></i>
+      <a href="https://mix.com/mixit?su=submit&url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
+        <i class="ptio-mix 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*">
-        <i class="fas fa-asterisk"></i>
+      <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="{% t footer.diaspora_title %}">
+        <i class="fas fa-asterisk pl-3"></i>
       </a>
     </div>
   </div>
 
-  <h3>Copy URL and Description</h3>
+  <h3>{% t footer.copy_url_description %}</h3>
 
   <p>
-  <input type="text" value="{{ site.name }} - Encryption and tools to protect against global mass surveillance - {{ site.production_url }}" class="form-control input-lg onclick-select">
-  <span class="help-block">For easy copy and paste. Share this text snippet.</span>
+  <input type="text" value="privacytools.io - encryption against global mass surveillance" class="form-control input-lg onclick-select">
+  <span class="help-block">{% t footer.for_easy_copy_paste %}</span>
   </p>
 
   <hr class="footer-divider" />
 
   <div class="row mt-3">
-    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
-      <span class="fab fa-creative-commons-zero fa-2x mr-2"></span>
-      <a
-        href="/LICENSE.txt"
-        title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."
-        data-toggle="tooltip"
-        data-placement="top">
-        CC0
-      </a>
+    <div class="col-sm-4 mb-3 d-flex justify-content-center d-flex justify-content-center">
+      <a href="/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.CC0_title %}"><img alt="{% t footer.CC0 %}" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
     </div>
 
-    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
-      <span class="far fa-address-card fa-2x mr-2"></span>
-      <a href="/about/">About Us &amp; Contact</a>
+    <div class="col-sm-4 mb-3 d-flex justify-content-center">
+      <i class="far fa-envelope fa-2x"></i>
+      <a href="/contact/">{% t footer.contact %}</a>
     </div>
 
-    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
-      <span class="fas fa-donate fa-2x mr-2"></span>
-      <a href="/donate/" data-toggle="tooltip" data-placement="top" data-original-title="Please support this project by donating. We are ad-free and not affiliated with any providers. Your donation will cover our costs for servers and domains.">Support Us!</a>
+    <div class="col-sm-4 mb-3 d-flex justify-content-center">
+      <i class="fas fa-donate fa-2x"></i>
+      <a data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.donate_title %}" href="https://opencollective.com/privacytoolsio#section-contribute">{% t footer.donate %}</a>
     </div>
   </div>
 
   <div class="copyright-text">
     <a href="/about/javascript" data-jslicense="1">
       <span class="fab fa-js fa-lg"></span>
-      JavaScript Licenses
+      {% t footer.javascript %}
     </a>
     <p class="mt-2">
-      <strong>No Ads, No Google Analytics, {% if page.title != "Shop" %}No Affiliates, {% endif %}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>
+      <strong>{% t footer.no_ads %}</strong>
+      <em>{% t footer.socially_motivated %}</em>
+      <a href="/privacy/">{% t footer.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>)
+      (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">{% t footer.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>
-  <meta property="og:title" content="{{ page.title }} | {{ site.name }}" />
+  <title>{{ page.title | flatify }} | privacytools.io</title>
+  <meta property="og:title" content="{{ page.title | flatify }} | 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:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}"/>
+  <meta property="og:image" content="https://www.privacytools.io/assets/img/layout/ogimage.jpg" />
+  <meta property="og:description" content="{% if page.description %}{{ page.description | flatify }}{% else %}{{ site.description }}{% endif %}"/>
   <meta property="og:locale" content="en_GB" />
-  <meta property="og:site_name" content="{{ site.name }}" />
-
-  {% 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 %}
+  <meta property="og:site_name" content="privacytools.io" />
 
   <!-- icons -->
-  <link rel="apple-touch-icon" sizes="180x180" href="/assets/img/png/favicons/apple-touch-icon.png?v=2">
-  <link rel="icon" type="image/png" sizes="32x32" href="/assets/img/png/favicons/favicon-32x32.png?v=2">
-  <link rel="icon" type="image/png" sizes="16x16" href="/assets/img/png/favicons/favicon-16x16.png?v=2">
-  <link rel="manifest" href="/assets/img/png/favicons/site.webmanifest?v=2">
-  <link rel="mask-icon" href="/assets/img/png/favicons/safari-pinned-tab.svg?v=2" color="#3498db">
-  <link rel="shortcut icon" href="/assets/img/png/favicons/favicon.ico?v=2">
-  <meta name="msapplication-TileColor" content="#3498db">
-  <meta name="msapplication-config" content="/assets/img/png/favicons/browserconfig.xml?v=2">
-  <meta name="theme-color" content="#ffffff">
-
+  <link rel="apple-touch-icon" sizes="57x57" href="/assets/img/favicons/apple-touch-icon-57x57.png">
+  <link rel="apple-touch-icon" sizes="60x60" href="/assets/img/favicons/apple-touch-icon-60x60.png">
+  <link rel="apple-touch-icon" sizes="72x72" href="/assets/img/favicons/apple-touch-icon-72x72.png">
+  <link rel="apple-touch-icon" sizes="76x76" href="/assets/img/favicons/apple-touch-icon-76x76.png">
+  <link rel="apple-touch-icon" sizes="114x114" href="/assets/img/favicons/apple-touch-icon-114x114.png">
+  <link rel="apple-touch-icon" sizes="120x120" href="/assets/img/favicons/apple-touch-icon-120x120.png">
+  <link rel="apple-touch-icon" sizes="144x144" href="/assets/img/favicons/apple-touch-icon-144x144.png">
+  <link rel="apple-touch-icon" sizes="152x152" href="/assets/img/favicons/apple-touch-icon-152x152.png">
+  <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=8" rel="stylesheet">
   <link id="dark-css" href="/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)">
 </head>

_includes/nav.html

@@ -1,16 +1,16 @@
-<nav class="fixed-top bg-dark">
-  <div id="navbar" class="d-flex flex-wrap justify-content-between align-items-center">
-    <div class="w-50">
-      <a id="nav-home-mobile" class="nav-anchor" href="/">
-        <img src="/assets/img/svg/layout/brand/horizontal.svg" width="150px" />
-      </a>
-    </div>
+<div class="fixed-top bg-dark">
+  <nav id="navbar">
+
     <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>
 
@@ -18,21 +18,21 @@
         <details class="nav-details">
           <summary>
             <span class="nav-summary">
-              Provider
+              {% t provider.provider %}
               <span class="dropdown-toggle"></span>
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a class="dropdown-item" href="/providers/#ukusa"><span class="fas fa-user-secret fa-fw"></span> Avoid US & UK services</a>
-            <a class="dropdown-item" href="/providers/cloud-storage/"><span class="fas fa-cloud fa-fw"></span> Cloud Storage</a>
-            <a class="dropdown-item" href="/providers/dns/"><span class="fa fa-tasks fa-fw"></span> DNS</a>
-            <a class="dropdown-item" href="/providers/email/"><span class="fas fa-mail-bulk fa-fw"></span> Email</a>
-            <a class="dropdown-item" href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> Hosting</a>
-            <a class="dropdown-item" href="/providers/paste/"><span class="fas fa-paste fa-fw"></span> Pastebins</a>
-            <a class="dropdown-item" href="/providers/search-engines/"><span class="fas fa-search fa-fw"></span> Search Engines</a>
-            <a class="dropdown-item" href="/providers/social-networks/"><span class="fas fa-expand-arrows-alt fa-fw"></span> Social Networks</a>
-            <a class="dropdown-item" href="/providers/social-news-aggregator/"><span class="far fa-newspaper fa-fw"></span> Social News Aggregators</a>
-            <a class="dropdown-item" href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> VPN</a>
+            <a class="dropdown-item" href="/providers/#ukusa"><span class="fas fa-user-secret fa-fw"></span> {% t provider.us_uk %}</a>
+            <a class="dropdown-item" href="/providers/cloud-storage/"><span class="fas fa-cloud fa-fw"></span> {% t provider.cloud_storage %}</a>
+            <a class="dropdown-item" href="/providers/dns/"><span class="fa fa-tasks fa-fw"></span> {% t provider.dns %}</a>
+            <a class="dropdown-item" href="/providers/email/"><span class="fas fa-mail-bulk fa-fw"></span> {% t provider.email %}</a>
+            <a class="dropdown-item" href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> {% t provider.hosting %}</a>
+            <a class="dropdown-item" href="/providers/paste/"><span class="fas fa-paste fa-fw"></span> {% t provider.pastebins %}</a>
+            <a class="dropdown-item" href="/providers/search-engines/"><span class="fas fa-search fa-fw"></span> {% t provider.search_engines %}</a>
+            <a class="dropdown-item" href="/providers/social-networks/"><span class="fas fa-expand-arrows-alt fa-fw"></span> {% t provider.social_networks %}</a>
+            <a class="dropdown-item" href="/providers/social-news-aggregator/"><span class="far fa-newspaper fa-fw"></span> {% t provider.news_aggregators %}</a>
+            <a class="dropdown-item" href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> {% t provider.vpn %}</a>
           </span>
         </details>
 
@@ -40,16 +40,16 @@
         <details class="nav-details">
           <summary>
             <span class="nav-summary">
-              Browser
+              {% t browser.browser %}
               <span class="dropdown-toggle"></span>
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a class="dropdown-item" href="/browsers/#browser"><span class="fas fa-check fa-fw"></span> Recommendation</a>
-            <a class="dropdown-item" href="/browsers/#fingerprint"><span class="fas fa-fingerprint fa-fw"></span> Fingerprinting Info</a>
-            <a class="dropdown-item" href="/browsers/#webrtc"><span class="far fa-eye fa-fw"></span> WebRTC IP Leak</a>
-            <a class="dropdown-item" href="/browsers/#addons"><span class="far fa-list-alt fa-fw"></span> Browser Add-ons</a>
-            <a class="dropdown-item" href="/browsers/#about_config"><span class="fas fa-wrench fa-fw"></span> Firefox Tweaks</a>
+            <a class="dropdown-item" href="/browsers/#browser"><span class="fas fa-check fa-fw"></span> {% t browser.recommendations %}</a>
+            <a class="dropdown-item" href="/browsers/#fingerprint"><span class="fas fa-fingerprint fa-fw"></span> {% t browser.fingerprint %}</a>
+            <a class="dropdown-item" href="/browsers/#webrtc"><span class="far fa-eye fa-fw"></span> {% t browser.webrtc_ip_leak %}</a>
+            <a class="dropdown-item" href="/browsers/#addons"><span class="far fa-list-alt fa-fw"></span> {% t browser.privacy_addons %}</a>
+            <a class="dropdown-item" href="/browsers/#about_config"><span class="fas fa-wrench fa-fw"></span> {% t browser.tweaks %}</a>
           </span>
         </details>
 
@@ -57,23 +57,24 @@
         <details class="nav-details">
           <summary>
             <span class="nav-summary">
-              Software
+              {% t software.software %}
               <span class="dropdown-toggle"></span>
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a class="dropdown-item" href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> Calendar/Contacts Sync Tools</a>
-            <a class="dropdown-item" href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebook</a>
-            <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a>
-            <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a>
-            <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a>
-            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> File Sync</a>
-            <a class="dropdown-item" href="/software/productivity/#metadata-removal-tools"><span class="far fa-eye-slash fa-fw"></span> Metadata Removal Tools</a>
-            <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> Password Manager</a>
-            <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> Productivity Tools</a>
-            <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> Real-Time Communication</a>
-            <a class="dropdown-item" href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> Self-contained Networks</a>
-            <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> Self-Hosted Cloud Server</a>
+            <a class="dropdown-item" href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> {% t software.cal_card %}</a>
+            <a class="dropdown-item" href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> {% t software.notebook %}</a>
+            <a class="dropdown-item" href="/software/email/#messaging"><span class="fas fa-random fa-fw"></span> {% t software.email_alt %}</a>
+            <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> {% t software.email_clients %}</a>
+            <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> {% t software.file_encryption %}</a>
+            <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> {% t software.file_sharing %}</a>
+            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> {% t software.file_sync %}</a>
+            <a class="dropdown-item" href="/software/productivity/#metadata-removal-tools"><span class="far fa-eye-slash fa-fw"></span> {% t software.metadata_removal %}</a>
+            <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> {% t software.password_managers %}</a>
+            <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> {% t software.productivity %}</a>
+            <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> {% t software.rtc %}</a>
+            <a class="dropdown-item" href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> {% t software.networks %}</a>
+            <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> {% t software.cloud %}</a>
           </span>
         </details>
 
@@ -81,67 +82,73 @@
         <details class="nav-details">
           <summary>
             <span class="nav-summary">
-              OS
+              {% t os.os %}
               <span class="dropdown-toggle"></span>
             </span>
           </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/#mobile_os"><span class="fas fa-mobile-alt fa-fw"></span> Mobile OS</a>
-            <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> Android Privacy Add-ons</a>
-            <a class="dropdown-item" href="/operating-systems/#firmware"><span class="fas fa-signal fa-fw"></span> Router Firmware</a>
-            <a class="dropdown-item" href="/operating-systems/#win10"><span class="far fa-thumbs-down fa-fw"></span> Don't use Windows 10</a>
+            <a class="dropdown-item" href="/operating-systems/#os"><span class="fas fa-th-large fa-fw"></span> {% t os.pc_os %}</a>
+            <a class="dropdown-item" href="/operating-systems/#live_os"><span class="fas fa-compact-disc fa-fw"></span> {% t os.live_cd %}</a>
+            <a class="dropdown-item" href="/operating-systems/#mobile_os"><span class="fas fa-mobile-alt fa-fw"></span> {% t os.mobile %}</a>
+            <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> {% t os.android_addons %}</a>
+            <a class="dropdown-item" href="/operating-systems/#firmware"><span class="fas fa-signal fa-fw"></span> {% t os.router %}</a>
+            <a class="dropdown-item" href="/operating-systems/#win10"><span class="far fa-thumbs-down fa-fw"></span> {% t os.windows_10 %}</a>
           </span>
         </details>
 
-        <a class="nav-anchor" href="/index.html#participate">Participate</a>
+        <a class="nav-anchor" href="/index.html#participate">{% t global.participate %}</a>
       </div>
 
       <!-- Language -->
       <div id="nav-right">
-
-        <a href="/services/" class="nav-anchor">
-          Services
-        </a>
-        <a href="https://blog.privacytools.io/" class="nav-anchor">
-          Blog
-        </a>
-        <a href="/sponsors/" class="nav-anchor">
-          Sponsors
-        </a>
-        <a href="/about/" class="nav-anchor">
-          About Us
-        </a>
-        <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="sr-only">Language Selection</span>
+              <span class="fas fa-language text-danger fa-fw"></span>
+              {% t global.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.twngo.xyz/" rel="nofollow noopener" class="dropdown-item">繁體中文</a>
-            <a href="https://victorhck.gitlab.io/privacytools-es/" rel="nofollow noopener" class="dropdown-item">Español</a>
-            <a href="https://pl.privacytools.io/" rel="nofollow noopener" class="dropdown-item">Polski</a>
-            <a href="https://www.privacidade.digital/" rel="nofollow noopener" class="dropdown-item">Português</a>
-            <a href="https://privacytools.it-sec.rocks/" rel="nofollow noopener" class="dropdown-item">Deutsch</a>
-            <a href="https://privacytools-it.github.io/" rel="nofollow noopener" class="dropdown-item">Italiano</a>
-            <a href="https://privacytools.ru" rel="nofollow noopener" class="dropdown-item">Русский</a>
-            <a href="https://privacytools.dreads-unlock.fr" rel="nofollow noopener" class="dropdown-item">Français</a>
+            <a href="https://privacytools.io/" class="dropdown-item">English</a>
+            <a href="https://privacytools.twngo.xyz/" class="dropdown-item">繁體中文</a>
+            <a href="https://victorhck.gitlab.io/privacytools-es/" class="dropdown-item">Español</a>
+            <a href="https://pl.privacytools.io/" class="dropdown-item">Polski</a>
+            <a href="https://www.privacidade.digital/" class="dropdown-item">Português</a>
+            <a href="https://privacytools.it-sec.rocks/" class="dropdown-item">Deutsch</a>
+            <a href="https://privacytools-it.github.io/" class="dropdown-item">Italiano</a>
+            <a href="https://privacytools.ru" class="dropdown-item">Русский</a>
+            <a href="https://privacytools.dreads-unlock.fr" class="dropdown-item">Français</a>
           </span>
         </details>
-      </div>
+
+        <!-- Services -->
+        <details class="nav-details">
+          <summary>
+            <span class="nav-summary">
+              {% t service_descriptions.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 - {% t service_descriptions.discourse %}</a>
+            <a class="dropdown-item" href="https://git.privacytools.io/"><span class="fab fa-git fa-fw"></span> Gitea - {% t service_descriptions.gitea %}</a>
+            <a class="dropdown-item" href="https://social.privacytools.io/"><span class="fas fa-retweet fa-fw"></span> Mastodon - {% t service_descriptions.mastodon %}</a>
+            <a class="dropdown-item" href="https://chat.privacytools.io/"><span class="fas fa-comment fa-fw"></span> Matrix - {% t service_descriptions.matrix %}</a>
+            <a class="dropdown-item" href="https://bin.privacytools.io/"><span class="fas fa-clipboard fa-fw"></span> PrivateBin - {% t service_descriptions.privatebin %}</a>
+            <a class="dropdown-item" href="https://search.privacytools.io/"><span class="fas fa-search fa-fw"></span> Searx - {% t service_descriptions.searx %}</a>
+            <a class="dropdown-item" href="https://write.privacytools.io/"><span class="fas fa-pen-alt fa-fw"></span> Write Freely - {% t service_descriptions.writefreely %}</a>
+          </span>
+        </details>
+
+        <a href="https://blog.privacytools.io/" class="nav-anchor">{% t service_descriptions.blog %} </a>
+        <a href="/sponsors/" class="nav-anchor">
+          {% t resources.sponsors %}
+        </a>
+        <span id="nav-switch-theme" class="nav-anchor">
+          {% t global.theme %} <span class="nav-theme-icon fas fa-fw"></span>
+        </span>
       </div>
     </div>
   </nav>
+</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/sections/android-addons.html

@@ -1,24 +1,28 @@
-<h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> Android Privacy Add-ons</h1>
+<h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> {% t os.android_addons %}</h1>
+
+<div class="alert alert-success" role="alert">
+  <strong>{% t android_addons.description %}</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/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
     </div>
     <div class="col">
-    <h3>Control your traffic with <a href="https://www.netguard.me/">NetGuard</a></h3>
-    <p><strong>NetGuard</strong> provides simple and advanced methods to block certain apps from accessing the internet, without requiring root privileges. Applications and addresses can be individually allowed or denied access to your Wi-Fi and/or mobile connections, allowing you to control exactly which apps are able to phone home or not.</p>
+    <h3>{% t android_addons.control_traffic %} <a href="https://www.netguard.me/">NetGuard</a></h3>
+    <p><strong>NetGuard</strong> {% t android_addons.netguard %}
     </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/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 wish to use through Tor.</p>
+    <h3>{% t android_addons.tor %} <a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>
+    <p><strong>Orbot</strong> {% t android_addons.orbot %} <strong>{% t android_addons.root_mode %}</strong> {% t android_addons.orbot_root %}
     </div>
   </div>
 
@@ -28,6 +32,6 @@
 
 <ul>
   <li>
-    <a href="/providers/dns#clients">Our DNS client recommendations</a>, which have information on enabling encrypted DNS on Android.
+    <a href="/providers/dns#clients">Our DNS page</a> which also has information on encrypting DNS on Android.
   </li>
 </ul>

_includes/sections/browser-addons.html

@@ -1,13 +1,32 @@
-<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Recommended Browser Add-ons</h1>
+<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> {% t browser_addons.excellent_add_ons %}</h1>
 
-<div class="alert alert-secondary" role="alert">
-  Not all of these add-ons are necessary, and many provide redundant functionality. Choose the ones you need, and <a class="alert-link" href="https://blog.privacytools.io/firefox-privacy-an-introduction-to-safe/">learn more with our guide to Firefox Privacy</a>.
+<div class="alert alert-primary" role="alert">
+  <strong>{% t browser_addons.improve_your_privacy %}</strong>
 </div>
 
+{%- capture title1 -%}{% t browser_addons.privacy_badger_title %}{%- endcapture -%}
+{%- capture descr1 -%}<strong>{% t browser_addons.privacy_badger %}</strong> {% t browser_addons.privacy_badger_description %}{%- endcapture -%}
+{%- capture title2 -%}{% t browser_addons.ublock_origin_title %}{%- endcapture -%}
+{%- capture descr2 -%}<strong>{% t browser_addons.ublock_origin %}</strong> {% t browser_addons.ublock_origin_description %}{%- endcapture -%}
+{%- capture title3 -%}{% t browser_addons.cookie_autodelete_title %}{%- endcapture -%}
+{%- capture descr3 -%}<strong>{% t browser_addons.cookie_autodelete %}</strong> {% t browser_addons.cookie_autodelete_description %}{%- endcapture -%}
+{%- capture title4 -%}{% t browser_addons.https_everywhere_title %}{%- endcapture -%}
+{%- capture descr4 -%}<strong>{% t browser_addons.https_everywhere %}</strong> {% t browser_addons.https_everywhere_description %}{%- endcapture -%}
+{%- capture title5 -%}{% t browser_addons.decentraleyes_title %}{%- endcapture -%}
+{%- capture descr5 -%}<strong>{% t browser_addons.decentraleyes %}</strong> {% t browser_addons.decentraleyes_description %}{%- endcapture -%}
+{%- capture title6 -%}{% t browser_addons.terms_of_service_didnt_read_title %}{%- endcapture -%}
+{%- capture descr6 -%}<strong>{% t browser_addons.terms_of_service_didnt_read %}</strong> {% t browser_addons.terms_of_service_didnt_read_description %}{%- endcapture -%}
+{%- capture title7 -%}{% t browser_addons.snowflake_title %}{%- endcapture -%}
+{%- capture descr7 -%}<strong>{% t browser_addons.snowflake %}</strong> {% t browser_addons.snowflake_description %}{%- endcapture -%}
+{%- capture title8 -%}{% t browser_addons.umatrix_title %}{%- endcapture -%}
+{%- capture descr8 -%}<strong>{% t browser_addons.umatrix %}</strong> {% t browser_addons.umatrix_description %}{%- endcapture -%}
+{%- capture title9 -%}{% t browser_addons.noScript_security_suite_title %}{%- endcapture -%}
+{%- capture descr9 -%}<strong>{% t browser_addons.noScript_security_suite %}</strong> {% t browser_addons.noScript_security_suite_description %}{%- endcapture -%}
+
 {% 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."
+title=title2
+image="/assets/img/addons/ublock-origin.png"
+description=descr2
 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/"
@@ -18,9 +37,20 @@ 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."
+title=title3
+image="/assets/img/addons/cookie-autodelete.png"
+description=descr3
+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=title4
+image="/assets/img/addons/https-everywhere.png"
+description=descr4
 website="https://www.eff.org/https-everywhere"
 forum="https://forum.privacytools.io/t/discussion-https-everywhere/268"
 github="https://github.com/EFForg/https-everywhere"
@@ -30,9 +60,9 @@ 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."
+title=title5
+image="/assets/img/addons/decentraleyes.png"
+description=descr5
 website="https://decentraleyes.org/"
 forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
 gitlab="https://git.synz.io/Synzvato/decentraleyes"
@@ -42,20 +72,9 @@ 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.'
+title=title6
+image="/assets/img/addons/tosdr.png"
+description=descr6
 website="https://tosdr.org/"
 forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270"
 github="https://github.com/tosdr/"
@@ -65,9 +84,9 @@ opera="https://addons.opera.com/en/extensions/details/terms-of-service-didnt-rea
 %}
 
 {% 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."
+title=title7
+image="/assets/img/addons/snowflake.png"
+description=descr7
 website="https://snowflake.torproject.org"
 forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
 git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
@@ -76,9 +95,9 @@ chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnll
 %}
 
 {% include cardv2.html
-title="Privacy Badger: Stop Tracking"
-image="/assets/img/svg/3rd-party/privacy_badger.svg"
-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."
+title=title1
+image="/assets/img/addons/privacy-badger.png"
+description=descr1
 website="https://www.eff.org/privacybadger"
 forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
 github="https://github.com/EFForg/privacybadger"
@@ -87,16 +106,16 @@ chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbd
 opera="https://addons.opera.com/en/extensions/details/privacy-badger/"
 %}
 
-<h2>For Power Users Only</h2>
+<h2>{% t browser_addons.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>{% t browser_addons.addon_warning %}</strong>
 </div>
 
 {% include cardv2.html
-title="uMatrix: Stop Cross-Site Requests"
-image="/assets/img/png/3rd-party/umatrix.png"
-description="<strong>uMatrix</strong> gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics."
+title=title8
+image="/assets/img/addons/umatrix.png"
+description=descr8
 website="https://addons.mozilla.org/firefox/addon/umatrix/"
 forum="https://forum.privacytools.io/t/discussion-umatrix/271"
 github="https://github.com/gorhill/uMatrix"
@@ -106,9 +125,9 @@ opera="https://addons.opera.com/en/extensions/details/umatrix"
 %}
 
 {% include cardv2.html
-title="NoScript Security Suite: Be in total control"
-image="/assets/img/svg/3rd-party/noscript.svg"
-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."
+title=title9
+image="/assets/img/addons/noscript.png"
+description=descr9
 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"

_includes/sections/browser-recommendation.html

@@ -5,9 +5,9 @@
 
 {% include cardv2.html
 title="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
-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"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
 source="https://hg.mozilla.org/mozilla-central/"
@@ -21,7 +21,7 @@ netbsd="http://pkgsrc.se/www/firefox"
 
 {% 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/"
@@ -39,9 +39,9 @@ linux="https://www.torproject.org/download/"
 
 {% include cardv2.html
 title="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
-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://www.mozilla.org/en-US/firefox/mobile/"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
 source="https://github.com/mozilla-mobile"
@@ -52,7 +52,7 @@ 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"
+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/"
@@ -65,8 +65,8 @@ googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrow
 
 {% 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>.'
+image="/assets/img/tools/bromite.png"
+description='Bromite is a Chromium-based browser with security enhancement patches from GrapheneOS and built-in adblocking and DNS over HTTPS support. More info can be found <a href="https://www.bromite.org/#main-features">here</a>.'
 website="https://www.bromite.org/"
 forum="https://forum.privacytools.io/t/discussion-bromite-browsers/1521"
 github="https://github.com/bromite/bromite"
@@ -94,7 +94,7 @@ android="https://www.bromite.org/#download-bromite"
 
 {% include cardv2.html
 title="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. 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"
@@ -105,7 +105,7 @@ 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"
+image="/assets/img/tools/onionbrowser.png"
 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"
@@ -116,7 +116,7 @@ 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"
+image="/assets/img/provider/DuckDuckGo.png"
 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"

_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>
 
@@ -115,7 +115,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/calendar-contacts-sync.html

@@ -7,7 +7,7 @@
 {%
   include cardv2.html
   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."
   website="https://nextcloud.com/"
   forum="https://forum.privacytools.io/t/discussion-nextcloud-calender-contacts-sync-tools/1535"
@@ -24,30 +24,26 @@
 
 {%
   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/"
+  title="Email Providers"
+  image="/assets/img/misc/email.png"
+  description='Many email providers also offer calendar and or contacts sync services. Refer to the <a href="/providers/email">Email Providers section</a> to choose an email provider and check if they also offer calendar and/or contacts sync.'
+  website="/providers/email"
 %}
 
 {%
   include cardv2.html
-  title="Email Providers"
-  image="/assets/img/svg/layout/email.svg"
-  description='Many email providers also offer calendar and or contacts sync services. Refer to our <a href="/providers/email">Email Provider recommendations</a> to choose an email provider and see if they also offer calendar and/or contacts sync.'
-  website="/providers/email"
+  title="EteSync"
+  image="/assets/img/provider/etesync.png"
+  description="<strong>EteSync</strong> 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 $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://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  mac="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  linux="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  fdroid="https://f-droid.org/packages/com.etesync.syncadapter/"
+  googleplay="https://play.google.com/store/apps/details?id=com.etesync.syncadapter"
 %}
 
 <h3>Worth Mentioning</h3>
@@ -58,10 +54,6 @@
   </li>
 
   <li>
-    <a href="../cloud">Cloud backups</a> - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/">encrypting</a> them).
-  </li>
-
-  <li>
-    <a href="https://github.com/39aldo39/DecSync">DecSync</a> - DecSync can be used to synchronize RSS, contacts, and calendars without a server by using file synchronization software such as <a href="https://syncthing.net/">Syncthing</a>.
+    <a href="../cloud">cloud backups</a> - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/">encrypting</a> them).
   </li>
 </ul>

_includes/sections/cloud-storage.html

@@ -6,8 +6,8 @@
 
 {% include cardv2.html
 title="Nextcloud - Choose your hoster"
-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."
+image="/assets/img/provider/Nextcloud.png"
+description="Nextcloud is similar in functionality to the widely-used Dropbox, with the difference being that Nextcloud is free and open-source, 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"
@@ -26,6 +26,6 @@ googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
 <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,44 @@
-<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="Njalla - Domain Registration"
+  image="/assets/img/provider/Njalla.png"
+  description="Njalla is a privacy-aware domain registration service based in Nevis that only needs your email or XMPP address in order to register a domain name for you. It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal."
+  website="https://njal.la/"
+  tor="http://njalladnspotetti.onion"
+  forum="https://forum.privacytools.io/t/discussion-njalla/339"
+%}
+
+{%
+  include cardv2.html
+  title="DNSCrypt-Proxy - Tool"
+  image="/assets/img/tools/DNSCrypt-Proxy.png"
+  description="DNSCrypt-Proxy is a command-line DNS proxy with support for the encrypted DNS protocols, DNS over HTTPS and DNSCrypt. Can cache results to improve speed, and allows filtering, forwarding, and cloaking."
+  website="https://github.com/jedisct1/dnscrypt-proxy/"
+  forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
+  github="https://github.com/jedisct1/dnscrypt-proxy/"
+  windows="https://github.com/jedisct1/dnscrypt-proxy/releases"
+  linux=""
+  mac="https://github.com/jedisct1/dnscrypt-proxy/releases"
+  freebsd="https://www.freshports.org/dns/dnscrypt-proxy2/"
+  openbsd="http://openports.se/net/dnscrypt-proxy"
+  netbsd="http://pkgsrc.se/net/dnscrypt-proxy2"
+  android=""
+  ios=""
+%}
+
+<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>
@@ -33,10 +63,8 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://adguard.com/en/privacy/dns.html">
-            <span class="fas fa-globe"></span>
+          <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">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>Commercial</td>
@@ -53,10 +81,8 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://github.com/AdguardTeam/AdGuardDNS/">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/AdguardTeam/AdGuardDNS/" href="https://github.com/AdguardTeam/AdGuardDNS/">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>
@@ -85,13 +111,9 @@
           </span>
         </td>
         <td>
-          <div
-            class="btn-secondary btn-icon"
-            title="&quot;No logs.&quot;"
-            data-toggle="tooltip"
-            data-placement="bottom">
-            <span class="fas fa-globe"></span>
-          </div>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"No logs."'>
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
         </td>
         <td>Hobby Project</td>
         <td>No</td>
@@ -116,10 +138,8 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://github.com/ookangzheng/blahdns/">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/ookangzheng/blahdns/" href="https://github.com/ookangzheng/blahdns/">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>
@@ -146,15 +166,13 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://www.cloudflare.com/privacypolicy/">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.cloudflare.com/privacypolicy/" href="https://www.cloudflare.com/privacypolicy/">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </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>
@@ -173,12 +191,8 @@
           </span>
         </td>
         <td>
-          <div
-            class="btn-secondary btn-icon"
-            title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;"
-            data-toggle="tooltip"
-            data-placement="bottom">
-            <span class="fas fa-globe"></span>
+          <a 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."'>
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </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>
@@ -202,10 +216,8 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc">
-            <span class="fas fa-globe"></span>
+          <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">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>Hobby Project</td>
@@ -245,10 +257,8 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://appliedprivacy.net/privacy-policy">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://appliedprivacy.net/privacy-policy" href="https://appliedprivacy.net/privacy-policy">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>Non-Profit</td>
@@ -283,10 +293,8 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://www.nextdns.io/privacy">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.nextdns.io/privacy" href="https://www.nextdns.io/privacy">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>Commercial</td>
@@ -325,10 +333,8 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://nixnet.xyz/privacy/">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://nixnet.xyz/privacy/" href="https://nixnet.xyz/privacy/">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>
@@ -346,10 +352,8 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://git.nixnet.xyz/NixNet/dns">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://git.nixnet.xyz/NixNet/dns" href="https://git.nixnet.xyz/NixNet/dns">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>
@@ -370,10 +374,8 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://powerdns.org/doh/privacy.html">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://powerdns.org/doh/privacy.html" href="https://powerdns.org/doh/privacy.html">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>Hobby Project</td>
@@ -383,10 +385,8 @@
         <td>No</td>
         <td>No</td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://github.com/PowerDNS/pdns">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/PowerDNS/pdns" href="https://github.com/PowerDNS/pdns">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>
@@ -407,10 +407,8 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://quad9.net/policy/">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://quad9.net/policy/" href="https://quad9.net/policy/">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>Non-Profit</td>
@@ -443,10 +441,8 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://securedns.eu/#privacy">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://securedns.eu/#privacy" href="https://securedns.eu/#privacy">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
         <td>Hobby Project</td>
@@ -478,14 +474,12 @@
           </span>
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://snopyta.org/privacy_policy/">
-            <span class="fas fa-globe"></span>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://snopyta.org/privacy_policy/" href="https://snopyta.org/privacy_policy/">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </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/">
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='Part of LibreHosters, "a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms."' href="https://libreho.st/">
             Informal collective
           </a>
         </td>
@@ -527,13 +521,9 @@
           </span>
         </td>
         <td>
-          <div
-            class="btn-secondary btn-icon"
-            title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;"
-            data-toggle="tooltip"
-            data-placement="bottom">
-            <span class="fas fa-globe"></span>
-          </div>
+          <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."'>
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
         </td>
         <td>Hobby Project</td>
         <td>No</td>
@@ -552,3 +542,82 @@
     </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>dig +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>). If you are on Windows 10, run <code>Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl</code> from the PowerShell. You should see this display: <code>"HOORAY - QNAME minimisation is enabled on your resolver :)!"</code></li>
+</ul>
+
+<h3 id="clients">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://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>
+      <li><em><a href="https://nlnetlabs.nl/projects/unbound/about/">Unbound</a></em> - a validating, recursive, caching DNS resolver. It can also be ran network-wide and has supported DNS-over-TLS since version 1.7.3.</li>
+      <ul>
+          <li>See also <a href="https://www.ctrl.blog/entry/unbound-tls-forwarding.html">Actually secure DNS over TLS in Unbound on ctrl.blog</a>.</li>
+      </ul>
+    </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,34 @@
+<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="https://github.com/Bitmessage/PyBitmessage/releases"
+mac="https://github.com/Bitmessage/PyBitmessage/releases"
+linux="https://repology.org/project/pybitmessage/versions"
+%}
+
+{% 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="https://retroshare.cc/downloads.html#windows"
+mac="https://retroshare.cc/downloads.html#mac"
+linux="https://retroshare.cc/downloads.html#gnulinux"
+freebsd="https://retroshare.cc/downloads.html#freebsd"
+%}
+
+
+<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,8 +2,8 @@
 
 {% include cardv2.html
 title="Thunderbird"
-image="/assets/img/svg/3rd-party/thunderbird.svg"
-description="Thunderbird is a free, open source, cross-platform email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client developed by the Thunderbird community, and previously by the Mozilla Foundation."
+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 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/"
@@ -17,7 +17,7 @@ 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"

_includes/sections/email-providers.html

@@ -24,19 +24,10 @@
 
       <tr>
         <td data-value="disroot">
-          <img
-            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">
+          <img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://disroot.org">
-            <span class="fas fa-globe"></span>
-          </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>
         </td>
         <td data-value="2015">2015</td>
         <td>
@@ -53,19 +44,10 @@
 
       <tr>
         <td data-value="kolabnow">
-          <img
-            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">
+          <img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://kolabnow.com">
-            <span class="fas fa-globe"></span>
-          </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>
         </td>
         <td data-value="2010">2010</td>
         <td>
@@ -76,21 +58,17 @@
         <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="1"><span class="label label-success">Built-in</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/svg/3rd-party/mailboxorg.svg" width="200" height="70">
+          <img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
 
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://mailbox.org">
-            <span class="fas fa-globe"></span>
-          </a>
+          <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>
@@ -100,26 +78,17 @@
         </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">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="mailfence">
-          <img
-            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">
+          <img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
         </td>
         <td>
-          <a
-            href="https://mailfence.com"
-            class="btn-secondary btn-icon">
-            <span class="fas fa-globe"></span>
-          </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>
         </td>
         <td data-value="2013">2013</td>
         <td>
@@ -135,15 +104,31 @@
       </tr>
 
       <tr>
-        <td data-value="posteo">
-          <img alt="Posteo" src="/assets/img/svg/3rd-party/posteo.svg" width="200" height="70">
+        <td data-value="neomailbox">
+          <img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://posteo.de">
-            <span class="fas fa-globe"></span>
-          </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>
+        </td>
+        <td data-value="2003">2003</td>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-ch"></span> Switzerland
+          </span>
+        </td>
+        <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>
@@ -160,22 +145,11 @@
 
       <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
-            class="btn-secondary btn-icon"
-            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>
+          <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>
+          <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>
         </td>
         <td data-value="2013">2013</td>
         <td>
@@ -192,19 +166,11 @@
 
       <tr>
         <td data-value="runbox">
-          <img
-            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">
+          <img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
+
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://runbox.com">
-            <span class="fas fa-globe"></span>
-          </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>
         </td>
         <td data-value="1999">1999</td>
         <td>
@@ -221,14 +187,10 @@
 
       <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
-            class="btn-secondary btn-icon"
-            href="https://soverin.net">
-            <span class="fas fa-globe"></span>
-          </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>
         </td>
         <td data-value="2015">2015</td>
         <td>
@@ -245,19 +207,10 @@
 
       <tr>
         <td data-value="startmail">
-          <img
-            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">
+          <img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://startmail.com">
-            <span class="fas fa-globe"></span>
-          </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>
         </td>
         <td data-value="2014">2014</td>
         <td>
@@ -267,26 +220,17 @@
         </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
-            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">
+          <img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70">
         </td>
         <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://tutanota.com">
-            <span class="fas fa-globe"></span>
-          </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>
         </td>
         <td data-value="2011">2011</td>
         <td>
@@ -310,12 +254,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 mr-3" alt="Mail-in-a-Box"></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

@@ -7,8 +7,7 @@
 {%
   include cardv2.html
   title="VeraCrypt - Disk Encryption"
-  image="/assets/img/svg/3rd-party/veracrypt.svg"
-  image-dark="/assets/img/svg/3rd-party/veracrypt-dark.svg"
+  image="/assets/img/tools/VeraCrypt.png"
   description="<strong>VeraCrypt</strong> is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file or encrypt a partition or the entire storage device with pre-boot authentication. VeraCrypt is a fork of the discontinued TrueCrypt project. It was initially released on June 22, 2013. According to its developers, security improvements have been implemented and issues raised by the initial TrueCrypt code audit have been addressed."
   website="https://veracrypt.fr/"
   forum="https://forum.privacytools.io/t/discussion-veracrypt-file-encryption/1532"
@@ -21,7 +20,7 @@
 {%
   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."
   website="https://gnupg.org/"
   forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533"
@@ -39,7 +38,7 @@
 {%
   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."
   website="http://www.peazip.org"
   forum="https://forum.privacytools.io/t/discussion-peazip-file-encryption/1534"
@@ -54,8 +53,9 @@
 <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,10 +2,9 @@
 
 {% include cardv2.html
 title="Firefox Send"
-image="/assets/img/svg/3rd-party/firefox_send.svg"
-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."
+image="/assets/img/tools/Firefox-Send.png"
 website="https://send.firefox.com/"
+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 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/"
@@ -14,10 +13,10 @@ googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsen
 
 {% 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/"
-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."
+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, making it accessible as a Tor onion service, and generating an unguessable URL for you to share so that the recipients can 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"
@@ -29,7 +28,7 @@ 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"
 description="Magic Wormhole is a package that provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. Their motto: \"Get things from one computer to another, safely.\""
 forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756"
@@ -45,7 +44,6 @@ 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 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>
+  <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://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 Jabber server, to a wiki, or VPN.</li>
 </ul>

_includes/sections/file-sync.html

@@ -8,8 +8,8 @@
 {%
   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."
+  image="/assets/img/tools/Syncthing.png"
+  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's 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"
@@ -23,8 +23,8 @@
 {%
   include cardv2.html
   title="SparkleShare"
-  image="/assets/img/svg/3rd-party/sparkleshare.svg"
-  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."
+  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."
   website="https://sparkleshare.org/"
   forum="https://forum.privacytools.io/t/discussion-sparkleshare/1626"
   github="https://github.com/hbons/SparkleShare"
@@ -36,6 +36,7 @@
 
 <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,6 +1,6 @@
 <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 ml-2" alt="UKUSA Agreement">
 
 <p>The UKUSA Agreement is an agreement between the United Kingdom, United States, Australia, Canada, and New Zealand to cooperatively collect, analyze, and share intelligence. Members of this group, known as the <a href="https://www.giswatch.org/en/communications-surveillance/unmasking-five-eyes-global-surveillance-practices">Five Eyes</a>, focus on gathering and analyzing intelligence from different parts of the world. While Five Eyes countries have agreed to <a href="https://www.pbs.org/newshour/world/an-exclusive-club-the-five-countries-that-dont-spy-on-each-other">not spy on each other</a> as adversaries, leaks by Snowden have revealed that some Five Eyes members monitor each other's citizens and <a href="https://www.theguardian.com/uk/2013/jun/21/gchq-cables-secret-world-communications-nsa">share intelligence</a> to <a href="https://www.theguardian.com/politics/2013/jun/10/nsa-offers-intelligence-british-counterparts-blunkett">avoid breaking domestic laws</a> that prohibit them from spying on their own citizens. The Five Eyes alliance also cooperates with groups of third-party countries to share intelligence (forming the Nine Eyes and Fourteen Eyes); however, Five Eyes and third-party countries can and do spy on each other.</p>
 

_includes/sections/header.html

@@ -1,24 +1,17 @@
 <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>
+  <strong>New!</strong> Contributions to privacytools.io via <a href="https://opencollective.com/privacytoolsio" class="alert-link">OpenCollective</a> are now tax deductible! <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">
-    <a href="{{ site.production_url }}" title="{{ site.name }}">
-      <img class="img-fluid d-none d-sm-block" src="/assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="{{ site.name }}">
-      <div class="text-center">
-        <img class="img-fluid d-sm-none" src="/assets/img/svg/layout/brand/vertical.svg" width="300px" alt="{{ site.name }}">
-      </div>
-    </a>
-  </h1>
-  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. {{ site.name }} provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
+  <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>
+  <p class="lead">{% t header.lead %}</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="{%t header.search %}" 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>
+<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">{% t header.start_search %}</span></button>
 </span>
 </div>
 </form>

_includes/sections/hosting-provider.html

@@ -2,8 +2,7 @@
 
 {% include cardv2.html
 title="Data Center: Bahnhof"
-image="/assets/img/svg/3rd-party/bahnhof.svg"
-image-dark="/assets/img/svg/3rd-party/bahnhof-dark.svg"
+image="/assets/img/provider/bahnhof.png"
 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"
@@ -11,9 +10,8 @@ forum="https://forum.privacytools.io/t/discussion-bahnhof-net/341"
 
 {% include cardv2.html
 title="VPS & Domain: Njalla"
-image="/assets/img/svg/3rd-party/njalla.svg"
-image-dark="/assets/img/svg/3rd-party/njalla-dark.svg"
-description="Njalla is a privacy-aware domain registration service and VPS provider based in Nevis (with VPS data centers in Sweden). It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, Zcash, DASH, Bitcoin Cash and PayPal."
+image="/assets/img/provider/Njalla.png"
+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, DASH, Bitcoin Cash and PayPal."
 website="https://njal.la/"
 tor="http://njalladnspotetti.onion"
 forum="https://forum.privacytools.io/t/discussion-njalla/339"
@@ -21,7 +19,7 @@ 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"
@@ -29,7 +27,7 @@ forum="https://forum.privacytools.io/t/discussion-datacell-is/342"
 
 {% include cardv2.html
 title="VPS, Hosting, & Domain: 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,41 +1,16 @@
-<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>
+</div>
 
-<p>We only recommend instant messenger programs or apps that support <a href="https://en.wikipedia.org/wiki/End-to-end_encryption">end-to-end encryption (E2EE)</a>. When E2EE is used, all transmissions (messages, voice, video, etc.) are encrypted <strong>before</strong> they are sent from your device. E2EE protects both the authenticity and confidentiality of the transmission as they pass through any part of the network (servers, etc.).</p>
 
-<p>All the client programs/apps we chose are <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">free and open-source software</a> unless otherwise mentioned. This to ensure that the code can be independently verified by experts now and in the future.</p>
-
-<p>We have described the three main types of messaging programs that exist: Centralized, Federated and Peer-to-Peer (P2P), with the advantages and disadvantages of each.</p>
-
-<h2 id="centralized" class="anchor"><a href="#centralized"><i class="fas fa-link anchor-icon"></i></a> Centralized</h2>
-
-<p>Centralized messengers are those where every participant is on the same server or network of servers controlled by the same organization.</p>
-
-<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
+{% 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"
+image="/assets/img/tools/Signal.png"
+description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
+All communications are end-to-end encrypted. Signal is free and open source."
+labels="success:VoIP"
 website="https://signal.org/"
 forum="https://forum.privacytools.io/t/discussion-signal/664"
 github="https://github.com/signalapp"
@@ -44,162 +19,65 @@
 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"
+ios="https://apps.apple.com/us/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"
+
+{% include cardv2.html
+title="Wire"
+image="/assets/img/tools/wire.png"
+description="Wire is a free and end-to-end encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
+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"
+website="https://wire.com/"
+forum="https://forum.privacytools.io/t/discussion-wire/750"
+github="https://github.com/wireapp/"
+windows="https://wire.com/en/download"
+mac="https://wire.com/en/download"
+linux="https://wire.com/en/download"
+googleplay="https://play.google.com/store/apps/details?id=com.wire"
+android="https://wire.com/en/download"
+ios="https://itunes.apple.com/app/wire/id930944768?mt=8"
+web="https://app.wire.com"
 %}
 
-<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>
+<h3>Complete Comparison</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>
+	<li><a href="https://securechatguide.org/effguide.html">securechatguide.org</a> - Guide to Choosing a Messenger.</li>
+	<li><a href="https://www.securemessagingapps.com/">securemessagingapps.com</a> - Secure Messaging Apps Comparison.</li>
+  <li><a href="https://www.thinkprivacy.io/messengers.html">thinkprivacy.io</a> - Simple Secure Messaging Apps Comparison.</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
-  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/"
-%}
-
-<div>
-    <h4>Worth Mentioning</h4>
+<h3>Worth Mentioning</h3>
 
 <ul>
-        <li>Other <a href="https://matrix.org/clients">Matrix</a> clients, that may however be less feature complete than Riot.im.</li>
-        <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>
+  <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>
+  <li><a href="https://about.riot.im/">Riot</a> - An open-source, federated messenger that utilizes the Matrix protocol. This application is primarily recommended as a large group/team chat solution. While Riot has the ability to perform 1-on-1 communications we believe there are better solutions for direct communications.</li>
+  <li><a href="https://retroshare.cc/">RetroShare</a> - An end-to-end encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </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://gajim.org/">Gajim</a></li>
-            <li><a href="https://conversations.im">Conversations</a></li>
-            <li><a href="https://siskin.im/">Siskin</a></li>
-            <li>Other <a href="https://omemo.top">OMEMO</a> capable clients for XMPP.</li>
+    <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> is a community-driven instant messaging network based on XMPP.</li>
+  <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 text messaging, video and audio calls, file transfer, and video conferencing. <span class="badge badge-success">VoIP</span></li>
 </ul>
 
-    <h2 id="peer-to-peer" class="anchor"><a href="#peer-to-peer"><i class="fas fa-link anchor-icon"></i></a> Peer to Peer (P2P)</h2>
 
-    <p>Peer-to-Peer instant messengers connect directly to each other without requiring third-party servers. Clients (peers) usually find each other through the use of a <a href="https://en.wikipedia.org/wiki/Distributed_computing">distributed computing</a> network. Examples of this include <a href="https://en.wikipedia.org/wiki/Distributed_hash_table">DHT (distributed hash table)</a> (used with technologies like <a href="https://en.wikipedia.org/wiki/BitTorrent_(protocol)">torrents</a> and <a href="https://en.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a>, for example), 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"
-%}
-
-{%
-  include cardv2.html
-  title="Jami"
-  image="/assets/img/svg/3rd-party/jami.svg"
-  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."
-  labels="success:VoIP"
-  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>Related Information</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://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://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://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,7 +67,7 @@
 
 <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 ml-3" alt="USA">
 
 <p>Services based in the United States are not recommended because of the country's surveillance programs and use of <a href="https://www.eff.org/issues/national-security-letters/faq">National Security Letters</a> (NSLs) with accompanying gag orders, which forbid the recipient from talking about the request. This combination allows the government to <a href="https://www.schneier.com/blog/archives/2013/08/more_on_the_nsa.html">secretly force</a> companies to grant complete access to customer data and transform the service into a tool of mass surveillance.</p>
 

_includes/sections/live-operating-systems.html

@@ -1,26 +1,44 @@
-<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> {% t live_os.live_cd %}</h1>
+
+{%- capture live_os_tails_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
+{%- capture live_os_tails_descr -%}{% t live_os.tails_descr %}{%- endcapture -%}
+{%- capture live_os_knoppix_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
+{%- capture live_os_knoppix_descr -%}{% t live_os.knoppix_descr %}{%- endcapture -%}
+{%- capture live_os_puppy_linux_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
+{%- capture live_os_puppy_linux_descr -%}{% t live_os.puppy_linux_descr %}{%- endcapture -%}
 
 {% include cardv2.html
 title="Tails"
-image="/assets/img/svg/3rd-party/tails.svg"
-description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.'
+image="/assets/img/tools/Tails.png"
+description=live_os_tails_descr
 badges="info:GNU/Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels=live_os_tails_labels
 website="https://tails.boum.org/"
 git="https://git-tails.immerda.ch/tails/"
 %}
 
-<h3>Worth Mentioning</h3>
+{% include cardv2.html
+title="KNOPPIX"
+image="/assets/img/tools/KNOPPIX.png"
+description=live_os_knoppix_descr
+badges="info:GNU/Linux"
+labels=live_os_knoppix_labels
+website="https://www.knopper.net/knoppix/index-en.html"
+source="https://www.knopper.net/knoppix-info/index-en.html#license"
+%}
+
+{% include cardv2.html
+title="Puppy Linux"
+image="/assets/img/tools/Puppy-Linux.png"
+description=live_os_puppy_linux_descr
+badges="info:GNU/Linux"
+labels=live_os_puppy_linux_labels
+website="http://puppylinux.org/"
+source="http://distro.ibiblio.org/puppylinux/"
+%}
+
+<h3>{% t live_os.worth_mentioning %}</h3>
 
 <ul>
-  <li>
-    <a href="https://getfedora.org/">Fedora Workstation</a>
-    <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>
+  <li><a href="https://distro.ibiblio.org/tinycorelinux/">{% t live_os.tiny_core_linux %}</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t live_os.tiny_core_linux_descr %}</li>
 </ul>

_includes/sections/mobile-operating-systems.html

@@ -1,44 +1,51 @@
-<h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> Mobile Operating Systems</h1>
+<h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> {% t mobile_os.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>{% t mobile_os.google_warning %}</strong>
 </div>
 
+{%- capture mobile_os_lineageos_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
+{%- capture mobile_os_lineageos_descr -%}{% t mobile_os.lineageos_descr %}{%- endcapture -%}
+{%- capture mobile_os_ubuntu_touch_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
+{%- capture mobile_os_ubuntu_touch_descr -%}{% t mobile_os.ubuntu_touch_descr %}{%- endcapture -%}
+{%- capture mobile_os_grapheneos_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
+{%- capture mobile_os_grapheneos_descr -%}{% t mobile_os.grapheneos_descr %}{%- endcapture -%}
+
 {% include cardv2.html
 title="GrapheneOS"
-image="/assets/img/svg/3rd-party/grapheneos.svg"
-image-dark="/assets/img/svg/3rd-party/grapheneos-dark.svg"
-description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
+image="/assets/img/tools/GrapheneOS.png"
+image-dark="/assets/img/tools/GrapheneOS-dark.png"
+description=mobile_os_grapheneos_descr
 badges="info:AOSP"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels=mobile_os_grapheneos_labels
 website="https://grapheneos.org/"
 github="https://github.com/GrapheneOS/"
 %}
 
 {% include cardv2.html
 title="LineageOS"
-image="/assets/img/svg/3rd-party/lineageos.svg"
-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.'
+image="/assets/img/tools/LineageOS.png"
+description=mobile_os_lineageos_descr
 badges="info:AOSP"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels=mobile_os_lineageos_labels
 website="https://www.lineageos.org/"
 github="https://github.com/LineageOS"
 %}
 
 {% include cardv2.html
 title="Ubuntu Touch"
-image="/assets/img/svg/3rd-party/ubuntu.svg"
-description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are <a href=https://devices.ubuntu-touch.io/>supported.</a>"
+image="/assets/img/tools/Ubuntu-Touch.png"
+description=mobile_os_ubuntu_touch_descr
 badges="info:GNU/Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels=mobile_os_ubuntu_touch_labels
 website="https://ubuntu-touch.io/"
 github="https://github.com/ubports"
 %}
 
-<h3>Worth Mentioning</h3>
+<h3>{% t mobile_os.worth_mentioning %}</h3>
 
 <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://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>
+  <li><a href="https://www.replicant.us/">Replicant</a> <span class="badge badge-info">AOSP</span> - {% t mobile_os.replicant_descr %}</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="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t mobile_os.omnirom_descr %}</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="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t mobile_os.microg_descr %} {% t mobile_os.microg_lineage %} <a href="https://lineage.microg.org/">Lineage for microG</a>.</li>
 </ul>

_includes/sections/notebooks.html

@@ -6,7 +6,7 @@
 
 {% 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."
 website="https://joplinapp.org/"
 github="https://github.com/laurent22/joplin"
@@ -23,8 +23,8 @@ chrome="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmk
 
 {% include cardv2.html
 title="Standard Notes"
-image="/assets/img/svg/3rd-party/standard_notes.svg"
-description='Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. It features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors. It has also been <a href="https://s3.amazonaws.com/standard-notes/security/Report-SN-Audit.pdf">independently audited (PDF)</a>.'
+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. 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"
@@ -38,7 +38,7 @@ 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"
@@ -60,6 +60,7 @@ chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheih
 <h3>Worth Mentioning</h3>
 
 <ul>
+  <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> - An open-source and self-hosted solution. For PHP / MySQL servers.</li>
   <li><a href="https://orgmode.org">Org-mode</a> - A major mode for GNU Emacs. Org-mode is for keeping notes, maintaining TODO lists, planning projects, and authoring documents with a fast and effective plain-text system. </li>
 </ul>

_includes/sections/operating-systems.html

@@ -1,15 +1,20 @@
-<h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> PC Operating Systems</h1>
+<h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> {% t pc_os.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>{% t pc_os.ms_warning %}</strong>
 </div>
 
+{%- capture pc_os_contrib_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
+{%- capture pc_os_qubesos_descr -%}{% t pc_os.qubesos_descr %}{%- endcapture -%}
+{%- capture pc_os_debian_descr -%}{% t pc_os.debian_descr %}{%- endcapture -%}
+{%- capture pc_os_fedora_descr -%}{% t pc_os.fedora_descr %}{%- endcapture -%}
+
 {% include cardv2.html
 title="Qubes OS"
-image="/assets/img/svg/3rd-party/qubes_os.svg"
-description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.'
+image="/assets/img/tools/Qubes-OS.png"
+description=pc_os_qubesos_descr
 badges="info:Xen"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels=pc_os_contrib_labels
 website="https://www.qubes-os.org/"
 github="https://github.com/QubesOS"
 tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
@@ -17,31 +22,64 @@ tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
 
 {% include cardv2.html
 title="Fedora Workstation"
-image="/assets/img/svg/3rd-party/fedora.svg"
-description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.'
+image="/assets/img/tools/Fedora.png"
+description=pc_os_fedora_descr
 badges="info:GNU/Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels=pc_os_contrib_labels
 website="https://getfedora.org/"
 git="https://src.fedoraproject.org/"
 %}
 
 {% include cardv2.html
 title="Debian"
-image="/assets/img/svg/3rd-party/debian.svg"
-description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.'
+image="/assets/img/tools/Debian.png"
+description=pc_os_debian_descr
 badges="info:GNU/Linux"
 website="https://www.debian.org/"
 tor="http://sejnfjrq6szgca7v.onion"
 gitlab="https://salsa.debian.org/qa/debsources"
 %}
 
-<h3>Worth Mentioning</h3>
+<h3>{% t pc_os.worth_mentioning %}</h3>
 
 <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://www.archlinux.org/">Arch 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 simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
-    completely open source version of Arch Linux.</li>
-  <li><a href="https://trisquel.info/">Trisquel</a> <span class="badge badge-info">GNU/Linux</span> - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.</li>
-  <li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
-    and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
+  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - {% t pc_os.openbsd_descr %}</li>
+  <li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t pc_os.arch_descr %} <a href="https://www.parabola.nu/">Parabola</a> {% t pc_os.parabola_descr %}</li>
+  <li><a href="https://trisquel.info/">Trisquel</a> <span class="badge badge-info">GNU/Linux</span> - {% t pc_os.trisquel_descr %}</li>
+  <li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> - {% t pc_os.whonix_descr %}</li>
+</ul>
+
+<h3>{% t pc_os.warning %}</h3>
+
+<ul>
+  <li><a href="#win10"><i class="fas fa-link"></i> {% t pc_os.win10_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 Linux 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 l1tf=full,force mds=full,nosmt mitigations=auto,nosmt nosmt=force" | sudo tee /etc/default/grub.d/mitigations.cfg</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 these new kernel boot flags</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 everything referring to SMT 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/">Hardware vulnerabilities index on The Linux kernel user's and administrator's guide</a></li>
+  <li><a href="https://www.cyberciti.biz/faq/install-update-intel-microcode-firmware-linux/">How to install/update CPU microcode firmware on Linux</a> - Regardless of your CPU manufacturer, you should always install the latest microcode packages available to be protected from CPU vulnerabilities, especially if the command above reports <strong>no microcode</strong> in its output.</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>

_includes/sections/participate.html

@@ -1,38 +1,45 @@
 <div class="page-header">
-  <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> Participate with suggestions and constructive criticism</h1>
+  <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> {% t participate.participate %}</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>{% t participate.up_to_date %} {% t participate.software_updates %} {% t participate.follow_news %} {% t participate.keep_up %} {% t participate.find_an_issue %} <strong>{% t participate.talk_to_us %}</strong> {% t participate.find_us_on %} <a rel="me" href="https://social.privacytools.io/@privacytools">{% t participate.mastodon %}</a> {% t participate.or %} <a href="https://chat.privacytools.io">Matrix</a> {% t participate.at %} <code class="highlighter-rouge">#general:privacytools.io</code>.</p>
+
+{%- capture discourse -%}{% t participate.discourse %}{%- endcapture -%}
+{%- capture mastodon -%}{% t participate.follow %} Mastodon & Twitter{%- endcapture -%}
+{%- capture mastodon2 -%}{% t participate.mastodon_follow %}{%- endcapture -%}
+{%- capture github -%}{% t participate.github %}{%- endcapture -%}
+{%- capture github2 -%}{% t participate.github_d %}{%- endcapture -%}
+{%- capture contrib -%}<a class="btn btn-warning mb-1" href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">{% t participate.contributors %}</a>{%- endcapture -%}
 
 <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>'
-  description='Join our Discourse community to stay up to date on privacy news or make suggestions!'
+  description=discourse
   %}
 
   {% include card.html color="primary"
-  title="Follow on Mastodon & Twitter"
-  image="/assets/img/svg/3rd-party/mastodon.svg"
+  title=mastodon
+  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>'
-  description="Get the latest privacy-related updates from our Mastodon Feed. Follow us today!"
+  description=mastodon2
   %}
 
   {% include card.html color="warning"
-  title="Develop on GitHub"
+  title=github
   font="fab fa-github"
   url="https://github.com/privacytoolsIO/privacytools.io"
   website="GitHub"
-  description="The complete website source code is available on GitHub. Join our developer team!"
-  extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">Contributor List</a>'
+  description=github2
+  extra_button=contrib
   %}
 
 </div>
 
-<p>This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you.</p>
+<p>{% t participate.thanks %}</p>

_includes/sections/password-managers.html

@@ -7,7 +7,7 @@
 {%
   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."
   website="https://bitwarden.com/"
   forum="https://forum.privacytools.io/t/discussion-bitwarden/1343"
@@ -32,7 +32,7 @@
 {%
   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"
@@ -52,7 +52,7 @@
 {%
   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."
   website="https://lesspass.com/"
   forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
@@ -81,7 +81,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>
-    <a href="https://www.passwordstore.org/">Pass</a> - Pass is a bare-bones password store that keeps passwords using gpg2 encrypted files inside a simple directory tree residing at <code>~/.password-store</code>. It has a simple terminal interface where the user can perform the usual actions, and it's functionality can be extended by plugins. It can also be used in scripts without having to input the actual password in plain text.
-  </li>
+</ul>
+
+<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,7 +2,7 @@
 
 {% 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."
 website="https://privatebin.info/"
 forum="https://forum.privacytools.io/t/discussion-privatebin/296"
@@ -12,7 +12,7 @@ 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."
 website="https://cryptpad.fr/pad/"
 forum="https://forum.privacytools.io/t/discussion-cryptpad/1270"

_includes/sections/privacy-resources.html

@@ -1,43 +1,42 @@
-<h1 id="resources" class="anchor"><a href="#resources"><i class="fas fa-link anchor-icon"></i></a> More Privacy Resources</h1>
+<h1 id="resources" class="anchor"><a href="#resources"><i class="fas fa-link anchor-icon"></i></a> {% t privacy_resources.header %}</h1>
 
-<h3>Guides</h3>
+<h3>{% t privacy_resources.guides %}</h3>
 
 <ul>
-  <li><a href="https://ssd.eff.org/"><strong>Surveillance Self-Defense by EFF</strong></a> - Guide to defending yourself from surveillance by using secure technology and developing careful practices.</li>
-  <li><a href="https://github.com/cryptoseb/CryptoPaper"><strong>The Crypto Paper</strong></a> - Privacy, Security and Anonymity for Every Internet User.</li>
-  <li><a href="https://emailselfdefense.fsf.org/en/"><strong>Email Self-Defense by FSF</strong></a> - A guide to fighting surveillance with GnuPG encryption.</li>
-  <li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/"><strong>The Ultimate Privacy Guide</strong></a> - Excellent privacy guide written by the creators of the bestVPN.com website.</li>
-  <li><a href="https://www.ivpn.net/privacy-guides"><strong>IVPN Privacy Guides</strong></a> - These privacy guides explain how to obtain vastly greater freedom, privacy and anonymity through compartmentalization and isolation.</li>
-  <li><a href="https://fried.com/privacy"><strong>The Ultimate Guide to Online Privacy</strong></a> - Comprehensive "Ninja Privacy Tips" and 150+ tools.</li>
+  <li><a href="https://ssd.eff.org/"><strong>{% t privacy_resources.guide1 %}</strong></a> - {% t privacy_resources.guide1_d %}</li>
+  <li><a href="https://github.com/cryptoseb/CryptoPaper"><strong>{% t privacy_resources.guide2 %}</strong></a> - {% t privacy_resources.guide2_d %}</li>
+  <li><a href="https://emailselfdefense.fsf.org/en/"><strong>{% t privacy_resources.guide3 %}</strong></a> - {% t privacy_resources.guide3_d %}</li>
+  <li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/"><strong>{% t privacy_resources.guide4 %}</strong></a> - {% t privacy_resources.guide4_d %}</li>
+  <li><a href="https://www.ivpn.net/privacy-guides"><strong>{% t privacy_resources.guide5 %}</strong></a> - {% t privacy_resources.guide5_d %}</li>
+  <li><a href="https://fried.com/privacy"><strong>{% t privacy_resources.guide6 %}</strong></a> - {% t privacy_resources.guide6_d %}</li>
 </ul>
 
 <h3>Information</h3>
 
 <ul>
-  <li><a href="https://freedom.press/"><strong>Freedom of the Press Foundation</strong></a> - Supporting and defending journalism dedicated to transparency and accountability since 2012.</li>
-  <li><a href="https://www.erfahrungen.com/mit/anonymisierung/t/"><strong>Erfahrungen.com</strong></a> - German review aggregator website of privacy-related services.</li>
-  <li><a href="https://openwireless.org/"><strong>Open Wireless Movement</strong></a> - a coalition of Internet freedom advocates, companies, organizations, and technologists working to develop new wireless technologies and to inspire a movement of Internet openness.</li>
-  <li><a href="https://privacy.net/us-government-surveillance-spying-data"><strong>privacy.net</strong></a> - What does the US government know about you?</li>
-  <li><a href="https://www.reddit.com/r/privacytoolsIO/wiki/index"><strong>r/privacytoolsIO Wiki</strong></a> - Our Wiki on reddit.com.</li>
-  <li><a href="https://www.grc.com/securitynow.htm"><strong>Security Now!</strong></a> - Weekly Internet Security Podcast by Steve Gibson and Leo Laporte.</li>
-  <li><a href="https://www.jupiterbroadcasting.com/show/techsnap/"><strong>TechSNAP</strong></a> - Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry.</li>
-  <li><a href="https://tosdr.org/"><strong>Terms of Service; Didn't Read</strong></a> - "I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.</li>
-  <li><a href="https://codeberg.org/crimeflare/cloudflare-tor"><strong>The Great Cloudwall</strong></a> - Critique and information on why to avoid Cloudflare, a big company with a huge portion of the internet behind it.</li>
+  <li><a href="https://freedom.press/"><strong>{% t privacy_resources.info5 %}</strong></a> - {% t privacy_resources.info5_d %}</li>
+  <li><a href="https://www.erfahrungen.com/mit/anonymisierung/t/"><strong>{% t privacy_resources.info6 %}</strong></a> - {% t privacy_resources.info6_d %}</li>
+  <li><a href="https://openwireless.org/"><strong>{% t privacy_resources.info4 %}</strong></a> - {% t privacy_resources.info4_d %}</li>
+  <li><a href="https://privacy.net/us-government-surveillance-spying-data"><strong>{% t privacy_resources.info8 %}</strong></a> - {% t privacy_resources.info8_d %}</li>
+  <li><a href="https://www.reddit.com/r/privacytoolsIO/wiki/index"><strong>{% t privacy_resources.info1 %}</strong></a> - {% t privacy_resources.info1_d %}</li>
+  <li><a href="https://www.grc.com/securitynow.htm"><strong>{% t privacy_resources.info2 %}</strong></a> - {% t privacy_resources.info2_d %}</li>
+  <li><a href="https://www.jupiterbroadcasting.com/show/techsnap/"><strong>{% t privacy_resources.info3 %}</strong></a> - {% t privacy_resources.info3_d %}</li>
+  <li><a href="https://tosdr.org/"><strong>{% t privacy_resources.info7 %}</strong></a> - {% t privacy_resources.info7_d %}</li>
+  <li><a href="https://codeberg.org/crimeflare/cloudflare-tor"><strong>{% t privacy_resources.info9 %}</strong></a> - {% t privacy_resources.info9_d %}</li>
 </ul>
 
 <h3>Tools</h3>
 
 <ul>
-  <li><a href="https://ipleak.net/"><strong>ipleak.net</strong></a> - IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites.</li>
-  <li><a href="https://www.ghacks.net/2015/12/28/the-ultimate-online-privacy-test-resource-list/"><strong>The ultimate Online Privacy Test Resource List</strong></a> - A collection of Internet sites that check whether your web browser leaks information.</li>
-  <li><a href="https://prism-break.org/"><strong>PRISM Break</strong></a> - We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services.</li>
-  <li><a href="https://securityinabox.org/"><strong>Security in-a-Box</strong></a> - A guide to digital security for activists and human rights defenders throughout the world.</li>
-  <li><a href="https://securedrop.org/"><strong>SecureDrop</strong></a> - An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created
-    by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation.</li>
-  <li><a href="https://pack.resetthenet.org/"><strong>Reset The Net - Privacy Pack</strong></a> - Help fight to end mass surveillance. Get these tools to protect yourself and your friends.</li>
-  <li><a href="https://secfirst.org/"><strong>Security First</strong></a> - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.</li>
-  <li><a href="https://www.osalt.com/"><strong>Osalt</strong></a> - A directory to help you find open source alternatives to proprietary tools.</li>
-  <li><a href="https://alternativeto.net/"><strong>AlternativeTo</strong></a> - A directory to help find alternatives to other software, with the option to only show open source software</li>
+  <li><a href="https://ipleak.net/"><strong>{% t privacy_resources.tool1 %}</strong></a> - {% t privacy_resources.tool1_d %}</li>
+  <li><a href="https://www.ghacks.net/2015/12/28/the-ultimate-online-privacy-test-resource-list/"><strong>{% t privacy_resources.tool2 %}</strong></a> - {% t privacy_resources.tool2_d %}</li>
+  <li><a href="https://prism-break.org/"><strong>{% t privacy_resources.tool3 %}</strong></a> - {% t privacy_resources.tool3_d %}</li>
+  <li><a href="https://securityinabox.org/"><strong>{% t privacy_resources.tool4 %}</strong></a> - {% t privacy_resources.tool4_d %}</li>
+  <li><a href="https://securedrop.org/"><strong>{% t privacy_resources.tool5 %}</strong></a> - {% t privacy_resources.tool5_d %}</li>
+  <li><a href="https://pack.resetthenet.org/"><strong>{% t privacy_resources.tool6 %}</strong></a> - {% t privacy_resources.tool6_d %}</li>
+  <li><a href="https://secfirst.org/"><strong>{% t privacy_resources.tool7 %}</strong></a> - {% t privacy_resources.tool7_d %}</li>
+  <li><a href="https://www.osalt.com/"><strong>{% t privacy_resources.tool8 %}</strong></a> - {% t privacy_resources.tool8_d %}</li>
+  <li><a href="https://alternativeto.net/"><strong>{% t privacy_resources.tool9 %}</strong></a> - {% t privacy_resources.tool9_d %}</li>
 </ul>
 
-<p>Note: Just being open source does not make software secure!</p>
+<p>{% t privacy_resources.note %}</p>

_includes/sections/productivity-tools.html

@@ -3,7 +3,7 @@
 {%
   include cardv2.html
   title="CryptPad"
-  image="/assets/img/svg/3rd-party/cryptpad.svg"
+  image="/assets/img/provider/CryptPad.png"
   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"
@@ -14,7 +14,8 @@
 {%
   include cardv2.html
   title="Etherpad"
-  image="/assets/img/svg/3rd-party/etherpad.svg"
+  image="/assets/img/tools/Etherpad.png"
+  image-dark="/assets/img/tools/Etherpad-dark.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>."
   website="https://etherpad.org/"
   forum="https://forum.privacytools.io/t/discussion-etherpad-productivity-tools/1538"
@@ -31,8 +32,8 @@
 {%
   include cardv2.html
   title="Write.as"
-  image="/assets/img/svg/3rd-party/writeas.svg"
-  image-dark="/assets/img/svg/3rd-party/writeas-dark.svg"
+  image="/assets/img/tools/WriteAs.png"
+  image-dark="/assets/img/tools/WriteAs-dark.png"
   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"
@@ -69,7 +70,7 @@
 {%
   include cardv2.html
   title="MAT2"
-  image="/assets/img/svg/3rd-party/mat2.svg"
+  image="/assets/img/tools/MAT2.png"
   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"

_includes/sections/quotes.html

@@ -1,8 +1,8 @@
 <div class="page-header">
-  <h1>Privacy? I don't have anything to hide.</h1>
+  <h1>{% t quotes.header %}</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,17 +14,7 @@
    <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>
+<h4>{% t global.further_reading %}</h4>
 
 <ul>
   <li><a href="https://en.wikipedia.org/wiki/Nothing_to_hide_argument">Nothing to hide argument (Wikipedia)</a></li>
@@ -32,11 +22,11 @@
   <li><a href="https://papers.ssrn.com/sol3/papers.cfm?abstract_id=998565">'I've Got Nothing to Hide' and Other Misunderstandings of Privacy (Daniel J. Solove - San Diego Law Review)</a></li>
 </ul>
 
-<h1 id="quotes" class="anchor"><a href="#quotes"><i class="fas fa-link anchor-icon"></i></a> Quotes</h1>
+<h1 id="quotes" class="anchor"><a href="#quotes"><i class="fas fa-link anchor-icon"></i></a> {% t quotes.quotes %}</h1>
 
 <blockquote class="blockquote">
-  <p>Ultimately, saying that you don't care about privacy because you have nothing to hide is no different from saying you don't care about freedom of speech because you have nothing to say.  Or that you don't care about freedom of the press because you don't like to read. Or that you don't care about freedom of religion because you don't believe in God. Or that you don't care about the freedom to peacably assemble because you're a lazy, antisocial agoraphobe. </p>
-  <footer class="blockquote-footer">Edward Snowden in <cite title="Permanent Record"><a href="https://en.wikipedia.org/wiki/Permanent_Record_(autobiography)">Permanent Record</a></cite></footer>
+  <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 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

@@ -1,55 +1,68 @@
-<h1 id="os" class="anchor">Privacy Tools</h1>
+<h1 id="os" class="anchor">{% t resources.tools %}</h1>
 
-<p><a href="/classic/"><i class="fas fa-info-circle"></i> Prefer the classic site? View a single-page layout.</a></p>
+<p><a href="/classic/"><i class="fas fa-info-circle"></i> {%t resources.classic %}</a></p>
+
+{%- capture title1 -%}{% t resources.providers %}{%- endcapture -%}
+{%- capture descr1 -%}{% t resources.providers_description %}{%- endcapture -%}
+{%- capture title2 -%}{% t resources.browsers %}{%- endcapture -%}
+{%- capture descr2 -%}{% t resources.browsers_description %}{%- endcapture -%}
+{%- capture title3 -%}{% t resources.software %}{%- endcapture -%}
+{%- capture descr3 -%}{% t resources.software_description %}{%- endcapture -%}
+{%- capture title4 -%}{% t resources.os %}{%- endcapture -%}
+{%- capture descr4 -%}{% t resources.os_description %}{%- endcapture -%}
+{%- capture title5 -%}{% t resources.services %}{%- endcapture -%}
+{%- capture descr5 -%}{% t resources.services_description %}{%- endcapture -%}
+{%- capture title6 -%}{% t resources.donate %}{%- endcapture -%}
+{%- capture descr6 -%}{% t resources.donate_description %}{%- endcapture -%}
 
 <div class="row">
 
   {% include card.html color="success"
-  title="Providers"
+  title=title1
   icon="fas fa-server"
   iconcolor="dark"
   page="/providers/"
-  description="Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!"
+  description=descr1
   %}
 
   {% include card.html color="primary"
-  title="Web Browsers"
+  title=title2
   icon="far fa-compass"
   iconcolor="dark"
   page="/browsers/"
-  description="Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks."
+  description=descr2
   %}
 
   {% include card.html color="warning"
-  title="Software"
+  title=title3
   icon="far fa-window-restore"
   iconcolor="dark"
   page="/software/"
-  description="Discover a variety of open source software built to protect your privacy and keep your digital data secure."
+  description=descr3
   %}
 
   {% include card.html color="info"
-  title="Operating Systems"
+  title=title4
   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=descr4
   %}
 
   {% include card.html color="secondary"
-  title="PrivacyTools Services"
+  title=title5
   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=descr5
   %}
 
   {% include card.html color="danger"
-  title="Donate"
+  title=title6
   icon="fas fa-donate"
   iconcolor="dark"
   page="/donate/"
-  description="We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating."
+  description=descr6
   %}
 
 </div>

_includes/sections/router-firmware.html

@@ -1,40 +1,44 @@
-<h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> Open Source Router Firmware</h1>
+<h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> {% t router.firmware %}</h1>
+
+{%- capture router_openwrt_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
+{%- capture router_openwrt_descr -%}{% t router.openwrt_descr %}{%- endcapture -%}
+{%- capture router_pfsense_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
+{%- capture router_pfsense_descr -%}{% t router.pfsense_descr %}{%- endcapture -%}
+{%- capture router_librecmc_descr -%}{% t router.librecmc_descr %}{%- endcapture -%}
+
 
 {% include cardv2.html
 title="OpenWrt"
-image="/assets/img/svg/3rd-party/openwrt.svg"
-image-dark="/assets/img/svg/3rd-party/openwrt-dark.svg"
-description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers."
+image="/assets/img/tools/OpenWrt.png"
+description=router_openwrt_descr
 badges="info:Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels=router_openwrt_labels
 website="https://openwrt.org/"
 git="https://git.openwrt.org/"
 %}
 
 {% include cardv2.html
 title="pfSense"
-image="/assets/img/svg/3rd-party/pfsense.svg"
-image-dark="/assets/img/svg/3rd-party/pfsense-dark.svg"
-description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
+image="/assets/img/tools/pfSense.png"
+description=router_pfsense_descr
 badges="info:BSD"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels=router_pfsense_labels
 website="https://www.pfsense.org/"
 github="https://github.com/pfsense/"
 %}
 
 {% include cardv2.html
 title="LibreCMC"
-image="/assets/img/svg/3rd-party/librecmc.svg"
-image-dark="/assets/img/svg/3rd-party/librecmc-dark.svg"
-description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)."
+image="/assets/img/tools/LibreCMC.png"
+description=router_librecmc_descr
 badges="info:GNU/Linux"
 website="https://librecmc.org"
 git="https://gogs.librecmc.org/libreCMC/libreCMC"
 %}
 
-<h3>Worth Mentioning</h3>
+<h3>{% t router.worth_mentioning %}</h3>
 
 <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://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - {% t router.openbsd_descr %}</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="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t router.ddwrt_descr %}</li>
 </ul>

_includes/sections/search-engines.html

@@ -6,17 +6,25 @@
 
 {% include cardv2.html
 title="searx - Decentral"
-image="/assets/img/svg/3rd-party/searx.svg"
-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>.'
+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. <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="StartPage is a search engine that provides 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>'
 website="https://duckduckgo.com/"
 tor="http://3g2upl4pq6kufc4m.onion"
@@ -26,7 +34,7 @@ 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.'
 website="https://www.qwant.com/"
 forum="https://forum.privacytools.io/t/discussion-qwant/286"
@@ -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://jivesearch.com/">Jive Search</a> - A free-software search engine with a similar look and feel to Google.</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.</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://www.mojeek.com/">Mojeek</a> - Independent and unbiased search results with no user tracking.</li>
 </ul>

_includes/sections/self-contained-networks.html

@@ -4,66 +4,49 @@
   <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">
+
+  {% include card.html color="success"
   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/"
+  image="/assets/img/tools/Tor-Project.png"
+  url="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"
+  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>'
+  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."
   %}
 
-{% include cardv2.html
+  {% include card.html color="primary"
   title="I2P Anonymous Network"
-image="/assets/img/svg/3rd-party/i2p.svg"
-image-dark="/assets/img/svg/3rd-party/i2p-dark.svg"
-description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous Web surfing, chatting, blogging, and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open-source and is published under multiple licenses."
-website="https://geti2p.net/"
-forum="https://forum.privacytools.io/t/discussion-i2p/1590"
-i2p="http://i2p-projekt.i2p/"
-windows="https://geti2p.net/en/download#windows"
-mac="https://geti2p.net/en/download#mac"
-linux="https://geti2p.net/en/download#unix"
-freebsd="https://www.freshports.org/security/i2p/"
-openbsd="http://openports.se/net/i2pd"
-netbsd="http://pkgsrc.se/wip/i2pd"
-fdroid="https://f-droid.org/app/net.i2p.android.router"
-googleplay="https://play.google.com/store/apps/details?id=net.i2p.android"
-android="https://download.i2p2.de/android/current/"
-source="https://geti2p.net/en/get-involved/guides/new-developers#getting-the-i2p-code"
+  image="/assets/img/tools/I2P.png"
+  url="https://geti2p.net/"
+  footer="OS: Windows, macOS, Linux, Android, BSD / Solaris."
+  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."
   %}
 
-{% include cardv2.html
+  {% include card.html color="warning"
   title="The Freenet Project"
-image="/assets/img/svg/3rd-party/freenet.svg"
-description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech on the Internet with strong anonymity protection."
-website="https://freenetproject.org/"
-forum="https://forum.privacytools.io/t/discussion-freenet/1591"
-windows="https://freenetproject.org/pages/download.html#windows"
-mac="https://freenetproject.org/pages/download.html#os-x"
-linux="https://freenetproject.org/pages/download.html#gnulinux-posix"
-freebsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
-openbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
-netbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
-github="https://github.com/freenet/"
+  image="/assets/img/tools/Freenet.png"
+  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://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">
     <span class="badge badge-danger" data-toggle="tooltip" title="">

_includes/sections/selfhosted-cloud.html

@@ -6,8 +6,8 @@
 
 {% include cardv2.html
 title="Nextcloud"
-image="/assets/img/svg/3rd-party/nextcloud.svg"
-description="<strong>Nextcloud</strong> is a suite of client-server software for creating 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."
+image="/assets/img/provider/Nextcloud.png"
+description="Nextcloud has similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, 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"
 windows="https://nextcloud.com/install/#install-clients"
@@ -24,8 +24,8 @@ github="https://github.com/nextcloud"
 
 {% include cardv2.html
 title="Tahoe-LAFS"
-image="/assets/img/svg/3rd-party/tahoe-lafs.svg"
-image-dark="/assets/img/svg/3rd-party/tahoe-lafs-dark.svg"
+image="/assets/img/tools/Tahoe-LAFS.png"
+image-dark="/assets/img/tools/Tahoe-LAFS-dark.png"
 website="https://www.tahoe-lafs.org/"
 forum="https://forum.privacytools.io/t/discussion-tahoe-lafs/1662"
 description="Tahoe-LAFS is a free and open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."

_includes/sections/social-networks.html

@@ -6,8 +6,8 @@
 
 {% include cardv2.html
 title="Mastodon - Twitter Alternative"
-image="/assets/img/svg/3rd-party/mastodon.svg"
-description='Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like email, users can exist on different servers or even different platforms but still communicate with each other. It also has the most users, and the most diverse (in terms of interests) users, it looks good, and it is easy to setup yourself. If you are looking for a server to join, you are welcome to join our hosted instance: <a href="https://social.privacytools.io/">social.privacytools.io</a>'
+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. 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"
@@ -25,8 +25,8 @@ web="https://joinmastodon.org/#getting-started"
 
 {% include cardv2.html
 title="diaspora* - Google+ Alternative"
-image="/assets/img/svg/3rd-party/diaspora.svg"
-description="diaspora* is based on three key philosophies: Decentralization, Freedom, and Privacy. It is intended to address privacy concerns related to centralized social networks by allowing users set up their own server (or \"pod\") to host content. Pods can then interact to share status updates, photographs, and other social data."
+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."
 website="https://diasporafoundation.org/"
 forum="https://forum.privacytools.io/t/discussion-diaspora/290"
 github="https://github.com/diaspora/diaspora"
@@ -36,7 +36,7 @@ web="https://diasporafoundation.org/"
 
 {% 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"
@@ -50,8 +50,8 @@ web="https://friendi.ca/"
 
 {% include cardv2.html
 title="PixelFed - Instagram Alternative"
-image="/assets/img/svg/3rd-party/pixelfed.svg"
-description='PixelFed is a free and ethical photo sharing platform, powered by ActivityPub federation. Pixelfed is an open-source, federated platform. You can run your own instance or <a href="https://fediverse.party/en/pixelfed/">join an existing one.</a>'
+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 one.</a>'
 website="https://pixelfed.org/"
 forum="https://forum.privacytools.io/t/discussion-pixelfed/293"
 github="https://github.com/pixelfed"
@@ -59,20 +59,13 @@ web="https://pixelfed.org/"
 %}
 
 {% include cardv2.html
-title="Pleroma - Twitter Alternative"
-image="/assets/img/svg/3rd-party/pleroma.svg"
-description="Pleroma is a free, federated social networking server built on open protocols. It is compatible with Mastodon and many other ActivityPub and OStatus implementations."
-website="https://pleroma.social"
-forum="https://forum.privacytools.io/t/discussion-pleroma/2307"
-gitlab="https://git.pleroma.social/pleroma/pleroma/"
-windows="https://docs-develop.pleroma.social/backend/clients/#desktop"
-mac="https://docs-develop.pleroma.social/backend/clients/#desktop"
-linux="https://docs-develop.pleroma.social/backend/clients/#desktop"
-android="https://docs-develop.pleroma.social/backend/clients/#handheld"
-fdroid="https://docs-develop.pleroma.social/backend/clients/#handheld"
-googleplay="https://docs-develop.pleroma.social/backend/clients/#handheld"
-ios="https://docs-develop.pleroma.social/backend/clients/#handheld"
-web="https://docs-develop.pleroma.social/backend/clients/#alternative-web-interfaces"
+title="GNU social - Twitter Alternative"
+image="/assets/img/provider/gnu-social.png"
+description="GNU social is 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://gnu.io/social/"
+forum="https://forum.privacytools.io/t/discussion-gnu-social/292"
+gitlab="https://git.gnu.io/gnu/gnu-social/"
+web="https://gnu.io/social/"
 %}
 
 <h3>Worth Mentioning</h3>
@@ -80,3 +73,18 @@ web="https://docs-develop.pleroma.social/backend/clients/#alternative-web-interf
   <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>
 </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,7 +6,7 @@
 
 {% 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.'
 website="https://getaether.net/"
 forum="https://forum.privacytools.io/t/discussion-aether/1256"
@@ -18,7 +18,7 @@ linux="https://getaether.net/download/"
 
 {% 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"
@@ -28,7 +28,7 @@ web="https://tildes.net"
 
 {% 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"

_includes/sections/teamchat.html

@@ -6,11 +6,10 @@
 
 {%
   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>'
+  title="Riot.im (Matrix)"
+  image="/assets/img/tools/Riot.png"
+  description="Riot.im is a federated free-software messaging application based on the <a href\"https://matrix.org/\">Matrix</a> protocol, a recent open protocol for real-time communication offering optional E2E encryption. It also has bridging functionality, allowing you to connect to other chat protocols such as IRC or Telegram."
+  labels="warning:<a href=//github.com/vector-im/riot-web/issues/6779>Experimental E2EE</a>:The end-to-end encryption is currently in beta, and the mobile client states 'End-to-end encryption is in beta and may not be reliable. You should not yet trust it to secure data.'"
   website="https://about.riot.im/"
   forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
   github="https://github.com/vector-im/riot-web/"
@@ -19,14 +18,14 @@
   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"
+  ios="https://itunes.apple.com/us/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."
   website="https://rocket.chat/"
@@ -43,9 +42,9 @@
 {%
   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 through 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."
+  image="/assets/img/tools/keybase.png"
+  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>: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/"
@@ -54,8 +53,15 @@
   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/"
+  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage&hl=en_US"
+  ios="https://keybase.io/_/download/keybase-for-ios"
+  firefox="https://addons.mozilla.org/en-US/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,7 +6,7 @@
 
 {% 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."
 forum="https://forum.privacytools.io/t/discussion-linphone/751"
@@ -21,7 +21,7 @@ ios="https://itunes.apple.com/us/app/linphone/id360065638?mt=8"
 
 {% 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."
 forum="https://forum.privacytools.io/t/discussion-mumble/1289"

_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
-        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">
+      <img src="/assets/img/provider/Mullvad.png" 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>
-    <h5><span class="badge badge-success">35 Countries</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>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>
+    <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">406+ Servers</span></h5>
+    <p>Mullvad has 409 servers in 39 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">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">526+ Servers</span></h5>
+    <p>ProtonVPN has 526 servers in 42 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">77+ Servers</span></h5>
+    <p>IVPN has 77 servers in 31 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 ml-3" alt="Warrant Canary Example">
 
 <p>A warrant canary is a posted document stating that an organization has not received any secret subpoenas during a specific period of time. If this document fails to be updated during the specified time then the user is to assume that the service has received such a subpoena and should stop using the service.</p>
 

_includes/sections/windows10.html

@@ -1,83 +1,83 @@
-<h1 id="win10" class="anchor"><a href="#win10"><i class="fas fa-link anchor-icon"></i></a> Don't use Windows 10 - It's a privacy nightmare</h1>
+<h1 id="win10" class="anchor"><a href="#win10"><i class="fas fa-link anchor-icon"></i></a> {% t windows_10.header %}</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
+  <strong>{% t windows_10.warning %}</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 ml-3" alt="{% t windows_10.alt %}">
 
 <ol>
-  <li><strong>Data syncing is by default enabled.</strong>
+  <li><strong>{% t windows_10.data %}</strong>
     <ul>
-      <li>Browsing history and open websites.</li>
-      <li>Apps settings.</li>
-      <li>WiFi hotspot names and passwords.</li>
+      <li>{% t windows_10.data1 %}</li>
+      <li>{% t windows_10.data2 %}</li>
+      <li>{% t windows_10.data3 %}</li>
     </ul>
   </li>
 
-  <li><strong>Your device is by default tagged with a unique advertising ID.</strong>
+  <li><strong>{% t windows_10.ad_id %}</strong>
     <ul>
-      <li>Used to serve you with personalized advertisements by third-party advertisers and ad networks.</li>
+      <li>{% t windows_10.ad_id1 %}</li>
     </ul>
   </li>
 
-  <li><strong>Cortana can collect any of your data.</strong>
+  <li><strong>{% t windows_10.cortana %}</strong>
     <ul>
-      <li>Your keystrokes, searches and mic input.</li>
+      <li>{% t windows_10.cortana1 %}</li>
     </ul>
     <ul>
-      <li>Calendar data.</li>
+      <li>{% t windows_10.cortana2 %}</li>
     </ul>
     <ul>
-      <li>Music you listen to.</li>
+      <li>{% t windows_10.cortana3 %}</li>
     </ul>
     <ul>
-      <li>Credit Card information.</li>
+      <li>{% t windows_10.cortana4 %}</li>
     </ul>
     <ul>
-      <li>Purchases.</li>
+      <li>{% t windows_10.cortana5 %}</li>
     </ul>
   </li>
 
-  <li><strong>Microsoft can collect any personal data.</strong>
+  <li><strong>{% t windows_10.collection %}</strong>
     <ul>
-      <li>Your identity.</li>
+      <li>{% t windows_10.collection1 %}</li>
     </ul>
     <ul>
-      <li>Passwords.</li>
+      <li>{% t windows_10.collection2 %}</li>
     </ul>
     <ul>
-      <li>Demographics.</li>
+      <li>{% t windows_10.collection3 %}</li>
     </ul>
     <ul>
-      <li>Interests and habits.</li>
+      <li>{% t windows_10.collection4 %}</li>
     </ul>
     <ul>
-      <li>Usage data.</li>
+      <li>{% t windows_10.collection5 %}</li>
     </ul>
     <ul>
-      <li>Contacts and relationships.</li>
+      <li>{% t windows_10.collection6 %}</li>
     </ul>
     <ul>
-      <li>Location data.</li>
+      <li>{% t windows_10.collection7 %}</li>
     </ul>
     <ul>
-      <li>Content like emails, instant messages, caller list, audio and video recordings.</li>
+      <li>{% t windows_10.collection8 %}</li>
     </ul>
   </li>
 
-  <li><strong>Your data can be shared.</strong>
+  <li><strong>{% t windows_10.sharing %}</strong>
     <ul>
-      <li>When downloading Windows 10, you are authorizing Microsoft to share any of above-mentioned data with any third-party, with or without your consent.</li>
+      <li>{% t windows_10.sharing1 %}</li>
     </ul>
   </li>
 </ol>
 
-<p><a class="btn btn-warning" href="https://www.winprivacy.de/english-home/">Download: W10Privacy</a></p>
+<p><a class="btn btn-warning" href="https://www.winprivacy.de/english-home/">{% t global.download %}: W10Privacy</a></p>
 
-<p>This tool uses some known methods that attempt to disable major tracking features in Windows 10.</p>
+<p>{% t windows_10.tool %}</p>
 
-<h3>Related Information</h3>
+<h3>{% t global.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>

_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,11 +2,9 @@
 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 %}
+  <h1 class="display-4">{{ page.title | flatify }}</h1>
+  {% if page.description and page.hidedesc != true %}<p class="lead">{{ page.description | flatify }}</p>{% endif %}
 </div>
 
 {{ content }}

_plugins/expand_nested_variable_filter.rb

@@ -0,0 +1,9 @@
+module Jekyll
+  module ExpandNestedVariableFilter
+    def flatify(input)
+      Liquid::Template.parse(input).render(@context)
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::ExpandNestedVariableFilter)

_sass/_vars.scss

@@ -24,4 +24,3 @@ $reddit:              #ff5700;
 $linkedin:            #4875b4;
 $email:               #444;
 $diaspora:            #2f3537;
-$tor:                 #7d4698;

_sass/ptio-font.scss

@@ -25,15 +25,13 @@
 
 [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 {
+.ptio-sailfish-os:before {
   display: inline-block;
   font-family: "ptio-font";
   font-style: normal;
@@ -49,7 +47,6 @@
 }
 
 .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"; }
@@ -57,4 +54,3 @@
 .ptio-netbsd:before { content: "\f104"; }
 .ptio-openbsd:before { content: "\f105"; }
 .ptio-sailfish-os:before { content: "\f106"; }
-.ptio-tor:before { content: "\f10b"; }

assets/css/dark.scss

@@ -99,9 +99,6 @@ img {
   border-color: darken($danger, 10%);
 }
 
-.btn-tor { background: desaturate($tor, 10%); }
-.btn-tor:hover { background: darken($tor, 5%); }
-
 .card {
   box-shadow: none !important;
 }
@@ -125,8 +122,7 @@ img {
 
 .card,
 .jumbotron,
-.list-group-item,
-ol.breadcrumb {
+.list-group-item {
   background: $dark-800;
 }
 

assets/css/style.scss

@@ -186,6 +186,13 @@ h2, h3:not(.h5), h4, h5 {
   white-space: nowrap;
 }
 
+footer {
+  img,
+  i {
+    margin-right: 1rem;
+  }
+}
+
 .hover-text-decoration-none:hover {
   text-decoration: none;
   -webkit-text-decoration-skip: object;
@@ -196,46 +203,6 @@ h2, h3:not(.h5), h4, h5 {
 }
 
 
-.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
  */
@@ -356,7 +323,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;