Use updated label functionality

The labels/badges functionality added to cardv2.html in cbe5de4cc2 work better here.

.github/CODEOWNERS

@@ -4,15 +4,13 @@
 /pages/ @privacytoolsIO/editorial
 /_includes/sections/ @privacytoolsIO/editorial
 /index.html @privacytoolsIO/editorial
-/font/ @dawidpotocki
 
 # Administration Related Files
-/pages/donate.html @JonahAragon @BurungHantu1605
+/donate.html @JonahAragon @BurungHantu1605
 /assets/js/redirects.js @JonahAragon
 /.well-known/ @JonahAragon
 /404.html @JonahAragon
-/.github/CODEOWNERS @JonahAragon @BurungHantu1605
+/.github/ @JonahAragon @BurungHantu1605
-/.github/FUNDING.yml @JonahAragon @BurungHantu1605
 /LICENSE.txt @JonahAragon @BurungHantu1605
 /.travis.yml @JonahAragon @Shifterovich @nitrohorse
 /CNAME @JonahAragon

.github/CONTRIBUTING.md

@@ -7,9 +7,6 @@ Please read this before contributing.
 - Be nice and respectful.
 - English only.
 - Be constructive.
-- Please feel free to *review changes* in the *files changed* tab of any
-  pull request at any time.
-- See also our [Code of Conduct](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md)
 
 ## Quality over Quantity
 
@@ -20,27 +17,20 @@ We're trying to keep it simple and promote the best tools, not all of them.
 - Easy to use. Could your mother use that tool or service? Usability is most important.
 - Cross-platform / Accessible.
 - Privacy respecting.
-- Open Source / Free Software is preferred but not required.
+- Open Source / free software is preferred but not required.
+- Must list source code in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md) (if applicable)
 - Prioritize Products without Vendor Lock-in (decentralized/self-hostable) or data interoperability.
 
 There can be exceptions if no software is available that meet the criteria.
 
 Note: This criteria applies to all of privacytools.io
-### Providers
+### Proividers
 - Prioritize Products by privacy respecting nationality.
 
-### DNS
-
-- Supports DoH or DoT (We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it).
-- Supports DNSSEC (https://dnssec.vs.uni-due.de/ can test your current DNS provider).
-- Doesn't log IP addresses during normal operation (If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs).
-- Preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10)
-
 ### VPN
-See https://www.privacytools.io/providers/vpn/#criteria for more details.
 - Prioritize Products by privacy respecting nationality.
 - Cannot be based in USA or UK.
-- Must be accessible via Open Source Software (e.g. OpenVPN, WireGuard)
+- Must be acessable via free software (i.e OpenVPN, WireGuard)
 - Use Encryption
 - Accept Cryptocurrency
 - No logging policy
@@ -48,16 +38,16 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details.
 ### Email
 - Outside of USA
 - Support SMTP SSL
-- Accessible Using Open Source Software (e.g. allows IMAP)
+- Accessable Using Free Software (i.e IMAP)
 
 ### Hardware
-- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or equivalent (if applicable)
+- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivlant (if applicable)
-- Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when available.
+- Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when avalible.
 - Cannot lock users to a particular platform.
 
 ### Software
 - Must be able to download over encrypted network (can be a mirror)
-- Must be Open Source Software
+- Must be free software
 
 ### Encryption
 - Only verifiable encryption is to be trusted
@@ -70,7 +60,3 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details.
 
 - 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.**

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/7_DNS_provider.md

@@ -33,4 +33,4 @@ labels: 🌐 website issue, 🗄️ DNS
 
 #### 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 -->
+* [ ] supports QNAME minimization <!-- if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,17 @@
-<!-- PLEASE READ OUR CODE OF CONDUCT (https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md) AND CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
+<!-- PLEASE READ OUR [CONTRIBUTING GUIDELINES](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
 
 ## Description
 
-Resolves: #none <!-- A link to the (discussion) issue resolved by this pull request. There must be a discussion issue here at GitHub, before a pull request of software/service suggestion can be considered for merging. -->
+Resolves: #none <!-- The number of the issue that is resolved by this pull request. If there is none, feel free to delete this line 
 
 #### Check List <!-- Please add an x in each box below, like so: [x] -->
 
-- [ ] I have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
+- [ ] I have read and understand [CONTRIBUTING.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
 
-- [ ] The project is [Free Libre](https://en.wikipedia.org/wiki/Free_software) and/or [Open Source](https://en.wikipedia.org/wiki/Open-source_software) Software
+- [ ] I have listed the source code for this project in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md).
 
-* Netlify preview for the mainly edited page: <!-- link or Non Applicable? Edit this in afterwards -->
+- [ ] This project is [free/libre software](https://www.wikipedia.org/wiki/Free_software).
 
-* Code repository of the project (if applicable):
+- [ ] This project has an [associated discussion](https://github.com/privacytoolsIO/privacytools.io/issues).
+
+Code Repository (if applicable): 

.gitignore

@@ -1,8 +1,5 @@
 _site/
+Gemfile
+Gemfile.lock
 .sass-cache/
-.jekyll-metadata
 .DS_Store
-font/assets/
-font/_sass/
-font/.fontcustom-manifest.json
-assets/webfonts/ptio-font-preview.html

.well-known/librehost.json

@@ -9,7 +9,7 @@
     "description": "privacytools.io is a socially motivated website that provides information and services for protecting your security and privacy online. No Ads, No Google Analytics, No Affiliates, and No Cross-Site Requests.",
     "communicationLanguages": ["en"],
     "contactUrl": "https://www.privacytools.io/contact/",
-    "privacyPolicyUrl" : "https://www.privacytools.io/privacy/",
+    "privacyPolicyUrl" : "https://www.privacytools.io/privacy-policy/",
     "termsOfServiceUrl" : "-",
     "isServiceProvider" : true,
     "foundingDate": "2015",

Gemfile

@@ -1,13 +1,11 @@
 source "https://rubygems.org"
 
 # Install github-pages gem (https://jekyllrb.com/docs/github-pages/)
-gem "jekyll", group: :jekyll_plugins
+gem "github-pages", 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
@@ -15,3 +13,4 @@ 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,70 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    colorator (1.1.0)
-    concurrent-ruby (1.1.5)
-    em-websocket (0.5.1)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.7)
-    ffi (1.11.1)
-    forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
-      addressable (~> 2.4)
-      colorator (~> 1.0)
-      em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
-      liquid (~> 4.0)
-      mercenary (~> 0.3.3)
-      pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
-      safe_yaml (~> 1.0)
-    jekyll-multiple-languages-plugin (1.6.0)
-      jekyll (>= 2.0, < 4.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
-    jekyll-watch (2.2.1)
-      listen (~> 3.0)
-    kramdown (1.17.0)
-    liquid (4.0.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mercenary (0.3.6)
-    pathutil (0.16.2)
-      forwardable-extended (~> 2.6)
-    public_suffix (3.1.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    rouge (2.2.1)
-    ruby_dep (1.5.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)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  jekyll
-  jekyll-multiple-languages-plugin
-  jekyll-sitemap
-  tzinfo-data
-
-BUNDLED WITH
-   2.0.1

README.md

@@ -8,7 +8,7 @@ _Encryption Against Global Mass Surveillance._
 
 It's important for a website like privacytools.io to be up-to-date. Keep an eye on software updates of the applications listed here. Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So if you find an error, or you think a provider should not be listed here, or a qualified service provider is missing or a browser plugin is not the best choice anymore or anything else...
 
-**Talk to us please.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) or [our Discourse community](https://forum.privacytools.io/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. Thank you for participating.
+**Talk to us please.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. Thank you for participating.
 
 You can submit your suggestions here on GitHub [(Issues)](https://github.com/privacytoolsIO/privacytools.io/issues) and also in our [subreddit](https://www.reddit.com/r/privacytoolsIO/). Please refer to the [Contributing Guidelines](.github/CONTRIBUTING.md) before submitting. Thank you.
 
@@ -24,7 +24,7 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri
 - [Donate.](https://www.privacytools.io/donate/)
 - [Liberapay](https://liberapay.com/privacytools.io/donate) or [Patreon.](https://www.patreon.com/privacytools)
 - [Spread the word.](https://www.privacytools.io/#participate)
-- [Join our Discourse community.](https://forum.privacytools.io/)
+- [Join our Discourse community](https://forum.privacytools.io/)
 - [Make suggestions on reddit.](https://www.reddit.com/r/privacytoolsIO/)
 - View and edit our website source code here on GitHub.
 
@@ -39,5 +39,4 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri
 - [Português / Portuguese](https://www.privacidade.digital/) - [GitHub](https://github.com/PrivacidadeDigital/privacidade.digital)
 
 # License
-
+[Creative Commons Zero v1.0 Universal](https://www.privacytools.io/LICENSE.txt)
-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.

SECURITY.md

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

_config.yml

@@ -5,10 +5,6 @@ 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

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

@@ -1,3 +0,0 @@
-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/card.html

@@ -1,4 +1,4 @@
-<div class="col-xl-4 col-lg-6 col-md-12 mb-4">
+<div class="col-xl-4 col-lg-6 col-md-12 mb-2">
     <div class="card card-{{include.color}}">
         {% if include.color == "warning" %}
         <div class="card-header text-dark bg-{{include.color}}">
@@ -31,15 +31,13 @@
               <img src="{{include.image}}" width="120" height="120" alt="{{include.title}}" class="panel-item">
               {% elsif include.icon %}
               <i class="{{ include.icon }} panel-icon{% if include.iconcolor %} text-{{include.iconcolor}}{% endif %}"></i>
-              {% elsif include.font %}
-              <span class="{{ include.font }} panel-item panel-font" alt="{{ include.title }}"></span>
               {% endif %}
               {{include.description}}
             </p>
             <div>
             <p>
                 {% if include.url %}
-                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">
+                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">Website:
                     {% if include.website %}
                         {{include.website}}
                     {% else %}

_includes/cardv2.html

@@ -2,297 +2,88 @@
   <div class="card-header text-white bg-secondary">
     <h3 class="h5">
       {% if include.badges %}
-      <span class="mr-2">{{ include.title }}</span>
+      <span class="mr-2">{{include.title}}</span>
-      {% assign badges = include.badges | split:"|" %}
+      {% assign badges = include.badges | replace:", ", "," | split:"," %}
-        {% for badge in badges %}
+          {% for badge in badges %}
-          {% assign badge_data = badge | split:":" %}
+              {% assign badge_data = badge | split:":" %}
-          {% assign color = badge_data[0] %}
+              {% assign color = badge_data[0] %}
-          {% assign text = badge_data[1] %}
+              {% assign text = badge_data[1] %}
-          {% assign tooltip = badge_data[2] | default: false %}
+              {% assign tooltip = badge_data[2] | default: false %}
-          {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+              {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
-          <span
+              <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
-            class="badge badge-{{color}}"
+                  }}
-            {% if tooltip %}
+                  {% else %}
-              data-toggle="tooltip"
+                  >{{text}}
-              title="{{ tooltip }}"
+                  {% endif %}
-              > {{text}} {{ help_icon }}
+              </span>
-            {% else %}
+          {% endfor %}
-              > {{text}}
-            {% endif %}
-          </span>
-        {% endfor %}
       {% else %}
-        {{ include.title }}
+      {{include.title}}
       {% endif %}
     </h3>
   </div>
   <div class="card-body">
     <p class="card-text">
-      <img
+      <img src="{{include.image}}" height="120" width="120" class="panel-pic" alt="{{include.title}}">
-        src="{{include.image}}"
+      {{include.description}}
-        {% if include.image-dark %}
-        data-theme-src="{{include.image-dark}}"
-        {% endif %}
-        height="120"
-        width="120"
-        class="panel-pic"
-        alt="{{include.title}}"
-      >
-      {{ include.description }}
       {% if include.labels %}
-      {% assign labels = include.labels | split:"|" %}
+      {% assign labels = include.labels | replace:", ", "," | split:"," %}
-        {% for label in labels %}
+          {% for label in labels %}
-          {% assign label_data = label | split:":" %}
+              {% assign label_data = label | split:":" %}
-          {% assign color = label_data[0] %}
+              {% assign color = label_data[0] %}
-          {% assign text = label_data[1] %}
+              {% assign text = label_data[1] %}
-          {% assign tooltip = label_data[2] | default: false %}
+              {% assign tooltip = label_data[2] | default: false %}
-          {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+              {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
-          <span
+              <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
-            class="badge badge-{{color}}"
+                  }}
-            {% if tooltip %}
+                  {% else %}
-              data-toggle="tooltip"
+                  >{{text}}
-              title="{{ tooltip }}"
+                  {% endif %}
-              > {{text}} {{ help_icon }}
+              </span>
-            {% else %}
+          {% endfor %}
-              > {{text}}
-            {% endif %}
-          </span>
-        {% endfor %}
       {% endif %}
     </p>
     <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
       <div class="flex-shrink-0 mr-2">
-        <a
+        <a href="{{include.website}}" class="btn btn-primary mt-1"><i class="fas fa-external-link-alt fa-fw"></i> Website</a>
-          href="{{include.website}}"
-          class="btn btn-primary mt-1">
-          <i class="fas fa-external-link-alt fa-fw"></i>
-          Website
-        </a>
         {% if include.forum %}
-          <a
+        <a href="{{include.forum}}" class="btn btn-success mt-1"><i class="fab fa-discourse fa-fw"></i> Forum</a>
-            href="{{include.forum}}"
-            class="btn btn-success mt-1">
-            <i class="fab fa-discourse fa-fw"></i>
-            Forum
-          </a>
         {% endif %}
         {% if include.tor %}
-          <a
+        <a data-toggle="tooltip" data-placement="bottom" 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>
-            data-toggle="tooltip"
-            data-placement="bottom"
-            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>
 
       <div class="mt-2">
-          {% if include.windows %}
+          {% if include.windows %}<i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-            {% if include.windows != "" %}
+          {% if include.mac %}<i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-              <a href="{{ include.windows }}" class="text-decoration-none hover-text-decoration-none">
+          {% if include.linux %}<i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-                <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
+          {% if include.bsd %}<i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-              </a>
-            {% else %}
-              <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
 
-          {% if include.mac %}
+          {% if include.firefox %}<i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-            {% if include.mac != "" %}
+          {% if include.chrome %}<i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-              <a href="{{ include.mac }}" class="text-decoration-none hover-text-decoration-none">
+          {% if include.safari %}<i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-                <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
+          {% if include.opera %}<i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-              </a>
+          {% if include.edge %}<i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-            {% else %}
-              <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
 
-          {% if include.linux %}
+          {% if include.android %}<i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-            {% if include.linux != "" %}
+          {% if include.ios %}<i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-              <a href="{{ include.linux }}" class="text-decoration-none hover-text-decoration-none">
+          {% if include.fire %}<i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-                <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
 
-          {% if include.freebsd %}
+          {% if include.web %}<i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-            {% if include.freebsd != "" %}
-              <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 %}
-              <i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.openbsd %}
-            {% if include.openbsd != "" %}
-              <a href="{{ include.openbsd }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="ptio-openbsd fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="ptio-openbsd fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.netbsd %}
-            {% if include.netbsd != "" %}
-              <a href="{{ include.netbsd }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="ptio-netbsd fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="ptio-netbsd fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.firefox %}
-            {% if include.firefox != "" %}
-              <a href="{{ include.firefox }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.chrome %}
-            {% if include.chrome != "" %}
-              <a href="{{ include.chrome }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.safari %}
-            {% if include.safari != "" %}
-              <a href="{{ include.safari }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.opera %}
-            {% if include.opera != "" %}
-              <a href="{{ include.opera }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.edge %}
-            {% if include.edge != "" %}
-              <a href="{{ include.edge }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.fdroid %}
-            {% if include.fdroid != "" %}
-              <a href="{{ include.fdroid }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="ptio-f-droid fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="ptio-f-droid fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.googleplay %}
-            {% if include.googleplay != "" %}
-              <a href="{{ include.googleplay }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="fab fa-google-play fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-google-play fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.android %}
-            {% if include.android != "" %}
-              <a href="{{ include.android }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.ios %}
-            {% if include.ios != "" %}
-              <a href="{{ include.ios }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="ptio-ios fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="ptio-ios fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.sailfish %}
-            {% if include.sailfish != "" %}
-              <a href="{{ include.sailfish }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.web %}
-            {% if include.web != "" %}
-              <a href="{{ include.web }}" class="text-decoration-none hover-text-decoration-none">
-                <i class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
 
           {{include.icon1}}
           {{include.icon2}}
           {{include.icon3}}
 
-          {% if include.github %}
+          {% if include.github %}<a href="{{include.github}}"><i class="fab fa-github fa-2x fa-fw d-inline"></i></a>{% endif %}
-            <a href="{{include.github}}" class="text-decoration-none hover-text-decoration-none">
+          {% if include.gitlab %}<a href="{{include.gitlab}}"><i class="fab fa-gitlab fa-2x fa-fw d-inline"></i></a>{% endif %}
-              <i class="fab fa-github fa-2x fa-fw d-inline"></i>
+          {% if include.git %}<a href="{{include.git}}"><i class="fab fa-git-square fa-2x fa-fw d-inline"></i></a>{% endif %}
-            </a>
+          {% if include.source %}<a href="{{include.source}}"><i class="fas fa-code-branch fa-2x fa-fw d-inline"></i></a>{% endif %}
-          {% endif %}
-
-          {% if include.gitlab %}
-            <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}}" 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}}" class="text-decoration-none hover-text-decoration-none">
-              <i class="fas fa-code-branch fa-2x fa-fw d-inline"></i>
-            </a>
-          {% endif %}
 
       </div>
     </div>
+
   </div>
 </div>
 <br>

_includes/footer.html

@@ -2,84 +2,77 @@
 
   <hr class="footer-divider" />
 
-  <h3 id="participate">{% t footer.spread_the_word %}</h3>
+  <h3 id="participate">Spread the word and help your friends</h3>
 
   <div class="row mb-4">
     <div class="col-12 col-md-6 d-flex justify-content-between">
-      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/" class="share-btn email" title="{% t footer.email_title %}">
+      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/" class="share-btn email" title="Email">
         <i class="fas fa-envelope pl-3"></i>
       </a>
 
-      <a href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io" class="share-btn facebook" title="{% t footer.facebook_title %}">
+      <a href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io" class="share-btn facebook" title="Facebook">
         <i class="fab fa-facebook-f 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=https://www.privacytools.io/&amp;via=privacytoolsIO" class="share-btn twitter" title="{% t footer.twitter_title %}">
+      <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://www.privacytools.io/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
         <i class="fab fa-twitter pl-3"></i>
       </a>
 
-      <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 %}">
+      <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn mastodon" title="Mastodon">
         <i class="fab fa-mastodon pl-3"></i>
       </a>
     </div>
     <div class="col-12 col-md-6 d-flex justify-content-between">
-      <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 %}">
+      <a href="https://reddit.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
         <i class="fab fa-reddit-alien pl-3"></i>
       </a>
 
-      <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 %}">
+      <a href="https://www.linkedin.com/shareArticle?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
         <i class="fab fa-linkedin-in pl-3"></i>
       </a>
 
-      <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">
+      <a href="http://www.stumbleupon.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn stumbleupon" title="StumbleUpon">
-        <i class="ptio-mix pl-3"></i>
+        <i class="fab fa-stumbleupon pl-3"></i>
       </a>
 
-      <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn diaspora" title="{% t footer.diaspora_title %}">
+      <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn diaspora" title="Diaspora*">
         <i class="fas fa-asterisk pl-3"></i>
       </a>
     </div>
   </div>
 
-  <h3>{% t footer.copy_url_description %}</h3>
+  <h3>Copy URL and Description</h3>
 
   <p>
-  <input type="text" value="privacytools.io - encryption against global mass surveillance" class="form-control input-lg onclick-select">
+  <input type="text" value="www.privacytools.io - encryption against global mass surveillance" onclick="this.focus();this.select()" class="form-control input-lg">
-  <span class="help-block">{% t footer.for_easy_copy_paste %}</span>
+  <span class="help-block">For easy copy and paste. Share this text snippet.</span>
   </p>
 
   <hr class="footer-divider" />
 
   <div class="row mt-3">
-    <div class="col-sm-4 mb-3 d-flex justify-content-center d-flex justify-content-center">
+    <div class="col-md-3 col-sm-6 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>
+      <a href="https://www.privacytools.io/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."><img alt="CC0" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
     </div>
 
-    <div class="col-sm-4 mb-3 d-flex justify-content-center">
+    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
+      <a href="https://www.kopimi.com/" data-toggle="tooltip" data-placement="top" data-original-title="kopimi (copyme), symbol showing that you want to be copied. use kopimi in your own fancy. kopimi may be put on homepages or blogs, in books, in software, as sound logos in music or whatever."><img alt="kopimi" src="/assets/img/layout/kopimi.png" width="32" height="33">kopimi</a>
+    </div>
+
+    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
       <i class="far fa-envelope fa-2x"></i>
-      <a href="/contact/">{% t footer.contact %}</a>
+      <a href="/contact/">Contact</a>
     </div>
 
-    <div class="col-sm-4 mb-3 d-flex justify-content-center">
+    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
-      <i class="fas fa-donate fa-2x"></i>
+      <i class="fas fa-heart fa-2x text-danger"></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>
+      <a data-toggle="tooltip" data-placement="top" data-original-title="Please support this project by donating. We are ad free and not affiliated with any providers. Your donation will cover our cost for server and domain." href="/donate/">Donate</a>
     </div>
   </div>
 
   <div class="copyright-text">
-    <a href="/about/javascript" data-jslicense="1">
+    <p><strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong> <em>privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em> <a href="/privacy-policy/">View our privacy policy</a>.</p>
-      <span class="fab fa-js fa-lg"></span>
+    <p class="text-left">Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong> (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</a>)</p>
-      {% t footer.javascript %}
-    </a>
-    <p class="mt-2">
-      <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">{% t footer.learn_more %}</a>)
-    </p>
-
   </div>
+
 </footer>

_includes/head.html

@@ -12,8 +12,8 @@
 
   <!-- title -->
   {% if page.title %}
-  <title>{{ page.title | flatify }} | privacytools.io</title>
+  <title>{{ page.title }} | privacytools.io</title>
-  <meta property="og:title" content="{{ page.title | flatify }} | privacytools.io" />
+  <meta property="og:title" content="{{ page.title }} | privacytools.io" />
   {% else %}
   <title>{{ site.title }}</title>
   <meta property="og:title" content="{{ site.title }}" />
@@ -21,7 +21,7 @@
   <meta property="og:type" content="website" />
   <meta property="og:url" content="{{ page.permalink | prepend: site.url }}" />
   <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:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}"/>
   <meta property="og:locale" content="en_GB" />
   <meta property="og:site_name" content="privacytools.io" />
 
@@ -43,6 +43,5 @@
   <link rel="shortcut icon" href="/assets/img/favicons/favicon.ico">
 
   <!-- CSS stylesheets -->
-  <link href="/assets/css/style.css?v=8" rel="stylesheet">
+  <link href="/assets/css/style.css?v=5" rel="stylesheet">
-  <link id="dark-css" href="/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)">
 </head>

_includes/nav.html

@@ -1,116 +1,85 @@
-<div class="fixed-top bg-dark">
+<nav id="navbar" class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark">
-  <nav id="navbar">
+  <div class="container">
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
 
-    <input type="checkbox" id="nav-toggle" checked />
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
-    <label for="nav-toggle" id="nav-toggle-label" class="fas fa-bars fa-lg"></label>
+      <ul class="navbar-nav mr-auto">
-    <a id="nav-home-mobile" class="nav-anchor" href="/index.html">
+        <li class="nav-item">
-      <img src="/assets/img/layout/logo_smaller.png" width="148px" height="22px" />
+          <a class="nav-link" href="/index.html"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a>
-    </a>
+        </li>
-
+        <li class="nav-item dropdown">
-    <div class="menu">
+          <a class="nav-link dropdown-toggle" href="/providers/" id="providerDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-
+            Provider
-      <div id="nav-left" class="position-relative flex-col">
+          </a>
-        <a class="nav-anchor" href="/index.html">
+          <div class="dropdown-menu" aria-labelledby="providerDropdown">
-          <span id="nav-home" class="fas fa-home fa-fw"></span>
+            <a class="dropdown-item" href="/providers/#ukusa"><i class="fab fa-creative-commons-nc fa-fw"></i> Avoid US & UK services</a>
-        </a>
+            <a class="dropdown-item" href="/providers/cloud-storage/"><i class="fas fa-cloud fa-fw"></i> Cloud Storage</a>
-
+            <a class="dropdown-item" href="/providers/dns/"><i class="fa fa-tasks fa-fw"></i> DNS</a>
-        <!-- Provider -->
+            <a class="dropdown-item" href="/providers/email/"><i class="fas fa-mail-bulk fa-fw"></i> Email</a>
-        <details class="nav-details">
+            <a class="dropdown-item" href="/providers/hosting/"><i class="fas fa-database fa-fw"></i> Hosting</a>
-          <summary>
+            <a class="dropdown-item" href="/providers/paste/"><i class="fas fa-paste fa-fw"></i> Pastebins</a>
-            <span class="nav-summary">
+            <a class="dropdown-item" href="/providers/search-engines/"><i class="fab fa-searchengin fa-fw"></i> Search Engines</a>
-              {% t provider.provider %}
+            <a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt fa-fw"></i> Social Networks</a>
-              <span class="dropdown-toggle"></span>
+            <a class="dropdown-item" href="/providers/social-news-aggregator/"><i class="far fa-newspaper fa-fw"></i> Social News Aggregators</a>
-            </span>
+            <a class="dropdown-item" href="/providers/vpn/"><i class="far fa-eye-slash fa-fw"></i> VPN</a>
-          </summary>
+          </div>
-          <span class="nav-dropdown">
+        </li>
-            <a class="dropdown-item" href="/providers/#ukusa"><span class="fas fa-user-secret fa-fw"></span> {% t provider.us_uk %}</a>
+        <li class="nav-item dropdown">
-            <a class="dropdown-item" href="/providers/cloud-storage/"><span class="fas fa-cloud fa-fw"></span> {% t provider.cloud_storage %}</a>
+          <a class="nav-link dropdown-toggle" href="/browsers/" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <a class="dropdown-item" href="/providers/dns/"><span class="fa fa-tasks fa-fw"></span> {% t provider.dns %}</a>
+            Browser
-            <a class="dropdown-item" href="/providers/email/"><span class="fas fa-mail-bulk fa-fw"></span> {% t provider.email %}</a>
+          </a>
-            <a class="dropdown-item" href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> {% t provider.hosting %}</a>
+          <div class="dropdown-menu" aria-labelledby="browserDropdown">
-            <a class="dropdown-item" href="/providers/paste/"><span class="fas fa-paste fa-fw"></span> {% t provider.pastebins %}</a>
+            <a class="dropdown-item" href="/browsers/#fingerprint"><i class="fas fa-fingerprint fa-fw"></i> Fingerprint</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="/browsers/#addons"><i class="far fa-list-alt fa-fw"></i> Firefox Privacy Add-ons</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="/browsers/#about_config"><i class="fas fa-wrench fa-fw"></i> Privacy Related Tweaks</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="/browsers/#browser"><i class="fas fa-check fa-fw"></i> Recommendation</a>
-            <a class="dropdown-item" href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> {% t provider.vpn %}</a>
+            <a class="dropdown-item" href="/browsers/#webrtc"><i class="far fa-eye fa-fw"></i> WebRTC IP Leak</a>
-          </span>
+          </div>
-        </details>
+        </li>
-
+        <li class="nav-item dropdown">
-        <!-- Browser -->
+          <a class="nav-link dropdown-toggle" href="/software/" id="softwareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <details class="nav-details">
+            Software
-          <summary>
+          </a>
-            <span class="nav-summary">
+          <div class="dropdown-menu" aria-labelledby="softwareDropdown">
-              {% t browser.browser %}
+            <a class="dropdown-item" href="/software/calendar-contacts/"><i class="fas fa-calendar fa-fw"></i> Calendar/Contacts Sync Tools</a>
-              <span class="dropdown-toggle"></span>
+            <a class="dropdown-item" href="/software/notebooks/"><i class="far fa-sticky-note fa-fw"></i> Digital Notebook</a>
-            </span>
+            <a class="dropdown-item" href="/software/email/#messaging"><i class="fas fa-random fa-fw"></i> Email Alternatives</a>
-          </summary>
+            <a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> Email Clients</a>
-          <span class="nav-dropdown">
+            <a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> File Encryption</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="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> File Sharing</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="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> Password Manager</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="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> Productivity Tools</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="/software/real-time-communication/"><i class="fas fa-comments fa-fw"></i> Real-Time Communication</a>
-            <a class="dropdown-item" href="/browsers/#about_config"><span class="fas fa-wrench fa-fw"></span> {% t browser.tweaks %}</a>
+            <a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</a>
-          </span>
+            <a class="dropdown-item" href="/software/networks/"><i class="fas fa-user-secret fa-fw"></i> Self-contained Networks</a>
-        </details>
+            <a class="dropdown-item" href="/software/cloud/"><i class="fas fa-hdd fa-fw"></i> Self-Hosted Cloud Server</a>
-
+          </div>
-        <!-- Software -->
+        </li>
-        <details class="nav-details">
+        <li class="nav-item dropdown">
-          <summary>
+          <a class="nav-link dropdown-toggle" href="/operating-systems/" id="osDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <span class="nav-summary">
+            OS
-              {% t software.software %}
+          </a>
-              <span class="dropdown-toggle"></span>
+          <div class="dropdown-menu" aria-labelledby="osDropdown">
-            </span>
+            <a class="dropdown-item" href="/operating-systems/#aaddons"><i class="fas fa-th fa-fw"></i> Android Privacy Add-ons</a>
-          </summary>
+            <a class="dropdown-item" href="/operating-systems/#win10"><i class="far fa-thumbs-down fa-fw"></i> Don't use Windows 10</a>
-          <span class="nav-dropdown">
+            <a class="dropdown-item" href="/operating-systems/#live_os"><i class="fas fa-compact-disc fa-fw"></i> Live CD OS</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="/operating-systems/#mobile_os"><i class="fas fa-mobile-alt fa-fw"></i> Mobile OS</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="/operating-systems/#os"><i class="fas fa-th-large fa-fw"></i> PC OS</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="/operating-systems/#firmware"><i class="fas fa-signal fa-fw"></i> Router Firmware</a>
-            <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> {% t software.email_clients %}</a>
+          </div>
-            <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> {% t software.file_encryption %}</a>
+        </li>
-            <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> {% t software.file_sharing %}</a>
+        <li class="nav-item">
-            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> {% t software.file_sync %}</a>
+          <a class="nav-link" href="/index.html#participate">Participate</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>
+        </li>
-            <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> {% t software.password_managers %}</a>
+      </ul>
-            <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> {% t software.productivity %}</a>
+      <ul class="navbar-nav">
-            <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> {% t software.rtc %}</a>
+        <li class="nav-item dropdown">
-            <a class="dropdown-item" href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> {% t software.networks %}</a>
+          <a class="nav-link dropdown-toggle" href="#" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="fas fa-language text-danger"></i>
-            <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> {% t software.cloud %}</a>
+            Language
-          </span>
+          </a>
-        </details>
+          <div class="dropdown-menu" aria-labelledby="servicesDropdown">
-
-        <!-- OS -->
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              {% 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> {% 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">{% t global.participate %}</a>
-      </div>
-
-      <!-- Language -->
-      <div id="nav-right">
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              <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://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>
@@ -119,36 +88,26 @@
             <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>
+          </div>
-        </details>
+        </li>
-
+        <li class="nav-item dropdown">
-        <!-- Services -->
+          <a class="nav-link dropdown-toggle" href="/services/" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <details class="nav-details">
+            Services
-          <summary>
+          </a>
-            <span class="nav-summary">
+          <div class="dropdown-menu" aria-labelledby="servicesDropdown">
-              {% t service_descriptions.services %}
+            <a class="dropdown-item" href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-fw"></i> Discourse - Forum</a>
-              <span class="dropdown-toggle"></span>
+            <a class="dropdown-item" href="https://git.privacytools.io/"><i class="fab fa-git fa-fw"></i> Gitea - Git-Repository Manager</a>
-            </span>
+            <a class="dropdown-item" href="https://social.privacytools.io/"><i class="fas fa-retweet fa-fw"></i> Mastodon - Social Network</a>
-          </summary>
+            <a class="dropdown-item" href="https://chat.privacytools.io/"><i class="fas fa-comment fa-fw"></i> Matrix - Federated Chat</a>
-          <span class="nav-dropdown">
+            <a class="dropdown-item" href="https://bin.privacytools.io/"><i class="fas fa-clipboard fa-fw"></i> PrivateBin - Encrypted Pastebin</a>
-            <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://search.privacytools.io/"><i class="fas fa-search fa-fw"></i> Searx - Privacy Friendly Search</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://write.privacytools.io/"><i class="fas fa-pen-alt fa-fw"></i> Write Freely - Federated Blog</a>
-            <a class="dropdown-item" href="https://social.privacytools.io/"><span class="fas fa-retweet fa-fw"></span> Mastodon - {% t service_descriptions.mastodon %}</a>
+          </div>
-            <a class="dropdown-item" href="https://chat.privacytools.io/"><span class="fas fa-comment fa-fw"></span> Matrix - {% t service_descriptions.matrix %}</a>
+        </li>
-            <a class="dropdown-item" href="https://bin.privacytools.io/"><span class="fas fa-clipboard fa-fw"></span> PrivateBin - {% t service_descriptions.privatebin %}</a>
+        <li class="nav-item">
-            <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="nav-link" href="/donate/">Donate <i class="fas fa-heart text-danger"></i></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>
+        </li>
-          </span>
+      </ul>
-        </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>
-</div>
+</nav>

_includes/panel.html

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

_includes/scripts.html

@@ -2,7 +2,17 @@
 <script src="/assets/js/popper.min.js?v=4"></script>
 <script src="/assets/js/bootstrap.min.js?v=4"></script>
 <script src="/assets/js/sortable.min.js?v=4"></script>
-<script src="/assets/js/main.js?v=5"></script>
+<script>
+  $(function () {
+    $("[data-toggle='tooltip']").tooltip();
+  });
+
+  $('.navbar a').not(".dropdown-toggle").click(function (e) {
+    if ($(".navbar-toggler").is(":visible")) {
+      $('.navbar-collapse').collapse('toggle');
+    }
+  });
+</script>
 
 <!--
   Matomo is the leading open-source analytics platform:
@@ -11,4 +21,17 @@
   - User privacy protection
 -->
 
-<noscript><img src="https://stats.privacytools.io/matomo.php?idsite=1&amp;rec=1" class="border-0" alt=""/></noscript>
+<script type="text/javascript">
+  var _paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://stats.privacytools.io/";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '1']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><img src="https://stats.privacytools.io/matomo.php?idsite=1&amp;rec=1" style="border:0" alt=""/></noscript>

_includes/sections/android-addons.html

@@ -1,18 +1,28 @@
-<h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> {% t os.android_addons %}</h1>
+<h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> Android Privacy Add-ons</h1>
 
 <div class="alert alert-success" role="alert">
-  <strong>{% t android_addons.description %}</strong>
+  <strong>Improve your privacy with these add-ons for Android.</strong>
 </div>
 
 <div class="container-fluid">
 
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img src="/assets/img/addons/Blokada.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Blokada">
+    </div>
+    <div class="col">
+    <h3>Block ads with <a href="https://blokada.org/">Blokada</a></h3>
+    <p><strong>Blokada</strong> works across all of your apps, not only the browser. It doesn't require root, supports both wifi and mobile networks, and is perfectly safe and simple to use. Just turn it on, and it will do the job silently!
+    </div>
+  </div>
+
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img src="/assets/img/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>{% t android_addons.control_traffic %} <a href="https://www.netguard.me/">NetGuard</a></h3>
+    <h3>Control your traffic with <a href="https://www.netguard.me/">NetGuard</a></h3>
-    <p><strong>NetGuard</strong> {% t android_addons.netguard %}
+    <p><strong>NetGuard</strong> provides simple and advanced ways to block certain apps' access to the internet without the help of root privileges. Applications and addresses can individually be allowed or denied access to your Wi-Fi and/or mobile connection, allowing you to control which apps are able to call home or not.
     </div>
   </div>
 
@@ -21,17 +31,9 @@
       <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>{% t android_addons.tor %} <a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>
+    <h3>Tor for Android with <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 %}
+    <p><strong>Orbot</strong> is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. <strong>Root Mode:</strong> Orbot can be configured to transparently proxy all of your Internet traffic through Tor. You can also choose which specific apps you want to use through Tor.
     </div>
   </div>
 
-</div>
+</div>
-
-<h2>See also</h2>
-
-<ul>
-  <li>
-    <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,136 +1,124 @@
-<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> {% t browser_addons.excellent_add_ons %}</h1>
+<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Excellent Firefox Privacy Add-ons</h1>
 
 <div class="alert alert-primary" role="alert">
-  <strong>{% t browser_addons.improve_your_privacy %}</strong>
+  <strong>Improve your privacy with these excellent Firefox add-ons.</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=title2
+title="Privacy Badger: Stop Tracking"
-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/"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/"
-chrome="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm"
-opera="https://addons.opera.com/en/extensions/details/ublock/"
-edge="https://www.microsoft.com/en-us/p/ublock-origin/9nblggh444l4"
-%}
-
-{% include cardv2.html
-title=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"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/https-everywhere"
-chrome="https://chrome.google.com/webstore/detail/https-everywhere/gcbommkclmclpchllfjekcdonpmejbdp"
-opera="https://addons.opera.com/en/extensions/details/https-everywhere"
-%}
-
-{% include cardv2.html
-title=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"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/decentraleyes"
-chrome="https://chrome.google.com/webstore/detail/decentraleyes/ldpochfccmkkmhdbclfhpagapcfdljkj"
-opera="https://addons.opera.com/en/extensions/details/decentraleyes"
-%}
-
-{% include cardv2.html
-title=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/"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/terms-of-service-didnt-read/"
-chrome="https://chrome.google.com/webstore/detail/terms-of-service-didn%E2%80%99t-r/hjdoplcnndgiblooccencgcggcoihigg"
-opera="https://addons.opera.com/en/extensions/details/terms-of-service-didnt-read"
-%}
-
-{% include cardv2.html
-title=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"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake"
-chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
-%}
-
-{% include cardv2.html
-title=title1
 image="/assets/img/addons/privacy-badger.png"
-description=descr1
+description="<strong>Privacy Badger</strong> is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse."
 website="https://www.eff.org/privacybadger"
 forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
 github="https://github.com/EFForg/privacybadger"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17"
+firefox=""
-chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbdbbnkijodmdjhbjlgp"
+chrome=""
-opera="https://addons.opera.com/en/extensions/details/privacy-badger/"
+opera=""
+android=""
 %}
 
-<h2>{% t browser_addons.for_power_users_only %}</h2>
+{% include cardv2.html
+title="uBlock Origin: Block Ads and Trackers"
+image="/assets/img/addons/ublock-origin.png"
+description="<strong>uBlock Origin</strong> is an efficient <a href=https://github.com/gorhill/uBlock/wiki/Blocking-mode>wide-spectrum-blocker</a> that's easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source."
+website="https://addons.mozilla.org/firefox/addon/ublock-origin/"
+forum="https://forum.privacytools.io/t/discussion-ublock-origin/266"
+github="https://github.com/gorhill/uBlock/"
+firefox=""
+chrome=""
+safari=""
+opera=""
+edge=""
+android=""
+%}
+
+{% include cardv2.html
+title="Cookie AutoDelete: Automatically Delete Cookies"
+image="/assets/img/addons/cookie-autodelete.png"
+description="<strong>Cookie AutoDelete</strong> automatically removes cookies when they are no longer used by open browser tabs. With the cookies, lingering sessions, as well as information used to spy on you, will be expunged."
+website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/"
+forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267"
+github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete"
+firefox=""
+chrome=""
+%}
+
+{% include cardv2.html
+title="HTTPS Everywhere: Secure Connections"
+image="/assets/img/addons/https-everywhere.png"
+description="<strong>HTTPS Everywhere</strong> encrypts your communications with many major websites, making your browsing more secure. A collaboration between The Tor Project and the Electronic Frontier Foundation."
+website="https://www.eff.org/https-everywhere"
+forum="https://forum.privacytools.io/t/discussion-https-everywhere/268"
+github="https://github.com/EFForg/https-everywhere"
+firefox=""
+chrome=""
+android=""
+opera=""
+%}
+
+{% include cardv2.html
+title="Decentraleyes: Block Content Delivery Networks"
+image="/assets/img/addons/decentraleyes.png"
+description="<strong>Decentraleyes</strong> emulates Content Delivery Networks locally by intercepting requests, finding the required resource and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required."
+website="https://decentraleyes.org/"
+forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
+gitlab="https://git.synz.io/Synzvato/decentraleyes"
+firefox=""
+chrome=""
+opera=""
+%}
+
+{% include cardv2.html
+title="Terms of Service; Didn’t Read: Be Informed"
+image="/assets/img/addons/tosdr.png"
+description="<strong>Terms of Service; Didn’t Read</strong> “I have read and agree to the Terms” is the biggest lie on the web. This addon aims to fix that by grading websites based on their Terms of Service agreements and gives short summaries."
+website="https://tosdr.org/"
+forum="https://forum.privacytools.io/t/discussion-decentraleyes/270"
+github="https://github.com/tosdr/"
+firefox=""
+chrome=""
+opera=""
+safari=""
+%}
+
+{% include cardv2.html
+title="Snowflake"
+image="/assets/img/addons/snowflake.png"
+description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead."
+website="https://snowflake.torproject.org"
+forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
+git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
+firefox=""
+chrome=""
+%}
+
+
+<h2>For Experts Only</h2>
 
 <div class="alert alert-warning" role="alert">
-  <strong>{% t browser_addons.addon_warning %}</strong>
+  <strong>These addons require quite a lot of interaction from the user. Some sites will not work properly until you have configured the add-ons.</strong>
 </div>
 
 {% include cardv2.html
-title=title8
+title="uMatrix: Stop Cross-Site Requests"
 image="/assets/img/addons/umatrix.png"
-description=descr8
+description="<strong>uMatrix</strong> gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics."
 website="https://addons.mozilla.org/firefox/addon/umatrix/"
 forum="https://forum.privacytools.io/t/discussion-umatrix/271"
 github="https://github.com/gorhill/uMatrix"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/umatrix"
+firefox=""
-chrome="https://chrome.google.com/webstore/detail/umatrix/ogfcmafjalglgifnmanfmnieipoejdcf"
+chrome=""
-opera="https://addons.opera.com/en/extensions/details/umatrix"
+opera=""
 %}
 
 {% include cardv2.html
-title=title9
+title="NoScript Security Suite: Be in total control"
 image="/assets/img/addons/noscript.png"
-description=descr9
+description="<strong>NoScript</strong> is a highly customizable plugin to selectively allow JavaScript, Java, and Flash to run only on websites you trust. Not for casual users, it requires technical knowledge to configure."
 website="https://addons.mozilla.org/firefox/addon/noscript/"
 forum="https://forum.privacytools.io/t/discussion-noscript-security-suite/272"
 github="https://github.com/hackademix/noscript"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/noscript"
+firefox=""
-chrome="https://chrome.google.com/webstore/detail/noscript/doojmbjmlfjjnbmnoijecmcbfeoakpjm"
+chrome=""
 %}

_includes/sections/browser-fingerprint.html

@@ -4,6 +4,8 @@
   <strong>Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.</strong>
 </div>
 
+<img src="/assets/img/layout/browser-fingerprint.jpg" width="439" height="350" class="img-fluid float-right" alt="Fingerprint image" style="margin-left:20px;">
+
 <p>When you visit a web page, your browser voluntarily sends information about its configuration, such as available fonts, browser type, and add-ons. If this combination of information is unique, it may be possible to identify and track you without using cookies. EFF created a Tool called <a href="https://panopticlick.eff.org/">Panopticlick</a> to test your browser to see how unique it is.</p>
 
 <p>
@@ -12,7 +14,7 @@
 </a>
 </p>
 
-<p>You need to find what <strong>most browsers</strong> are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a <a href="https://addons.mozilla.org/firefox/addon/uaswitcher/">spoofed user-agent string</a> to match what the large userbase has. You need to have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even using the Tor Browser Bundle, will make your browser stick out from the masses.</p>
+<p>You need to find what <strong>most browsers</strong> are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a <a href="https://addons.mozilla.org/firefox/addon/uaswitcher/">spoofed user agent string</a> to match what the large userbase has. You need to have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even the TBB, will make your browser stick out from the masses.</p>
 
 <p>Modern web browsers have not been architected to assure personal web privacy. Rather than worrying about being fingerprinted, it seems more practical to use <a href="#addons"><i class="fas fa-link"></i> free software plugins</a> like Privacy Badger and uBlock Origin. They not only respect your freedom, but your privacy also. You can get much further with these than trying to manipulate your browser's fingerprint.</p>
 
@@ -27,5 +29,5 @@
 <ul>
   <li><a href="https://panopticlick.eff.org/static/browser-uniqueness.pdf">How Unique Is Your Web Browser? Peter Eckersley, EFF.</a></li>
   <li><a href="#addons"><i class="fas fa-link"></i> Our Firefox privacy add-ons section.</a></li>
-  <li><a href="https://www.browserleaks.com/">BrowserLeaks.com</a> - Web browser security testing tools that tell you what exactly personal identity data may be leaked without any permissions when you surf the Internet.</li>
+  <li><a href="https://www.browserleaks.com/">BrowserLeaks.com</a> - Web browser security testing tools, that tell you what exactly personal identity data may be leaked without any permissions when you surf the Internet.</li>
 </ul>

_includes/sections/browser-recommendation.html

@@ -1,135 +1,46 @@
-<h1 id="browser" class="anchor">
+<h1 id="browser" class="anchor"><a href="#browser"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendation</h1>
-  <a href="#browser"><span class="fas fa-link anchor-icon"></span></a>
-  Browser Recommendations For Desktop
-</h1>
 
 {% include cardv2.html
-title="Firefox"
+title="Mozilla Firefox"
 image="/assets/img/tools/Firefox.png"
-description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
+description='Firefox is fast, reliable, open source and respects your privacy. Don\'t forget to adjust the settings according to our
 recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a href="#about_config"><i class="fas fa-link"></i> about:config</a> and get the <a href="#addons"><i class="fas fa-link"></i> privacy add-ons</a>.'
-website="https://firefox.com"
+website="https://www.firefox.com/"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
-source="https://hg.mozilla.org/mozilla-central/"
+github="https://github.com/mozilla"
-windows="https://www.mozilla.org/firefox/windows/"
+windows=""
-mac="https://www.mozilla.org/firefox/mac/"
+mac=""
-linux="https://www.mozilla.org/firefox/linux/"
+linux=""
-freebsd="https://www.freshports.org/www/firefox"
+android=""
-openbsd="http://openports.se/www/mozilla-firefox"
+ios=""
-netbsd="http://pkgsrc.se/www/firefox"
+bsd=""
 %}
 
 {% include cardv2.html
-title="Tor Browser - Provides Anonymity"
+title="Tor Browser - for anonymity"
-image="/assets/img/tools/Tor-Browser.png"
-description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption, and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
-website="https://www.torproject.org/"
-tor="http://expyuzz4wqqyqhjn.onion/"
-forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
-git="https://trac.torproject.org/projects/tor"
-windows="https://www.torproject.org/download/"
-mac="https://www.torproject.org/download/"
-linux="https://www.torproject.org/download/"
-%}
-
-<h1 id="browser-android" class="anchor">
-  <a href="#browser-android"><span class="fas fa-link anchor-icon"></span></a>
-  Browser Recommendations For Android
-</h1>
-
-{% include cardv2.html
-title="Firefox"
-image="/assets/img/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="#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"
-fdroid="https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/"
-googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefox"
-android="https://www.mozilla.org/firefox/all/#product-android-release"
-%}
-
-{% include cardv2.html
-title="Tor Browser - Provides Anonymity"
 image="/assets/img/tools/Tor-Browser.png"
 description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
 website="https://www.torproject.org/"
-tor="http://expyuzz4wqqyqhjn.onion/"
+forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
-forum="https://forum.privacytools.io/t/discussion-tor-browser-for-android-browsers/1522"
+git="https://trac.torproject.org/projects/tor"
-git="https://gitweb.torproject.org/tor-browser.git/"
+windows=""
-android="https://www.torproject.org/download/#android"
+mac=""
-fdroid="https://guardianproject.info/fdroid/"
+linux=""
-googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
+android=""
+ios=""
+bsd=""
 %}
 
 {% include cardv2.html
-title="Bromite"
+title="Brave Browser - Complete but Experimental"
-image="/assets/img/tools/bromite.png"
+image="/assets/img/tools/Brave.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>.'
+description="The new open source browser Brave automatically blocks ads and trackers, making it faster and safer than your current browser. Brave is based on Chromium. <span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"Brave is a good choice if you want to use a Chromium-based browser. But at this point in Brave's development&comma; it's not as good as Firefox with privacy addons.\">experimental <i class=\"far fa-question-circle\"></i></span>"
-website="https://www.bromite.org/"
+website="https://brave.com/"
-forum="https://forum.privacytools.io/t/discussion-bromite-browsers/1521"
+forum="https://forum.privacytools.io/t/discussion-brave-browser/280"
-github="https://github.com/bromite/bromite"
+github="https://github.com/brave"
-fdroid="https://www.bromite.org/fdroid"
+windows=""
-android="https://www.bromite.org/#download-bromite"
+mac=""
+linux=""
+android=""
+ios=""
 %}
-
-<h3>Worth Mentioning for Android</h3>
-
-<ul>
-  <li>
-    <a href="https://www.stoutner.com/privacy-browser/">Privacy Browser</a>
-   - An open-source web browser focused on user privacy. Features include integrated ad blocking with <a href="https://easylist.to/">EasyList</a>, <a href="https://www.stoutner.com/privacy-browser-2-5/">SSL certificate pinning</a>, and <a href='https://guardianproject.info/apps/orbot/'>Tor Orbot proxy support.</a>
-    <a href="https://play.google.com/store/apps/details?id=com.google.android.webview&hl=en_US">
-      <span class="badge badge-warning" data-toggle="tooltip" title="Privacy Browser relies on the Android System WebView which needs to be kept up to date to fix security issues. One can update WebView by either installing it from Google Play or Aurora Store which you can get from F-Droid.">
-        <span class="fas fa-exclamation-triangle"></span>
-        Keep Android WebView up-to-date
-      </span>
-    </a>
-  </li>
-</ul>
-
-
-<h1 id="browser-ios" class="anchor"><a href="#browser-ios"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations For iOS</h1>
-
-{% include cardv2.html
-title="Firefox"
-image="/assets/img/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"
-source="https://github.com/mozilla-mobile/firefox-ios"
-ios="https://apps.apple.com/us/app/firefox-private-safe-browser/id989804926"
-%}
-
-
-{% include cardv2.html
-title="Onion Browser"
-image="/assets/img/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"
-github="https://github.com/OnionBrowser/OnionBrowser"
-ios="https://apps.apple.com/us/app/onion-browser/id519296448"
-%}
-
-
-{% include cardv2.html
-title="DuckDuckGo Privacy Browser"
-image="/assets/img/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"
-forum="https://forum.privacytools.io/t/discussion-duckduckgo-privacy-browser-browsers/1524"
-github="https://github.com/duckduckgo/iOS"
-ios="https://apps.apple.com/us/app/duckduckgo-privacy-browser/id663592361"
-%}
-
-<h3>Worth Mentioning for iOS</h3>
-
-<ul>
-  <li>
-    <a href="https://snowhaze.com/en/index.html">SnowHaze</a>
-        - An open-source web browser with built-in ad, tracker, cookie, and fingerprint blocking, all customizable on a per-site basis.
-  </li>
-</ul>

_includes/sections/browser-tweaks.html

@@ -28,6 +28,15 @@
   <dt>privacy.trackingprotection.enabled = true</dt>
   <dd>This is Mozilla's new built-in tracking protection. It uses Disconnect.me filter list, which is redundant if you are already using uBlock Origin 3rd party filters, therefore you should set it to false if you are using the add-on functionalities.</dd>
 
+  <dt>browser.cache.offline.enable = false</dt>
+  <dd>Disables offline cache.</dd>
+
+  <dt>browser.safebrowsing.malware.enabled = false</dt>
+  <dd>Disable Google Safe Browsing malware checks. Security risk, but privacy improvement.</dd>
+
+  <dt>browser.safebrowsing.phishing.enabled = false</dt>
+  <dd>Disable Google Safe Browsing and phishing protection. Security risk, but privacy improvement.</dd>
+
   <dt>browser.send_pings = false</dt>
   <dd>The attribute would be useful for letting websites track visitors' clicks.</dd>
 
@@ -37,10 +46,15 @@
   <dt>browser.urlbar.speculativeConnect.enabled = false</dt>
   <dd>Disable preloading of autocomplete URLs. Firefox preloads URLs that autocomplete when a user types into the address bar, which is a concern if URLs are suggested that the user does not want to connect to. <a href="https://www.ghacks.net/2017/07/24/disable-preloading-firefox-autocomplete-urls/">Source</a></dd>
 
+  <dt>dom.battery.enabled = false</dt>
+  <dd>The battery status of your device could be tracked.</dd>
 
   <dt>dom.event.clipboardevents.enabled = false</dt>
   <dd>Disable that websites can get notifications if you copy, paste, or cut something from a web page, and it lets them know which part of the page had been selected.</dd>
 
+  <dt>geo.enabled = false</dt>
+  <dd>Disables geolocation.</dd>
+
   <dt>media.eme.enabled = false</dt>
   <dd>
   <p>Disables playback of DRM-controlled HTML5 content, which, if enabled, automatically downloads the Widevine Content Decryption Module provided by Google Inc. <a href="https://support.mozilla.org/kb/enable-drm#w_opt-out-of-cdm-playback-uninstall-cdms-and-stop-all-cdm-downloads">Details</a></p>
@@ -63,7 +77,26 @@
   </ul>
   </dd>
 
+  <dt>network.cookie.lifetimePolicy = 2</dt>
+  <dd>
+  cookies are deleted at the end of the session
+  <ul>
+    <li>0 = Accept cookies normally</li>
+    <li>1 = Prompt for each cookie</li>
+    <li>2 = Accept for current session only</li>
+    <li>3 = Accept for N days</li>
+  </ul>
+  </dd>
 
+  <dt>network.http.referer.trimmingPolicy = 2</dt>
+  <dd>
+  Send only the scheme, host, and port in the <code>Referer</code> header
+  <ul>
+    <li>0 = Send the full URL in the <code>Referer</code> header</li>
+    <li>1 = Send the URL without its query string in the <code>Referer</code> header</li>
+    <li>2 = Send only the scheme, host, and port in the <code>Referer</code> header</li>
+  </ul>
+  </dd>
 
   <dt>network.http.referer.XOriginPolicy = 2</dt>
   <dd>
@@ -85,8 +118,23 @@
   </ul>
   </dd>
 
-  <dt>Looking for TRR, DoH or ESNI?</dt>
+  <dt>network.trr.mode = 2</dt>
-  <dd>They have moved to <a href="/providers/dns/#icanndns">our DNS page</a>.</dd>
+  <dd>
+  Use Trusted Recursive Resolver (DNS-over-HTTPS) first and if it fails, use the system resolver <a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver">Source</a>
+  <ul>
+    <li>0 = disabled by default, may change in the future</li>
+    <li>1 = use the faster resolver</li>
+    <li>2 = use DoH first, fallback to system resolver</li>
+    <li>3 = only use DoH. This may require <code>network.trr.bootstrapAddress</code> or using an IP address in <code>network.trr.uri</code>.</li>
+    <li>5 = explicitly disable DoH</li>
+  </ul>
+  </dd>
+
+  <dt>network.trr.uri = CHANGEME</dt>
+  <dd>The address of your DNS-over-HTTPS provider, if you don't have one, <a href="/providers/dns/#icanndns">check our encrypted DNS recommendations</a>. It can also be changed in <em>Settings, Network Settings, Enable DNS over HTTPS, Use Provider, Custom</em>.</dd>
+
+  <dt>network.security.esni.enabled = true</dt>
+  <dd>Hide the address which you are requesting SSL certificate for if the server supports it. This <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1500289">requires DoH/TRR to be enabled</a> even <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1542754">on Android 9+ when Private DNS is enabled</a>.</dd>
 
   <dt>webgl.disabled = true</dt>
   <dd>WebGL is a potential security risk. <a href="https://security.stackexchange.com/questions/13799/is-webgl-a-security-concern">Source</a></dd>
@@ -101,14 +149,23 @@
   </ul>
   </dd>
 
+  <dt>extensions.pocket.enabled = false</dt>
+  <dd>Disables Pocket completely.</dd>
 
   <dt>network.IDN_show_punycode = true</dt>
   <dd>Not rendering IDNs as their Punycode equivalent leaves you open to phishing attacks that can be very difficult to notice. <a href="https://krebsonsecurity.com/2018/03/look-alike-domains-and-visual-confusion/#more-42636">Source</a></dd>
 
+  <dt>extensions.blocklist.url = https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%20/%20/</dt>
+  <dd>
+  <p>Limit the amount of identifiable information sent when requesting the Mozilla harmful extension blocklist.
+  <p>Optionally, the blocklist can be disabled entirely by setting <code>extensions.blocklist.enabled</code> to false for increased privacy, but decreased security. <a href="https://old.reddit.com/r/privacytoolsIO/comments/9uqeew/firefox_tip_sanitize_firefox_blocklist_url_so_it/">Source</a></p>
+  </dd>
+</dl>
 
-<h3 id="user.js">Firefox user.js Templates</h3>
+<h3>Firefox user.js Templates</h3>
 <ul>
 	<li><a href="https://github.com/ghacksuserjs/ghacks-user.js">ghacks-user.js</a> - An ongoing comprehensive user.js template for configuring and hardening Firefox privacy, security and anti-fingerprinting.</li>
+	<li><a href="https://github.com/pyllyukko/user.js">pyllyukko/user.js</a> - This is a user.js configuration file to harden Firefox's settings and make it more secure.</li>
 </ul>
 
 

_includes/sections/browser-webrtc.html

@@ -23,7 +23,7 @@
   <li>Done. Do the WebRTC leak test again.</li>
 </ol>
 
-<p>If you want to make sure every single WebRTC-related setting is really disabled change these settings:</p>
+<p>If you want to make sure every single WebRTC related setting is really disabled change these settings:</p>
 
 <ol class="long-string-list">
   <li>media.peerconnection.turn.disable = true</li>
@@ -40,7 +40,7 @@
 
 <h3>How to fix the WebRTC Leak in Google Chrome?</h3>
 
-<p>WebRTC cannot be fully disabled in Chrome; however, it is possible to change its routing settings (and prevent leaks) using an extension. Two open-source solutions include <a href="https://chrome.google.com/webstore/detail/webrtc-leak-prevent/eiadekoaikejlgdbkbdfeijglgfdalml">WebRTC Leak Prevent</a> (options may need to be changed depending on the scenario), and <a href="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm">uBlock Origin</a> (select "Prevent WebRTC from leaking local IP addresses" in Settings).</p>
+<p>WebRTC cannot be fully disabled in Chrome, however it is possible to change its routing settings (and prevent leaks) using an extension. Two open source solutions include <a href="https://chrome.google.com/webstore/detail/webrtc-leak-prevent/eiadekoaikejlgdbkbdfeijglgfdalml">WebRTC Leak Prevent</a> (options may need to be changed depending on the scenario), and <a href="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm">uBlock Origin</a> (select "Prevent WebRTC from leaking local IP addresses" in Settings).</p>
 
 <h3>What about other browsers?</h3>
 

_includes/sections/calendar-contacts-sync.html

@@ -4,56 +4,47 @@
   <strong>If you are currently using a calendar and or contacts synchronization service like Google Sync or iCloud, you should pick an alternative here.</strong>
 </div>
 
-{%
+<div class="row mb-2">
-  include cardv2.html
+
+  {% include card.html color="success"
   title="Nextcloud"
   image="/assets/img/provider/Nextcloud.png"
-  description="<strong>Nextcloud</strong> is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server."
+  url="https://nextcloud.com/"
-  website="https://nextcloud.com/"
+  footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
-  forum="https://forum.privacytools.io/t/discussion-nextcloud-calender-contacts-sync-tools/1535"
+  description="NextCloud is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server."
-  github="https://github.com/nextcloud"
+  %}
-  windows="https://nextcloud.com/install/"
-  linux="https://nextcloud.com/install/"
-  mac="https://nextcloud.com/install/"
-  freebsd="https://www.freshports.org/deskutils/nextcloudclient/"
-  openbsd="http://openports.se/www/nextcloud"
-  netbsd="http://pkgsrc.se/www/php-nextcloud"
-  android="https://nextcloud.com/install/"
-  ios="https://nextcloud.com/install/"
-%}
 
-{%
+  {% include card.html color="primary"
-  include cardv2.html
   title="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.'
+  url="../email"
-  website="/providers/email"
+  website="Email Providers section"
-%}
+  footer="OS: depends on email provider."
+  description="Many email providers also offer calendar and or contacts sync services. Refer to the <a href=\"../email\">Email Providers section</a> to choose an email provider and check if they also offer calendar and or contacts sync."
+  %}
 
-{%
+  {% include card.html color="warning"
-  include cardv2.html
   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."
+  url="https://www.etesync.com/"
-  website="https://www.etesync.com/"
+  footer="Client OS: Android, Web. Server OS: Linux."
-  forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536"
+  description="EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free."
-  github="https://github.com/etesync"
+  %}
-  web="https://client.etesync.com/"
+
-  windows="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+</div>
-  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>
 
 <ul>
   <li>
-    <a href="https://fruux.com/">fruux</a> - A unified contacts/calendaring system that works across platforms and devices.
+    <a href="https://fruux.com/">fruux</a> - a unified contacts/calendaring system that works across platforms and devices.
   </li>
 
   <li>
-    <a href="../cloud">cloud backups</a> - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/">encrypting</a> them).
+    <a href="https://signal.org/blog/flock/">Flock</a> - a discontinued calendar and contacts sync service by Open Whisper Systems. Despite being shut down the <a href="https://github.com/signalapp/Flock">source code</a> is still available on GitHub.
+  </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/#encrypt">encrypting</a> them).
   </li>
 </ul>

_includes/sections/cloud-storage.html

@@ -7,19 +7,30 @@
 {% include cardv2.html
 title="Nextcloud - Choose your hoster"
 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."
+description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients."
 website="https://nextcloud.com/"
 forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
 github="https://github.com/nextcloud"
-windows="https://nextcloud.com/install/#install-clients"
+windows=""
-mac="https://nextcloud.com/install/#install-clients"
+mac=""
-linux="https://nextcloud.com/install/#install-clients"
+linux=""
-freebsd="https://www.freshports.org/www/nextcloud/"
+bsd=""
-openbsd="http://openports.se/www/nextcloud"
+ios=""
-netbsd="http://pkgsrc.se/www/php-nextcloud"
+android=""
-ios="https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8"
+fire=""
-fdroid="https://f-droid.org/packages/com.nextcloud.client/"
+%}
-googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
+
+{% include cardv2.html
+title="Least Authority S4 - For Experts"
+image="/assets/img/provider/S4.jpg"
+description="S4 (Simple Secure Storage Service) is Least Authority's verifiably secure off-site backup system for individuals and businesses. 100% client-side encryption and open source transparency. 250GB for $9.95/month or 5TB for $25.95/month. Servers are hosted with Amazon S3 in the US."
+website="https://leastauthority.com/"
+forum="https://forum.privacytools.io/t/discussion-least-authority-s4/288"
+github="https://github.com/LeastAuthority"
+windows=""
+mac=""
+linux=""
+bsd=""
 %}
 
 

_includes/sections/dns.html

@@ -1,33 +1,40 @@
 <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
-  include cardv2.html
+title="OpenNIC - Service"
-  title="Njalla - Domain Registration"
+image="/assets/img/tools/OpenNIC.png"
-  image="/assets/img/provider/Njalla.png"
+description="OpenNIC is an alternate network information center/alternative DNS root which lists itself as an alternative to ICANN and its registries. Like all alternative root DNS systems, OpenNIC-hosted domains are unreachable to the vast majority of the Internet."
-  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://www.opennic.org/"
-  website="https://njal.la/"
+forum="https://forum.privacytools.io/t/discussion-opennic/338"
-  tor="http://njalladnspotetti.onion"
+github="https://github.com/OpenNIC"
-  forum="https://forum.privacytools.io/t/discussion-njalla/339"
 %}
 
-{%
+{% include cardv2.html
-  include cardv2.html
+title="Njalla - Domain Registration"
-  title="DNSCrypt-Proxy - Tool"
+image="/assets/img/provider/Njalla.png"
-  image="/assets/img/tools/DNSCrypt-Proxy.png"
+description="Njalla only needs your email or jabber address in order to register a domain name for you. Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service."
-  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://njal.la/"
-  website="https://github.com/jedisct1/dnscrypt-proxy/"
+tor="http://njalladnspotetti.onion"
-  forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
+forum="https://forum.privacytools.io/t/discussion-njalla/339"
-  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=""
 %}
 
+{% include cardv2.html
+title="DNSCrypt - Tool"
+image="/assets/img/tools/DNSCrypt.png"
+description="A protocol for securing communications between a client and a DNS resolver. The DNSCrypt protocol uses high-speed high-security elliptic-curve cryptography and is very similar to DNSCurve, but focuses on securing communications between a client and its first-level resolver."
+website="https://dnscrypt.info/"
+forum="https://forum.privacytools.io/t/discussion-dnscrypt/340"
+github="https://github.com/jedisct1/dnscrypt-proxy"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://gitlab.com/quidsup/notrack">NoTrack</a> - A network-wide DNS server which blocks Tracking sites. Currently works in Debian and Ubuntu.</li>
+  <li><a href="https://namecoin.info/">Namecoin</a> - A decentralized DNS open source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
+  <li><a href="https://pi-hole.net/">Pi-hole</a> - A network-wide DNS server for the Raspberry Pi.  Blocks advertising and tracking domains for all devices on your network.</li>
+</ul>
+
 <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">
@@ -38,7 +45,7 @@
   <table class="table sortable-theme-bootstrap" data-sortable>
     <thead>
       <tr>
-        <th data-sorted="true" data-sorted-direction="ascending">ICANN DNS Provider</th>
+        <th data-sorted="true" data-sorted-direction="descending">ICANN DNS Provider</th>
         <th data-sortable="true">Server Locations</th>
         <th data-sortable="false">Privacy Policy</th>
         <th data-sortable="true">Type</th>
@@ -48,7 +55,6 @@
         <th data-sortable="true">QNAME Minimization</th>
         <th data-sortable="true">Filtering</th>
         <th data-sortable="true">Source Code</th>
-        <th data-sortable="true">Hosting Provider</th>
       </tr>
     </thead>
     <tbody>
@@ -56,12 +62,7 @@
         <td data-value="AdGuard">
           <a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard</a>
         </td>
-        <td>Anycast (based in
+        <td>Anycast (based in <span class="flag-icon flag-icon-cy"></span> Cyprus)</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-cy"></span>
-              Cyprus)
-          </span>
-        </td>
         <td>
           <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">
@@ -72,44 +73,19 @@
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>
+        <td>Ads, trackers, malicious domains</td>
-          <span class="no-text-wrap">
-            Ads, trackers,
-          </span>
-          <span class="no-text-wrap">
-            malicious domains
-          </span>
-        </td>
         <td>
           <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>
-          <span class="no-text-wrap">
-            <a href="https://flops.ru/en/about.html">Serveroid, LLC</a>
-          </span>
-        </td>
       </tr>
 
       <tr>
         <td data-value="BlahDNS">
           <a href="https://blahdns.com/">BlahDNS</a>
         </td>
-        <td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland, <span class="flag-icon flag-icon-jp"></span> Japan, <span class="flag-icon flag-icon-de"></span> Germany</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-fi"></span>
-            Finland,
-          </span>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span>
-            Germany,
-          </span>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-jp"></span>
-            Japan
-          </span>
-        </td>
         <td>
           <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">
@@ -117,54 +93,22 @@
         </td>
         <td>Hobby Project</td>
         <td>No</td>
-        <td data-value="dot/443">
+        <td>DoH, DoT, DNSCrypt</td>
-          <span class="no-text-wrap">
-            DoH,
-            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
-              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
-            </span>
-          </span>
-          DNSCrypt
-        </td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>
+        <td>Ads, trackers, malicious domains <span class="badge badge-warning" data-toggle="tooltip" data-original-title="And some wildcard, IDN, and non-ASCII domains."><a href="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"><i class="fas fa-exclamation-triangle"></i></a></span></td>
-          <span class="no-text-wrap">
-            Ads, trackers,
-          </span>
-          <span class="no-text-wrap">
-            malicious domains
-            <span class="badge badge-warning" data-toggle="tooltip" data-original-title="And some wildcard and IDN domains."><a href="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"><i class="fas fa-exclamation-triangle"></i></a></span>
-          </span>
-        </td>
         <td>
           <a 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>
-          <span class="no-text-wrap">
-            <a href="https://www.choopa.com/">Choopa, LLC</a>,
-          </span>
-          <span class="no-text-wrap">
-            <a href="https://www.datacenterlight.ch/">Data Center Light</a>,
-          </span>
-          <span class="no-text-wrap">
-            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
-          </span>
-        </td>
       </tr>
 
       <tr>
         <td data-value="Cloudflare">
           <a href="https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1/">Cloudflare</a> <span class="badge badge-warning" data-toggle="tooltip" title="Cloudflare is one of the world's largest networks, and a problem considering anonymity and decentralization."><a href="https://codeberg.org/crimeflare/cloudflare-tor/"><i class="fas fa-exclamation-triangle"></i></a></span>
         </td>
-        <td>Anycast (based in
+        <td>Anycast (based in <span class="flag-icon flag-icon-us"></span> US)</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-us"></span>
-            US)
-          </span>
-        </td>
         <td>
           <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">
@@ -176,20 +120,18 @@
         <td>Yes</td>
         <td>Yes</td>
         <td>No</td>
-        <td>?</td>
+        <td>
-        <td>Self</td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/cloudflare/dns" href="https://github.com/cloudflare/dns">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
       </tr>
 
       <tr>
         <td data-value="CZ.NIC">
           <a href="https://www.nic.cz/odvr/">CZ.NIC</a>
         </td>
-        <td>
+        <td><span class="flag-icon flag-icon-cz"></span> Czech Republic</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-cz"></span>
-            Czech Republic
-          </span>
-        </td>
         <td>
           <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">
@@ -202,19 +144,13 @@
         <td>Yes</td>
         <td data-value="No">?</td>
         <td>?</td>
-        <td>Self</td>
       </tr>
 
       <tr>
         <td data-value="dnswarden">
           <a href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md">dnswarden</a>
         </td>
-        <td>
+        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span>
-            Germany
-          </span>
-        </td>
         <td>
           <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">
@@ -222,40 +158,18 @@
         </td>
         <td>Hobby Project</td>
         <td>No</td>
-        <td data-value="dot/443">
+        <td>DoH, DoT, DNSCrypt</td>
-          <span class="no-text-wrap">
-            DoH,
-            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
-              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
-            </span>
-          </span>
-          DNSCrypt
-        </td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>
+        <td>Based on server choice</td>
-          <span class="no-text-wrap">
-            Based on server choice
-          </span>
-        </td>
         <td>?</td>
-        <td>
-          <span class="no-text-wrap">
-            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
-          </span>
-        </td>
       </tr>
 
       <tr>
         <td data-value="Foundation for Applied Privacy">
           <a href="https://appliedprivacy.net/services/dns/">Foundation for Applied Privacy</a>
         </td>
-        <td>
+        <td><span class="flag-icon flag-icon-at"></span> Austria</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-at"></span>
-            Austria
-          </span>
-        </td>
         <td>
           <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">
@@ -263,116 +177,37 @@
         </td>
         <td>Non-Profit</td>
         <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"We do NOT log your IP address or DNS queries during normal operations. We do NOT share query data with third parties that are not directly involved with resolving the query (i.e. sending queries to authoritative nameservers for resolution)."' href="https://appliedprivacy.net/privacy-policy/">Some</a></td>
-        <td data-value="dot/443">
+        <td>DoH, DoT</td>
-          <span class="no-text-wrap">
-            DoH,
-            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
-              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>
-            </span>
-          </span>
-        </td>
         <td>Yes</td>
         <td>Yes</td>
         <td>No</td>
         <td>?</td>
-        <td>
-          <span class="no-text-wrap">
-            <a href="https://www.ipax.at/">IPAX OG</a>
-          </span>
-        </td>
       </tr>
 
       <tr>
         <td data-value="nextdns">
-          <a href="https://www.nextdns.io/">NextDNS</a>
+          <a href="https://www.nextdns.io/">nextdns</a>
-        </td>
-        <td>Anycast (based in
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-us"></span>
-            US)
-          </span>
         </td>
+        <td>Anycast (based in <span class="flag-icon flag-icon-us"></span> US)</td>
         <td>
           <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>
-        <td>
+        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"Some of the features require some sort of data retention. In that case, we give our users the choice to granularly or completely disable those features (and associated data retention), and we follow up immediately on that promise"' href="https://www.nextdns.io/privacy">Based on user choice</a></td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"Some of the features require some sort of data retention. In that case, we give our users the choice to granularly or completely disable those features (and associated data retention), and we follow up immediately on that promise"' href="https://www.nextdns.io/privacy">Based on user choice</a>
-        </td>
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>
+        <td>Based on user choice</td>
-          <span class="no-text-wrap">
-            Based on server choice
-          </span>
-        </td>
         <td>?</td>
-        <td>Self</td>
-      </tr>
-
-      <tr>
-        <td data-value="NixNet">
-          <a href="https://nixnet.xyz/dns/">NixNet</a>
-        </td>
-        <td>
-          <span class="no-text-wrap">
-            Anycast (based in
-            <span class="flag-icon flag-icon-us"></span>
-            US),
-          </span>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-us"></span>
-            US,
-          </span>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-lu"></span>
-            Luxembourg
-          </span>
-        </td>
-        <td>
-          <a 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>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='Part of LibreHosters, "a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms."' href="https://libreho.st/">
-            Informal collective
-          </a>
-        </td>
-        <td>No</td>
-        <td>DoH, DoT</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>
-          <span class="no-text-wrap">
-            Based on server choice
-          </span>
-        </td>
-        <td>
-          <a 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>
-          <span class="no-text-wrap">
-            <a href="https://frantech.ca/">FranTech Solutions</a>
-          </span>
-        </td>
       </tr>
 
       <tr>
         <td data-value="PowerDNS">
           <a href="https://powerdns.org/">PowerDNS</a>
         </td>
-        <td>
+        <td><span class="flag-icon flag-icon-nl"></span> The Netherlands</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span>
-            The Netherlands
-          </span>
-        </td>
         <td>
           <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">
@@ -389,23 +224,13 @@
             <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
-        <td>
-          <span class="no-text-wrap">
-            <a href="https://www.transip.nl/">TransIP B.V. Admin</a>
-          </span>
-        </td>
       </tr>
 
       <tr>
         <td data-value="Quad9">
-          <a href="https://quad9.net/">Quad9</a> <span class="badge badge-warning" data-toggle="tooltip" title="Founders include the Global Cyber Alliance, composed of the City of London Police and Manhattan District Attorney's Office"><i class="fas fa-exclamation-triangle"></i></span>
+          <a href="https://quad9.net/">Quad9</a> <span class="badge badge-warning" data-toggle="tooltip" title="Founders include the Global Cyber Alliance, comprised of the City of London Police and Manhattan District Attorney's Office"><i class="fas fa-exclamation-triangle"></i></span>
-        </td>
-        <td>Anycast (based in
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-us"></span>
-            US)
-          </span>
         </td>
+        <td>Anycast (based in <span class="flag-icon flag-icon-us"></span> US)</td>
         <td>
           <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">
@@ -416,30 +241,15 @@
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>
+        <td>Malicious domains</td>
-          <span class="no-text-wrap">
-            Malicious domains
-          </span>
-        </td>
         <td>?</td>
-        <td>
-          Self,
-          <span class="no-text-wrap">
-            <a href="https://www.pch.net/">Packet Clearing House</a>
-          </span>
-        </td>
       </tr>
 
       <tr>
         <td data-value="SecureDNS">
           <a href="https://securedns.eu/">SecureDNS</a>
         </td>
-        <td>
+        <td><span class="flag-icon flag-icon-nl"></span> The Netherlands</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span>
-            The Netherlands
-          </span>
-        </td>
         <td>
           <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">
@@ -450,76 +260,15 @@
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>
+        <td>Based on server choice</td>
-          <span class="no-text-wrap">
-            Based on server choice
-          </span>
-        </td>
         <td>?</td>
-        <td>
-          <span class="no-text-wrap">
-            <a href="https://www.digitalocean.com/">DigitalOcean, Inc.</a>
-          </span>
-        </td>
-      </tr>
-
-      <tr>
-        <td data-value="Snopyta">
-          <a href="https://snopyta.org/service/dns/index.html">Snopyta</a>
-        </td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-fi"></span>
-            Finland
-          </span>
-        </td>
-        <td>
-          <a 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, "a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms."' href="https://libreho.st/">
-            Informal collective
-          </a>
-        </td>
-        <td>No</td>
-        <td>DoH, DoT</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>
-          <span class="no-text-wrap">
-            No
-          </span>
-        </td>
-        <td>?</td>
-        <td>
-          <span class="no-text-wrap">
-            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
-          </span>
-        </td>
       </tr>
 
       <tr>
         <td data-value="UncensoredDNS">
           <a href="https://blog.uncensoreddns.org/">UncensoredDNS</a>
         </td>
-        <td>Anycast (based in
+        <td>Anycast (based in <span class="flag-icon flag-icon-dk"></span> Denmark)</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-dk"></span>
-            Denmark),
-          </span>
-
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-dk"></span>
-            Denmark,
-            </span>
-
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-us"></span>
-            US
-          </span>
-        </td>
         <td>
           <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">
@@ -532,92 +281,30 @@
         <td>No</td>
         <td>No</td>
         <td>?</td>
-        <td>
-          Self,
-          <span class="no-text-wrap">
-            <a href="https://www.teliacompany.com">Telia Company AB</a>
-          </span>
-        </td>
       </tr>
     </tbody>
   </table>
-</div>
 
-<h4>Terms</h4>
+  <h4>Terms</h4>
 
-<ul>
+  <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>
+    <li>DNS-over-TLS (DoT) - A security protocol for encrypted DNS on a dedicated port 853.</li>
-    <ul>
+    <li>DNS-over-HTTPS (DoH) - Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443.</li>
-        <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>DNSCrypt - An older yet robust method of encrypting DNS.</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>
-    </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>
+  <h3>Worth Mentioning and Additional Information</h3>
 
-<ul>
+  <ul>
-  <li>DoH / DoT
+    <li>Firefox 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>Android 9 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>
-      <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>
-      <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>
+      <a href="https://apps.apple.com/app/id1452162351">DNSCloak</a> - 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>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>
+    </li>
-    </ul>
+    <li>
-  </li>
+      <a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby">Stubby</a> - An <a href="https://github.com/getdnsapi/stubby">open-source</a> application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.
-  <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>
-  <li>DNSSEC - Check <a href="https://dnssec.vs.uni-due.de/">DNSSEC Resolver Test by Matthäus Wander</a>.</li>
+    <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>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>
+    <li><a href="https://www.isc.org/dnssec/">DNSSEC and BIND 9</a> by the ISC</li>
-</ul>
+  </ul>
-
+</div>
-<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

@@ -4,26 +4,25 @@
 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."
+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"
+windows=""
-mac="https://github.com/Bitmessage/PyBitmessage/releases"
+mac=""
-linux="https://repology.org/project/pybitmessage/versions"
+linux=""
 %}
 
 {% include cardv2.html
 title="RetroShare"
 image="/assets/img/tools/RetroShare.png"
-description="Retroshare creates encrypted connections to your friends. Nobody can spy on you. Retroshare is completely decentralized. This means there are no central servers. It is entirely open-source and free. There are no costs, no ads, and no Terms of Service."
+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"
+windows=""
-mac="https://retroshare.cc/downloads.html#mac"
+mac=""
-linux="https://retroshare.cc/downloads.html#gnulinux"
+linux=""
-freebsd="https://retroshare.cc/downloads.html#freebsd"
 %}
 
 

_includes/sections/email-clients.html

@@ -7,12 +7,10 @@ description="Thunderbird is a free, open source, cross-platform email, newsgroup
 website="https://www.thunderbird.net/"
 forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
 source="https://hg.mozilla.org/comm-central/"
-windows="https://www.thunderbird.net/en-US/"
+windows=""
-mac="https://www.thunderbird.net/en-US/"
+mac=""
-linux="https://www.thunderbird.net/en-US/"
+linux=""
-freebsd="https://www.freshports.org/mail/thunderbird/"
+bsd=""
-openbsd="http://openports.se/mail/mozilla-thunderbird"
-netbsd="http://pkgsrc.se/mail/thunderbird"
 %}
 
 {% include cardv2.html
@@ -22,12 +20,10 @@ description="Claws Mail is a free and open source, GTK-based email and news clie
 website="https://www.claws-mail.org/"
 forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
 git="https://git.claws-mail.org/"
-windows="https://www.claws-mail.org/win32/"
+windows=""
-mac="https://www.claws-mail.org/faq/index.php/Installation_and_Configuration#What_do_I_need_to_compile_Claws_Mail.3F"
+mac=""
-linux="https://www.claws-mail.org/downloads.php?section=downloads"
+linux=""
-freebsd="https://www.freshports.org/mail/claws-mail/"
+bsd=""
-openbsd="http://openports.se/mail/claws-mail"
-netbsd="http://pkgsrc.se/mail/claws-mail"
 %}
 
 

_includes/sections/email-providers.html

@@ -8,7 +8,7 @@
   <table class="table sortable-theme-bootstrap" data-sortable>
     <thead>
       <tr>
-        <th data-sorted="true" data-sorted-direction="ascending">Email Provider</th>
+        <th data-sorted="true" data-sorted-direction="descending">Email Provider</th>
         <th data-sortable="false">Website</th>
         <th data-sortable="true">Since</th>
         <th data-sortable="true">Jurisdiction</th>
@@ -23,128 +23,7 @@
     <tbody>
 
       <tr>
-        <td data-value="disroot">
+        <td data-value="ProtonMail">
-          <img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
-        </td>
-        <td>
-          <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>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span> Netherlands
-          </span>
-        </td>
-        <td data-value="1000">1 GB</td>
-        <td data-value="0"><span class="label label-warning">Free</span></td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <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="kolabnow">
-          <img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
-        </td>
-        <td>
-          <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>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-ch"></span> Switzerland
-          </span>
-        </td>
-        <td data-value="2048">2 GB</td>
-        <td data-value="6000">$ 60</td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="mailbox">
-          <img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
-
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span> Germany
-          </span>
-        </td>
-        <td data-value="2000">2 GB</td>
-        <td data-value="1444">12 €</td>
-        <td data-value="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/provider/Mailfence.png" width="200" height="70">
-        </td>
-        <td>
-          <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>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-be"></span> Belgium
-          </span>
-        </td>
-        <td data-value="500">500 MB</td>
-        <td data-value="0"><span class="label label-warning">Free</span></td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <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="neomailbox">
-          <img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
-        </td>
-        <td>
-          <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>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span> Germany
-          </span>
-        </td>
-        <td data-value="2000">2 GB</td>
-        <td data-value="1444">12 €</td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-        <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>
-      </tr>
-
-      <tr>
-        <td data-value="protonmail">
           <img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70">
         </td>
         <td>
@@ -152,11 +31,7 @@
           <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>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-ch"></span> Switzerland
-          </span>
-        </td>
         <td data-value="500">500 MB</td>
         <td data-value="0"><span class="label label-warning">Free</span></td>
         <td data-value="1"><span class="label label-success">Accepted</span></td>
@@ -165,7 +40,88 @@
       </tr>
 
       <tr>
-        <td data-value="runbox">
+        <td data-value="disroot.org">
+          <img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
+        </td>
+        <td>
+          <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><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
+        <td data-value="2000">2 GB</td>
+        <td data-value="1"><span class="label label-warning">Free</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="Tutanota">
+          <img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70">
+        </td>
+        <td>
+          <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><span class="flag-icon flag-icon-de"></span> Germany</td>
+        <td data-value="1000">1 GB</td>
+        <td data-value="0"><span class="label label-warning">Free</span></td>
+        <td data-value="0"><span class="label label-primary">No</span></td>
+        <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/provider/Mailfence.png" width="200" height="70">
+        </td>
+        <td>
+          <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><span class="flag-icon flag-icon-be"></span> Belgium</td>
+        <td data-value="500">500 MB</td>
+        <td data-value="0"><span class="label label-warning">Free</span></td>
+        <td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="1"><span class="label label-success">Built-in</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="mailbox.org">
+          <img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
+
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
+        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
+        <td data-value="2000">2 GB</td>
+        <td data-value="13">12 €</td>
+        <td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="1"><span class="label label-success">Built-in</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="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><span class="flag-icon flag-icon-de"></span> Germany</td>
+        <td data-value="2000">2 GB</td>
+        <td data-value="13">12 €</td>
+        <td data-value="0"><span class="label label-primary">No</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>
+      </tr>
+
+      <tr>
+        <td data-value="Runbox">
           <img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
 
         </td>
@@ -173,75 +129,75 @@
           <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>
+        <td><span class="flag-icon flag-icon-no"></span> Norway</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-no"></span> Norway
-          </span>
-        </td>
         <td data-value="1000">1 GB</td>
-        <td data-value="1995">$ 19.95</td>
+        <td data-value="20">$ 19.95</td>
         <td data-value="1"><span class="label label-primary">Accepted</span></td>
         <td data-value="0"><span class="label label-primary">No</span></td>
         <td data-value="1"><span class="label label-success">Yes</span></td>
       </tr>
 
       <tr>
-        <td data-value="soverin">
+        <td data-value="Neomailbox">
+          <img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
+        </td>
+        <td>
+          <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="flag-icon flag-icon-ch"></span> Switzerland</td>
+        <td data-value="1000">1 GB</td>
+        <td data-value="50">$ 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="Soverin">
           <img alt="Soverin" src="/assets/img/provider/Soverin.png" width="200" height="70">
         </td>
         <td>
           <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>
+        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span> Netherlands
-          </span>
-        </td>
         <td data-value="25000">25 GB</td>
-        <td data-value="3489">29 €</td>
+        <td data-value="35">29 €</td>
-        <td data-value="0"><span class="label label-success">No</span></td>
         <td data-value="0"><span class="label label-success">No</span></td>
+        <td data-value="1"><span class="label label-success">No</span></td>
         <td data-value="1"><span class="label label-success">Yes</span></td>
       </tr>
 
       <tr>
-        <td data-value="startmail">
+        <td data-value="StartMail">
           <img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
         </td>
         <td>
           <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>
+        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span> Netherlands
-          </span>
-        </td>
         <td data-value="10000">10 GB</td>
-        <td data-value="5995">$ 59.95</td>
+        <td data-value="60">$ 59.95</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">
+        <td data-value="Kolab Now">
-          <img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70">
+          <img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
         </td>
         <td>
-          <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>
+          <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="2011">2011</td>
+        <td data-value="2010">2010</td>
-        <td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-          <span class="no-text-wrap">
+        <td data-value="2048">2 GB</td>
-            <span class="flag-icon flag-icon-de"></span> Germany
+        <td data-value="60">$ 60</td>
-          </span>
+        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        </td>
-        <td data-value="1000">1 GB</td>
-        <td data-value="0"><span class="label label-warning">Free</span></td>
         <td data-value="0"><span class="label label-primary">No</span></td>
-        <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>
 
@@ -255,7 +211,7 @@
   <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>
+<a href="https://mailinabox.email/"><img src="/assets/img/provider/Mail-in-a-Box.png" width="200" height="70" class="img-fluid float-left" alt="Mail-in-a-Box" style="margin-right:10px;"></a>
 <p>Take it a step further and get control of your email with this easy-to-deploy mail server in a box. Mail-in-a-Box lets you become your own mail service provider in a few easy steps. It's sort of like making your own Gmail, but one you control from top
 to bottom. Technically, Mail-in-a-Box turns a fresh cloud computer into a working mail server. But you don't need to be a technology expert to set it up. <strong>More: <a href="https://mailinabox.email/">https://mailinabox.email/</a></strong></p>
 

_includes/sections/file-encryption.html

@@ -1,61 +1,47 @@
 <h1 id="encrypt" class="anchor"><a href="#encrypt"><i class="fas fa-link anchor-icon"></i></a> File Encryption Software</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently not using encryption software for your hard disk, emails, or file archives, you should pick one here.</strong>
+  <strong>If you are currently not using encryption software for your hard disk, emails or file archives, you should pick an encryption software here.</strong>
 </div>
 
-{%
+<div class="row mb-2">
-  include cardv2.html
+
+  {% include card.html color="success"
   title="VeraCrypt - Disk Encryption"
   image="/assets/img/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."
+  url="https://veracrypt.fr/"
-  website="https://veracrypt.fr/"
+  footer="OS: Windows, macOS, Linux."
-  forum="https://forum.privacytools.io/t/discussion-veracrypt-file-encryption/1532"
+  description="VeraCrypt is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file or encrypt a partition
-  git="https://www.veracrypt.fr/code/"
+  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
-  windows="https://www.veracrypt.fr/en/Downloads.html"
+  raised by the initial TrueCrypt code audit have been addressed."
-  linux="https://www.veracrypt.fr/en/Downloads.html"
+  %}
-  mac="https://www.veracrypt.fr/en/Downloads.html"
-%}
 
-{%
+  {% include card.html color="primary"
-  include cardv2.html
   title="GNU Privacy Guard - Email Encryption"
   image="/assets/img/tools/GnuPG.png"
-  description="<strong>GnuPG</strong> is a GPL-licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German government."
+  url="https://gpgtools.org/"
-  website="https://gnupg.org/"
+  footer="OS: Windows, macOS, Linux, Android, BSD."
-  forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533"
+  description="GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification
-  git="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git"
+  of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German
-  windows="https://gpg4win.org/download.html"
+  government. <a href=\"https://gpgtools.org/\">GPGTools for macOS</a>."
-  linux="https://gnupg.org/download/index.html#binary"
+  %}
-  freebsd="https://www.freshports.org/security/gnupg/"
-  openbsd="http://openports.se/security/gnupg"
-  netbsd="http://pkgsrc.se/security/gnupg"
-  mac="https://gpgtools.org/"
-  fdroid="https://f-droid.org/app/org.sufficientlysecure.keychain"
-  googleplay="https://play.google.com/store/apps/details?id=org.sufficientlysecure.keychain"
-%}
 
-{%
+  {% include card.html color="warning"
-  include cardv2.html
   title="PeaZip - File Archive Encryption"
   image="/assets/img/tools/PeaZip.png"
-  description="<strong>PeaZip</strong> is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It also supports 180+ archive formats."
+  url="http://www.peazip.org/"
-  website="http://www.peazip.org"
+  footer="OS: Windows, Linux, BSD."
-  forum="https://forum.privacytools.io/t/discussion-peazip-file-encryption/1534"
+  description="PeaZip is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume
-  source="https://osdn.net/projects/peazip"
+  split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 181 file extensions (as of version 5.5.1).</p>
-  windows="https://www.peazip.org/peazip-64bit.html"
+  <p><strong>macOS alternative:</strong> <a href=\"https://www.keka.io/\">Keka</a> is a free file archiver."
-  linux="https://www.peazip.org/peazip-linux.html"
+  %}
-  freebsd="https://www.freshports.org/archivers/peazip/"
+
-  openbsd="https://www.peazip.org/peazip-bsd.html"
+</div>
-  netbsd="https://www.peazip.org/peazip-bsd.html"
-%}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open-source software: No backdoors, no registration.</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://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><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

@@ -4,11 +4,11 @@
 title="Firefox Send"
 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."
+description="Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether to add an optional password for an extra layer of security."
 forum="https://forum.privacytools.io/t/discussion-firefox-send/755"
 github="https://github.com/mozilla/send"
-web="https://send.firefox.com/"
+web=""
-googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsend"
+android=""
 %}
 
 {% include cardv2.html
@@ -16,34 +16,28 @@ title="OnionShare"
 image="/assets/img/tools/OnionShare.png"
 website="https://onionshare.org/"
 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."
+description="OnionShare is an open source tool that lets you securely and anonymously share a file of any size. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable URL to access and download the files."
 forum="https://forum.privacytools.io/t/discussion-onionshare/754"
 github="https://github.com/micahflee/onionshare"
-windows="https://onionshare.org/#downloads"
+windows=""
-mac="https://onionshare.org/#downloads"
+mac=""
-linux="https://onionshare.org/#downloads"
+linux=""
-freebsd="https://www.freshports.org/www/onionshare/"
-openbsd="http://openports.se/net/onionshare"
 %}
 
 {% include cardv2.html
 title="Magic Wormhole"
 image="/assets/img/tools/Magic-Wormhole.png"
-website="https://magic-wormhole.readthedocs.io"
+website="https://github.com/warner/magic-wormhole"
-description="Magic Wormhole is a package that provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. Their motto: \"Get things from one computer to another, safely.\""
+description="Get things from one computer to another, safely. This package provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another."
 forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756"
 github="https://github.com/warner/magic-wormhole"
-windows="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+windows=""
-mac="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+mac=""
-linux="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+linux=""
-freebsd="https://www.freshports.org/net/py-magic-wormhole/"
-openbsd="https://pypi.org/project/magic-wormhole/"
-netbsd="https://pypi.org/project/magic-wormhole/"
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
   <li><a href="https://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

@@ -1,36 +1,24 @@
-<h1 id="sync" class="anchor">
+<h1 id="sync" class="anchor"><a href="#sync"><i class="fas fa-link anchor-icon"></i></a> Secure File Sync Software</h1>
-  <a href="#sync">
-    <i class="fas fa-link anchor-icon"></i>
-  </a>
-  File Sync
-</h1>
 
-{%
+<div class="row mb-2">
-  include cardv2.html
-  title="Syncthing"
-  image="/assets/img/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"
-  windows="https://github.com/syncthing/syncthing-gtk/releases/latest"
-  linux="https://github.com/syncthing/syncthing-gtk/releases/latest"
-  mac="https://github.com/syncthing/syncthing-macos/releases/latest"
-  fdroid="https://f-droid.org/packages/com.github.catfriend1.syncthingandroid/"
-  googleplay="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid"
-%}
 
-{%
+  {% include card.html color="success"
-  include cardv2.html
   title="SparkleShare"
   image="/assets/img/tools/SparkleShare.png"
-  description="<strong>SparkleShare</strong> creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
+  url="https://sparkleshare.org/"
-  website="https://sparkleshare.org/"
+  footer="OS: Windows, macOS, Linux."
-  forum="https://forum.privacytools.io/t/discussion-sparkleshare/1626"
+  description="SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically
-  github="https://github.com/hbons/SparkleShare"
+  kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
-  linux="https://www.sparkleshare.org/"
+  %}    {% include card.html color="primary"
-  mac="https://github.com/hbons/SparkleShare/releases/"
+  title="Syncthing"
-%}
+  image="/assets/img/tools/Syncthing.png"
+  url="https://syncthing.net/"
+  footer="OS: Windows, macOS, Linux, Android, BSD, Solaris."
+  description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to
+  choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
+  %}
+
+</div>
 
 <h3>Worth Mentioning</h3>
 

_includes/sections/fourteen-eyes.html

@@ -1,8 +1,8 @@
 <h1 id="ukusa" class="anchor"><a href="#ukusa"><i class="fas fa-link anchor-icon"></i></a> Global Mass Surveillance - The Fourteen Eyes</h1>
 
-<img src="/assets/img/layout/UKUSA.png" width="260" height="115" class="img-fluid float-right ml-2" alt="UKUSA Agreement">
+<img src="/assets/img/layout/UKUSA.png" width="260" height="115" class="img-fluid float-right" alt="UKUSA Agreement" style="margin-left:10px;">
 
-<p>The UKUSA Agreement is an agreement between the United Kingdom, United States, Australia, Canada, and New Zealand to cooperatively collect, analyze, and share intelligence. Members of this group, known as the <a href="https://www.giswatch.org/en/communications-surveillance/unmasking-five-eyes-global-surveillance-practices">Five Eyes</a>, focus on gathering and analyzing intelligence from different parts of the world. While Five Eyes countries have agreed to <a href="https://www.pbs.org/newshour/world/an-exclusive-club-the-five-countries-that-dont-spy-on-each-other">not spy on each other</a> as adversaries, leaks by Snowden have revealed that some Five Eyes members monitor each other's citizens and <a href="https://www.theguardian.com/uk/2013/jun/21/gchq-cables-secret-world-communications-nsa">share intelligence</a> to <a href="https://www.theguardian.com/politics/2013/jun/10/nsa-offers-intelligence-british-counterparts-blunkett">avoid breaking domestic laws</a> that prohibit them from spying on their own citizens. The Five Eyes alliance also cooperates with groups of third-party countries to share intelligence (forming the Nine Eyes and Fourteen Eyes); however, Five Eyes and third-party countries can and do spy on each other.</p>
+<p>The UKUSA Agreement is an agreement between the United Kingdom, United States, Australia, Canada, and New Zealand to cooperatively collect, analyze, and share intelligence. Members of this group, known as the <a href="https://www.giswatch.org/en/communications-surveillance/unmasking-five-eyes-global-surveillance-practices">Five Eyes</a>, focus on gathering and analyzing intelligence from different parts of the world. While Five Eyes countries have agreed to <a href="https://www.pbs.org/newshour/world/an-exclusive-club-the-five-countries-that-dont-spy-on-each-other">not spy on each other</a> as adversaries, leaks by Snowden have revealed that some Five Eyes members monitor each other's citizens and <a href="https://www.theguardian.com/uk/2013/jun/21/gchq-cables-secret-world-communications-nsa">share intelligence</a> to <a href="https://www.theguardian.com/politics/2013/jun/10/nsa-offers-intelligence-british-counterparts-blunkett">avoid breaking domestic laws</a> that prohibit them from spying on their own citizens. The Five Eyes alliance also cooperates with groups of third-party countries to share intelligence (forming the Nine Eyes and Fourteen Eyes), however Five Eyes and third-party countries can and do spy on each other.</p>
 
 <div class="row mb-3">
   {% include panel.html color="danger"

_includes/sections/header.html

@@ -1,17 +1,13 @@
-<div class="alert alert-success" role="alert">
-  <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="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>
+  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. privacytools.io provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
 </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="{%t header.search %}" autocomplete="off" value="">
+<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try search.privacytools.io, a Privacy-Respecting Search Engine" autocomplete="off" value="">
 <span class="input-group-btn">
-<button type="submit" class="btn btn-primary input-lg"><span class="hide_if_nojs"><i class="fas fa-search"></i> </span><span class="hidden active_if_nojs">{% t header.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">start search</span></button>
 </span>
 </div>
 </form>

_includes/sections/hosting-provider.html

@@ -3,7 +3,7 @@
 {% include cardv2.html
 title="Data Center: Bahnhof"
 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."
+description="Bahnhof is one of Sweden’s largest network operators, founded in 1994. They specialize in innovative data center construction: Extreme security coupled with low cost green energy has made us world famous."
 website="https://www.bahnhof.net/"
 forum="https://forum.privacytools.io/t/discussion-bahnhof-net/341"
 %}
@@ -11,7 +11,7 @@ forum="https://forum.privacytools.io/t/discussion-bahnhof-net/341"
 {% include cardv2.html
 title="VPS & Domain: Njalla"
 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."
+description="Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service and VPS provider."
 website="https://njal.la/"
 tor="http://njalladnspotetti.onion"
 forum="https://forum.privacytools.io/t/discussion-njalla/339"
@@ -26,9 +26,9 @@ forum="https://forum.privacytools.io/t/discussion-datacell-is/342"
 %}
 
 {% include cardv2.html
-title="VPS, Hosting, & Domain: Orange Website"
+title="VPS & Hosting: Orange Website"
 image="/assets/img/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

@@ -14,30 +14,25 @@ labels="success:VoIP"
 website="https://signal.org/"
 forum="https://forum.privacytools.io/t/discussion-signal/664"
 github="https://github.com/signalapp"
-windows="https://signal.org/download/"
+android=""
-mac="https://signal.org/download/"
+ios=""
-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/us/app/signal-private-messenger/id874139669"
 %}
 
 
 {% 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."
+description="A free software 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"
+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 metadata such as list of your connections/conversations in plaintext (= not encrypted).,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"
+android=""
-mac="https://wire.com/en/download"
+ios=""
-linux="https://wire.com/en/download"
+mac=""
-googleplay="https://play.google.com/store/apps/details?id=com.wire"
+windows=""
-android="https://wire.com/en/download"
+linux=""
-ios="https://itunes.apple.com/app/wire/id930944768?mt=8"
+web=""
-web="https://app.wire.com"
 %}
 
 <h3>Complete Comparison</h3>
@@ -51,27 +46,28 @@ web="https://app.wire.com"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <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://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.
-  <li><a href="https://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 E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </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://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://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://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>
+    <li><a href="https://omemo.top/">Other OMEMO ready clients</a>.</li>
   </ul>
   <li><a href="https://www.kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
   <li><a href="https://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
   <li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
-  <li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging, and video calling software. <span class="badge badge-success">VoIP</span></li>
+  <li><a href="https://ricochet.im/">Ricochet</a> - <span class="badge badge-danger" data-toggle="tooltip" title="This software is safe if you manually keep Tor up to date."><a href="#ricochetTor" class="text-white">Danger</a></span> <span class="badge badge-warning" data-toggle="tooltip" title="This software is considered safe but experimental and the client has not been updated since 2016."><a href="https://github.com/ricochet-im/ricochet#experimental">Experimental</a></span> Ricochet uses the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor network</a> to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with your contacts without revealing your location or IP address.</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>
+  <li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. <span class="badge badge-success">VoIP</span></li>
+  <li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you full control over your communications and an unmatched level of privacy. Jami has <em>text messaging, video and audio calls, file transfer, video conferencing</em>. <span class="badge badge-success">VoIP</span></li>
 </ul>
 
 
 <h3>Related Information</h3>
 
 <ul>
+  <li><a href="https://www.vice.com/en_us/article/mg7v3a/ricochet-encrypted-messenger-tackles-metadata-problem-head-on">Ricochet, the Messenger That Beats Metadata, Passes Security Audit | Motherboard</a></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>
@@ -81,3 +77,38 @@ web="https://app.wire.com"
     <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>
+
+<!-- Updating the Tor binary included with Ricochet -->
+<h3 id="ricochetTor" class="anchor"><a href="#ricochetTor"><i class="fas fa-link anchor-icon"></i></a> Updating the Tor binary included with Ricochet</h3>
+
+Currently there are no known vulnerabilities with Ricochet. The software is safe to use as long as you update the included Tor binary to the latest version.
+
+<ol class="long-string-list">
+  <li>Download the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor Browser</a>.</li>
+  <li>Run the Tor Browser installer or extract package for your platform. Windows (.exe), MacOSX (.dmg) and Linux (.tar.bz2).</li>
+  <li>Copy the Tor binary or create a symbolic link to it: </li>
+  <br>
+  <ul>
+      <li><strong>Windows: </strong>Copy the Tor binary included with the Tor Browser and overwrite the old one included with Ricochet.</li>
+      <ul>
+          <li>Tor Browser binary: <code>%HOMEPATH%\Desktop\Tor Browser\Browser\TorBrowser\Tor\tor.exe</code></li>
+          <li>Ricochet's included binary: <code>%HOMEPATH%\Desktop\Ricochet\tor.exe</code></li>
+      </ul>
+      <br>
+      <li><strong>MacOSX: </strong>Assuming you copied the <code>Tor Browser.app</code> and <code>Ricochet.app</code> from their respective .dmg install media to <code>/Applications</code>: <br>
+          Create a symbolic link to the Tor binary in Terminal. Ricochet will continue to use the up to date version of the Tor binary when you update the Tor Browser Bundle.</li>
+      <ul>
+          <li><code>rm ~/Applications/Ricochet.app/Contents/MacOS/tor <br>
+                    ln -s ~/Applications/Tor\ Browser.app/Contents/Resources/TorBrowser/Tor/tor \ <br>
+                          ~/Applications/Ricochet.app/Contents/MacOS/tor</code>
+          </li>
+      </ul>
+      <br>
+      <li><strong>Linux: </strong>Assuming you extracted the Tor Browser Bundle and Ricochet tarball to your home directory:</li>
+      <ul>
+          <li><code>rm ~/ricochet/tor <br>
+                    ln -s ~/tor-browser_en-US/Browser/TorBrowser/Tor/tor ~/ricochet/tor</code>
+          </li>
+      </ul>
+  <ul>
+</ol>

_includes/sections/key-disclosure-law.html

@@ -67,9 +67,9 @@
 
 <h3 id="usa" class="anchor">Why is it not recommended to choose a US-based service?</h3>
 
-<img src="/assets/img/layout/USA.png" width="200" height="200" class="img-fluid float-right ml-3" alt="USA">
+<img src="/assets/img/layout/USA.png" width="200" height="200" class="img-fluid float-right" alt="USA" style="margin-left:10px;">
 
-<p>Services based in the United States are not recommended because of the country's surveillance programs and use of <a href="https://www.eff.org/issues/national-security-letters/faq">National Security Letters</a> (NSLs) with accompanying gag orders, which forbid the recipient from talking about the request. This combination allows the government to <a href="https://www.schneier.com/blog/archives/2013/08/more_on_the_nsa.html">secretly force</a> companies to grant complete access to customer data and transform the service into a tool of mass surveillance.</p>
+<p>Services based in the United States are not recommended because of the country's surveillance programs, use of <a href="https://www.eff.org/issues/national-security-letters/faq">National Security Letters</a> (NSLs) and accompanying gag orders, which forbid the recipient from talking about the request. This combination allows the government to <a href="https://www.schneier.com/blog/archives/2013/08/more_on_the_nsa.html">secretly force</a> companies to grant complete access to customer data and transform the service into a tool of mass surveillance.</p>
 
 <p>An example of this is <a href="https://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order">Lavabit</a> – a secure email service created by Ladar Levison. The FBI <a href="https://www.vice.com/en_us/article/nzz888/lavabit-founder-ladar-levison-discusses-his-federal-battle-for-privacy">requested</a> Snowden's records after finding out that he used the service. Since Lavabit did not keep logs and email content was stored encrypted, the FBI served a subpoena (with a gag order) for the service's SSL keys. Having the SSL keys would allow them to access
 communications (both metadata and unencrypted content) in real time for all of Lavabit's customers, not just Snowden's.</p>

_includes/sections/live-operating-systems.html

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

_includes/sections/mobile-operating-systems.html

@@ -1,23 +1,15 @@
-<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>
+<h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> Mobile Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>{% t mobile_os.google_warning %}</strong>
+  <strong>Even though the source code of the following OS is provided, installing Google Apps may compromise your setup.</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/tools/GrapheneOS.png"
-image-dark="/assets/img/tools/GrapheneOS-dark.png"
+description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security and privacy focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
-description=mobile_os_grapheneos_descr
 badges="info:AOSP"
-labels=mobile_os_grapheneos_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://grapheneos.org/"
 github="https://github.com/GrapheneOS/"
 %}
@@ -25,9 +17,9 @@ github="https://github.com/GrapheneOS/"
 {% include cardv2.html
 title="LineageOS"
 image="/assets/img/tools/LineageOS.png"
-description=mobile_os_lineageos_descr
+description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.'
 badges="info:AOSP"
-labels=mobile_os_lineageos_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.lineageos.org/"
 github="https://github.com/LineageOS"
 %}
@@ -35,17 +27,17 @@ github="https://github.com/LineageOS"
 {% include cardv2.html
 title="Ubuntu Touch"
 image="/assets/img/tools/Ubuntu-Touch.png"
-description=mobile_os_ubuntu_touch_descr
+description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are <a href=https://devices.ubuntu-touch.io/>supported.</a>"
 badges="info:GNU/Linux"
-labels=mobile_os_ubuntu_touch_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://ubuntu-touch.io/"
 github="https://github.com/ubports"
 %}
 
-<h3>{% t mobile_os.worth_mentioning %}</h3>
+<h3>Worth Mentioning</h3>
 
 <ul>
-  <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.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="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t mobile_os.omnirom_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="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="{% 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>
+  <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.
 </ul>

_includes/sections/notebooks.html

@@ -1,24 +1,22 @@
 <h1 id="notebook" class="anchor"><a href="#notebook"><i class="fas fa-link anchor-icon"></i></a> Digital Notebook</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using an application like Evernote, Google Keep, or Microsoft OneNote, you should pick an alternative here.</strong>
+  <strong>If you are currently using an application like Evernote, Google Keep or Microsoft OneNote you should pick an alternative here.</strong>
 </div>
 
 {% include cardv2.html
 title="Joplin"
 image="/assets/img/tools/Joplin.png"
-description="Joplin is a free, open-source, and fully-featured note-taking and to-do application which can handle a large number of markdown notes organized into notebooks and tags. It offers end-to-end encryption and can sync through Nextcloud, Dropbox, and more. It also offers easy import from Evernote and plain-text notes."
+description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
 website="https://joplinapp.org/"
 github="https://github.com/laurent22/joplin"
-windows="https://joplinapp.org/#desktop-applications"
+windows=""
-mac="https://joplinapp.org/#desktop-applications"
+mac=""
-linux="https://joplinapp.org/#desktop-applications"
+linux=""
-freebsd="https://www.npmjs.com/package/joplin"
+ios=""
-googleplay="https://joplinapp.org/images/BadgeAndroid.png"
+android=""
-android="https://joplinapp.org/#mobile-applications"
+firefox=""
-ios="https://itunes.apple.com/us/app/joplin/id1315599797"
+chrome=""
-firefox="https://addons.mozilla.org/en-US/firefox/addon/joplin-web-clipper/"
-chrome="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek"
 %}
 
 {% include cardv2.html
@@ -27,13 +25,12 @@ 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"
+windows=""
-mac="https://standardnotes.org/#get-started"
+mac=""
-linux="https://standardnotes.org/#get-started"
+linux=""
-ios="https://itunes.apple.com/us/app/standard-notes/id1285392450"
+ios=""
-fdroid="https://f-droid.org/packages/com.standardnotes/"
+android=""
-googleplay="https://play.google.com/store/apps/details?id=com.standardnotes"
+web=""
-web="https://app.standardnotes.org/"
 %}
 
 {% include cardv2.html
@@ -42,13 +39,10 @@ image="/assets/img/tools/Turtl.png"
 description="Turtl lets you take notes, bookmark websites, and store documents for sensitive projects. From sharing passwords with your coworkers to tracking research on an article you're writing, Turtl keeps it all safe from everyone but you and those you share with."
 website="https://turtlapp.com/"
 github="https://github.com/turtl"
-windows="https://turtlapp.com/download/"
+windows=""
-mac="https://turtlapp.com/download/"
+mac=""
-linux="https://turtlapp.com/download/"
+linux=""
-googleplay="https://play.google.com/store/apps/details?id=com.lyonbros.turtl"
+android=""
-android="https://turtlapp.com/download/"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/turtl-bookmarking/"
-chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheihjadlpcml"
 %}
 
 <h3>Warning</h3>
@@ -61,6 +55,6 @@ chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheih
 
 <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://paperwork.cloud/">Paperwork</a> - Open source and self-hosted solution. For PHP / MySQL servers.</li>
   <li><a href="https://orgmode.org">Org-mode</a> - A major mode for GNU Emacs. Org-mode is for keeping notes, maintaining TODO lists, planning projects, and authoring documents with a fast and effective plain-text system. </li>
 </ul>

_includes/sections/operating-systems.html

@@ -1,85 +1,51 @@
-<h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> {% t pc_os.pc_operating_systems %}</h1>
+<h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> PC Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>{% t pc_os.ms_warning %}</strong>
+  <strong>If you are currently using a operating system like Windows 10, you should pick an alternative here.</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/tools/Qubes-OS.png"
-description=pc_os_qubesos_descr
+description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.'
 badges="info:Xen"
-labels=pc_os_contrib_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.qubes-os.org/"
 github="https://github.com/QubesOS"
 tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
 %}
 
 {% include cardv2.html
-title="Fedora Workstation"
+title="Debian"
-image="/assets/img/tools/Fedora.png"
+image="/assets/img/tools/Debian.png"
-description=pc_os_fedora_descr
+description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.'
 badges="info:GNU/Linux"
-labels=pc_os_contrib_labels
+website="https://www.debian.org/"
-website="https://getfedora.org/"
+git="https://salsa.debian.org/qa/debsources"
-git="https://src.fedoraproject.org/"
+tor="http://sejnfjrq6szgca7v.onion"
 %}
 
 {% include cardv2.html
-title="Debian"
+title="Trisquel"
-image="/assets/img/tools/Debian.png"
+image="/assets/img/tools/Trisquel.png"
-description=pc_os_debian_descr
+description='Trisquel is a Linux-based operating system derived from Ubuntu. The 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.'
 badges="info:GNU/Linux"
-website="https://www.debian.org/"
+website="https://trisquel.info/"
-tor="http://sejnfjrq6szgca7v.onion"
+git="https://devel.trisquel.info/groups/trisquel"
-gitlab="https://salsa.debian.org/qa/debsources"
 %}
 
-<h3>{% t pc_os.worth_mentioning %}</h3>
+<h3>Warning</h3>
 
 <ul>
-  <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="#win10"><i class="fas fa-link"></i> Don't use Windows 10 - It's a privacy nightmare</a></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>
+<h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="#win10"><i class="fas fa-link"></i> {% t pc_os.win10_nightmare %}</a></li>
+  <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>
-</ul>
+  <li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</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>
-<h4 id="cpuvulns">Remember to check CPU vulnerability mitigations</h4>
+  <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>
-<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,15 +1,8 @@
 <div class="page-header">
-  <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> {% t participate.participate %}</h1>
+  <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> Participate with suggestions and constructive criticism</h1>
 </div>
 
-<p>{% 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>
+<p>It's important for a website like privacytools.io to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a rel="me" href="https://social.privacytools.io/@privacytools">our own Mastodon instance</a> or on <a href="https://chat.privacytools.io">Matrix</a> at <code class="highlighter-rouge">#general:privacytools.io</code>.</p>
-
-{%- 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">
 
@@ -19,27 +12,27 @@
   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=discourse
+  description='Join our Discourse community to stay up to date on privacy news or make suggestions!'
   %}
 
   {% include card.html color="primary"
-  title=mastodon
+  title="Follow on Mastodon & Twitter"
   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=mastodon2
+  description="Get the latest privacy-related updates from our Mastodon Feed. Follow us today!"
   %}
 
   {% include card.html color="warning"
-  title=github
+  title="Develop on GitHub"
-  font="fab fa-github"
+  image="/assets/img/icons/github.png"
   url="https://github.com/privacytoolsIO/privacytools.io"
   website="GitHub"
-  description=github2
+  description="The complete website source code is available on GitHub. Join our developer team!"
-  extra_button=contrib
+  extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">Contributor List</a>'
   %}
 
 </div>
 
-<p>{% t participate.thanks %}</p>
+<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>

_includes/sections/password-managers.html

@@ -1,85 +1,52 @@
 <h1 id="pw" class="anchor"><a href="#pw"><i class="fas fa-link anchor-icon"></i></a> Password Manager Software</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a password manager software like 1Password, LastPass, Roboform, or iCloud Keychain, you should pick an alternative here.</strong>
+  <strong>If you are currently using a password manager software like 1Password, LastPass, Roboform or iCloud Keychain, you should pick an alternative here.</strong>
 </div>
 
-{%
+<div class="row mb-2">
-  include cardv2.html
+
+  {% include card.html color="success"
   title="Bitwarden - Cloud/Self-host"
   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."
+  url="https://bitwarden.com/"
-  website="https://bitwarden.com/"
+  footer="OS: Windows, macOS, Linux, iOS, Android, Web."
-  forum="https://forum.privacytools.io/t/discussion-bitwarden/1343"
+  description="Bitwarden 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."
-  github="https://github.com/bitwarden"
+  %}
-  web="https://vault.bitwarden.com/#/"
-  windows="https://bitwarden.com/#download"
-  linux="https://bitwarden.com/#download"
-  freebsd="https://www.npmjs.com/package/@bitwarden/cli"
-  openbsd="https://www.npmjs.com/package/@bitwarden/cli"
-  netbsd="https://www.npmjs.com/package/@bitwarden/cli"
-  mac="https://bitwarden.com/#download"
-  firefox="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/"
-  chrome="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb"
-  safari="https://safari-extensions.apple.com/details/?id=com.bitwarden.safari-LTZ2PFU5D6"
-  opera="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/"
-  edge="https://www.microsoft.com/store/apps/9P6KXL0SVNNL"
-  fdroid="https://mobileapp.bitwarden.com/fdroid/"
-  googleplay="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
-  ios="https://itunes.apple.com/app/bitwarden-free-password-manager/id1137397744?mt=8"
-%}
 
-{%
+  {% include card.html color="primary"
-  include cardv2.html
+  title="KeePass / KeePassXC - Local"
-  title="KeePassXC - Local"
+  image="/assets/img/tools/KeePass.png"
-  image="/assets/img/tools/keepassxc.png"
+  url="https://keepass.info/download.html"
-  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="keepass.info"
-  website="https://keepassxc.org/"
+  footer="OS: Windows, macOS, Linux, iOS, Android, BSD."
-  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
+  description='KeePass is a free open source password manager, which helps you to manage your passwords in a secure way. All passwords in one database, which is locked with one
-  github="https://github.com/keepassxreboot/keepassxc"
+  master key or a key file. The databases are encrypted using the best and most secure encryption algorithms currently known: AES and Twofish. See also: <a href="https://keepassxc.org/">KeePassXC</a> with official native cross-platform support for Windows/macOS/Linux.'
-  windows="https://keepassxc.org/download/#windows"
+  %}
-  linux="https://keepassxc.org/download/#linux"
+  {% include card.html color="warning"
-  mac="https://keepassxc.org/download/#mac"
-  freebsd="https://www.freshports.org/security/keepassxc/"
-  openbsd="http://openports.se/security/keepassxc"
-  netbsd="http://pkgsrc.se/security/keepassxc"
-  fdroid="https://f-droid.org/packages/com.kunzisoft.keepass.libre/"
-  googleplay="https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free"
-  firefox="https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser"
-  chrome="https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk"
-%}
-
-{%
-  include cardv2.html
   title="LessPass - Browser"
   image="/assets/img/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."
+  url="https://lesspass.com/"
-  website="https://lesspass.com/"
+  footer="OS: Windows, macOS, Linux, Android."
-  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
+  description="LessPass 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."
-  github="https://github.com/lesspass/lesspass"
+  %}
-  windows="https://pypi.org/project/lesspass/"
+
-  mac="https://pypi.org/project/lesspass/"
+</div>
-  linux="https://pypi.org/project/lesspass/"
-  freebsd="https://pypi.org/project/lesspass/"
-  firefox="https://addons.mozilla.org/en-US/firefox/addon/lesspass/"
-  chrome="https://chrome.google.com/webstore/detail/lesspass/lcmbpoclaodbgkbjafnkbbinogcbnjih"
-  fdroid="https://f-droid.org/packages/com.lesspass.android"
-  googleplay="https://play.google.com/store/apps/details?id=com.lesspass.android"
-%}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
   <li>
-    <a href="https://masterpassword.app">Master Password</a> - A password manager based on an ingenious password-generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site, and your master password. No syncing, backups, or internet access needed.
+    <a href="https://masterpassword.app">Master Password</a> - Master Password is based on an ingenious password generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site and your master password. No syncing, backups or internet access needed.
   </li>
 
   <li>
-    <a href="https://psono.com/">Psono</a> - Free and open source password manager for teams with client side encryption and secure sharing of passwords, files, bookmarks, emails. All secrets are protected by a master password. Uses <a href="https://nacl.cr.yp.to/">NACL Crypto</a>, a combination of Curve25519, Salsa20 and Poly1305.
+    <a href="https://psono.com/">Psono</a> - Free and open source password manager for teams with client side encryption and secure sharing of passwords, files, bookmarks, emails... All secrets are protected by a master password. Uses <a href="https://nacl.cr.yp.to/">NACL Crypto</a>, a combination of Curve25519, Salsa20 and Poly1305.
   </li>
 
   <li>
-    <a href="https://pwsafe.org/">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted username/password list. With Password Safe all you have to do is create and remember a single "Master Password" of your choice in order to unlock and access your entire username/password list.
+    <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>
 </ul>
 

_includes/sections/paste-services.html

@@ -3,8 +3,8 @@
 {% include cardv2.html
 title="PrivateBin"
 image="/assets/img/tools/PrivateBin.png"
-description="PrivateBin is a minimalist, open-source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256-bit AES. It is the improved version of ZeroBin."
+description="PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256bit AES. It is the improved version of ZeroBin."
-website="https://privatebin.info/"
+website="https://bin.privacytools.io/"
 forum="https://forum.privacytools.io/t/discussion-privatebin/296"
 github="https://github.com/PrivateBin/PrivateBin"
 %}
@@ -13,7 +13,7 @@ github="https://github.com/PrivateBin/PrivateBin"
 {% include cardv2.html
 title="CryptPad"
 image="/assets/img/provider/CryptPad.png"
-description="CryptPad is an open-source, zero knowledge, and real-time collaborative editor. Data is encrypted/decrypted in the browser, using Salsa20 with Poly1305 to encrypt pads."
+description="CryptPad is an open source, zero knowledge, realtime collaborative editor. Data is encrypted/decrypted in the browser using 256bit AES."
 website="https://cryptpad.fr/pad/"
 forum="https://forum.privacytools.io/t/discussion-cryptpad/1270"
 github="https://github.com/xwiki-labs/cryptpad"

_includes/sections/privacy-resources.html

@@ -1,42 +1,43 @@
-<h1 id="resources" class="anchor"><a href="#resources"><i class="fas fa-link anchor-icon"></i></a> {% t privacy_resources.header %}</h1>
+<h1 id="resources" class="anchor"><a href="#resources"><i class="fas fa-link anchor-icon"></i></a> More Privacy Resources</h1>
 
-<h3>{% t privacy_resources.guides %}</h3>
+<h3>Guides</h3>
 
 <ul>
-  <li><a href="https://ssd.eff.org/"><strong>{% t privacy_resources.guide1 %}</strong></a> - {% t privacy_resources.guide1_d %}</li>
+  <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>{% t privacy_resources.guide2 %}</strong></a> - {% t privacy_resources.guide2_d %}</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>{% t privacy_resources.guide3 %}</strong></a> - {% t privacy_resources.guide3_d %}</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>{% t privacy_resources.guide4 %}</strong></a> - {% t privacy_resources.guide4_d %}</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>{% t privacy_resources.guide5 %}</strong></a> - {% t privacy_resources.guide5_d %}</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>{% t privacy_resources.guide6 %}</strong></a> - {% t privacy_resources.guide6_d %}</li>
+  <li><a href="https://fried.com/privacy"><strong>The Ultimate Guide to Online Privacy</strong></a> - Comprehensive "Ninja Privacy Tips" and 150+ tools.</li>
 </ul>
 
 <h3>Information</h3>
 
 <ul>
-  <li><a href="https://freedom.press/"><strong>{% t privacy_resources.info5 %}</strong></a> - {% t privacy_resources.info5_d %}</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.erfahrungen.com/mit/anonymisierung/t/"><strong>{% t privacy_resources.info6 %}</strong></a> - {% t privacy_resources.info6_d %}</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://openwireless.org/"><strong>{% t privacy_resources.info4 %}</strong></a> - {% t privacy_resources.info4_d %}</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://privacy.net/us-government-surveillance-spying-data"><strong>{% t privacy_resources.info8 %}</strong></a> - {% t privacy_resources.info8_d %}</li>
+  <li><a href="https://keybase.io/"><strong>Keybase.io</strong></a> - Get a public key, safely, starting just with someone's social media username.</li>
-  <li><a href="https://www.reddit.com/r/privacytoolsIO/wiki/index"><strong>{% t privacy_resources.info1 %}</strong></a> - {% t privacy_resources.info1_d %}</li>
+  <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.grc.com/securitynow.htm"><strong>{% t privacy_resources.info2 %}</strong></a> - {% t privacy_resources.info2_d %}</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://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>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://tosdr.org/"><strong>{% t privacy_resources.info7 %}</strong></a> - {% t privacy_resources.info7_d %}</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://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>{% t privacy_resources.tool1 %}</strong></a> - {% t privacy_resources.tool1_d %}</li>
+  <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>{% t privacy_resources.tool2 %}</strong></a> - {% t privacy_resources.tool2_d %}</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>{% t privacy_resources.tool3 %}</strong></a> - {% t privacy_resources.tool3_d %}</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>{% t privacy_resources.tool4 %}</strong></a> - {% t privacy_resources.tool4_d %}</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>{% t privacy_resources.tool5 %}</strong></a> - {% t privacy_resources.tool5_d %}</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
-  <li><a href="https://pack.resetthenet.org/"><strong>{% t privacy_resources.tool6 %}</strong></a> - {% t privacy_resources.tool6_d %}</li>
+    by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation.</li>
-  <li><a href="https://secfirst.org/"><strong>{% t privacy_resources.tool7 %}</strong></a> - {% t privacy_resources.tool7_d %}</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://www.osalt.com/"><strong>{% t privacy_resources.tool8 %}</strong></a> - {% t privacy_resources.tool8_d %}</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://alternativeto.net/"><strong>{% t privacy_resources.tool9 %}</strong></a> - {% t privacy_resources.tool9_d %}</li>
+  <li><a href="https://notabug.org/themusicgod1/cloudflare-tor"><strong>Block Cloudflare MiTM Attack</strong></a> - Firefox add-on to detect and block Cloudflare MITM attack.</li>
+  <li><a href="https://www.osalt.com/"><strong>Osalt</strong></a> - A directory to help you find open source alternatives to proprietary tools.</li>
+  <li><a href="https://alternativeto.net/"><strong>AlternativeTo</strong></a> - A directory to help find alternatives to other software, with the option to only show open source software</li>
 </ul>
 
-<p>{% t privacy_resources.note %}</p>
+<p>Note: Just being open source does not make software secure!</p>

_includes/sections/productivity-tools.html

@@ -1,85 +1,43 @@
 <h1 id="productivity" class="anchor"><a href="#productivity"><i class="fas fa-link anchor-icon"></i></a> Productivity Tools</h1>
 
-{%
+<div class="row mb-2">
-  include cardv2.html
-  title="CryptPad"
-  image="/assets/img/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"
-  github="https://github.com/xwiki-labs/cryptpad"
-  web="https://cryptpad.fr/"
-%}
 
-{%
+  {% include card.html color="success"
-  include cardv2.html
+    title="CryptPad"
+    image="/assets/img/provider/CryptPad.png"
+
+    description="CryptPad is a private-by-design alternative to popular office tools and cloud services. All content is end-to-end encrypted. It is free and open source, enabling anyone to verify its security by auditing the code. The development team is supported by donations and grants. No registration is required, and it can be used anonymously via Tor browser."
+
+    url="https://cryptpad.fr/"
+    footer='OS: Linux, macOS, Windows, Web.'
+  %}
+
+  {% include card.html color="primary"
   title="Etherpad"
   image="/assets/img/tools/Etherpad.png"
-  image-dark="/assets/img/tools/Etherpad-dark.png"
+  url="https://etherpad.org/"
-  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>."
+  footer="OS: Windows, macOS, Linux."
-  website="https://etherpad.org/"
+  description="Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc. <a href=https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad>Sites That Run Etherpad</a>"
-  forum="https://forum.privacytools.io/t/discussion-etherpad-productivity-tools/1538"
+  %}
-  github="https://github.com/ether/etherpad-lite"
-  web="https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad"
-  windows="https://github.com/ether/etherpad-lite#windows"
-  linux="https://github.com/ether/etherpad-lite#installation"
-  mac="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
-  freebsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
-  openbsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
-  netbsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
-%}
 
-{%
+  {% include card.html color="warning"
-  include cardv2.html
   title="Write.as"
   image="/assets/img/tools/WriteAs.png"
-  image-dark="/assets/img/tools/WriteAs-dark.png"
+  url="https://write.as/"
-  description="<strong>Write.as</strong> is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model."
-  website="https://write.as/"
-  forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539"
   tor="http://writeas7pm7rcdqg.onion"
-  git="https://code.as/writeas"
+  footer="OS: Windows, macOS, Linux, Android, iOS, Chrome OS, Web."
-  web="https://write.as/pad"
+  description="Write.as is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model."
-  windows="https://github.com/writeas/writeas-cli"
+  %}
-  mac="https://github.com/writeas/writeas-cli"
+
-  linux="https://write.as/apps"
+</div>
-  chrome="https://write.as/apps"
-  googleplay="https://play.google.com/store/apps/details?id=com.abunchtell.writeas"
-  ios="https://itunes.apple.com/app/apple-store/id1000755153"
-%}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
   <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
   <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
-  <li><a href="https://disroot.org/">Disroot</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
+  <li><a href="https://disroot.org/">disroot.org</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
-  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open-source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
+  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, which is free and OpenSource. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
-  <li><a href="https://framadate.org/">Framadate</a> - A free and open-source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
+  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite</li>
-  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open-source office suite.</li>
+  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Visual Studio Code editor without Microsoft's tracking </li>
-  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Microsoft's Visual Studio Code editor without branding or telemetry.</li>
 </ul>
-
-<h1 id="metadata-removal-tools" class="anchor">
-  <a href="#metadata-removal-tools"
-    ><i class="fas fa-link anchor-icon"></i>
-  </a> Metadata Removal Tools
-</h1>
-
-<div class="row mb-2">
-{%
-  include cardv2.html
-  title="MAT2"
-  image="/assets/img/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"
-  gitlab="https://0xacab.org/jvoisin/mat2"
-  windows="https://pypi.org/project/mat2/"
-  mac="https://pypi.org/project/mat2/"
-  linux="https://pypi.org/project/mat2/"
-  freebsd="https://pypi.org/project/mat2/"
-  openbsd="https://pypi.org/project/mat2/"
-  netbsd="https://pypi.org/project/mat2/"
-%}
-</div>

_includes/sections/quotes.html

@@ -1,5 +1,5 @@
 <div class="page-header">
-  <h1>{% t quotes.header %}</h1>
+  <h1>Privacy? I don't have anything to hide.</h1>
 </div>
 <blockquote class="blockquote">
   <p><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - Why privacy matters - TED Talk"><img src="/assets/img/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>
@@ -14,7 +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>
 
-<h4>{% t global.further_reading %}</h4>
+<h4>Read also:</h4>
 
 <ul>
   <li><a href="https://en.wikipedia.org/wiki/Nothing_to_hide_argument">Nothing to hide argument (Wikipedia)</a></li>
@@ -22,7 +22,7 @@
   <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> {% t quotes.quotes %}</h1>
+<h1 id="quotes" class="anchor"><a href="#quotes"><i class="fas fa-link anchor-icon"></i></a> Quotes</h1>
 
 <blockquote class="blockquote">
   <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>

_includes/sections/resources.html

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

_includes/sections/router-firmware.html

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

_includes/sections/search-engines.html

@@ -1,13 +1,13 @@
 <h1 id="search" class="anchor"><a href="#search"><i class="fas fa-link anchor-icon"></i></a> Privacy Respecting Search Engines</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong> If you are currently using search engines like Google, Bing, or Yahoo, you should pick an alternative here. </strong>
+  <strong> If you are currently using search engines like Google, Bing or Yahoo, you should pick an alternative here. </strong>
 </div>
 
 {% include cardv2.html
 title="searx - Decentral"
-image="/assets/img/provider/searx.png"
+image="/assets/img/provider/searx.jpg"
-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>'
+description='An <a href="https://github.com/asciimoo/searx">open source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">List of Instances</a> or try <a href="https://search.privacytools.io/">search.privacytools.io</a>'
 website="https://searx.me/"
 tor="http://ulrn6sryqaifefld.onion"
 forum="https://forum.privacytools.io/t/discussion-searx/283"
@@ -17,15 +17,15 @@ 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."
+description="Google search results, with complete privacy protection. Behind StartPage is a European company that has been obsessive about privacy since 2006."
 website="https://www.startpage.com/"
 forum="https://forum.privacytools.io/t/discussion-startpage/284"
 %}
 
 {% include cardv2.html
 title="DuckDuckGo - USA"
-image="/assets/img/provider/DuckDuckGo.png"
+image="/assets/img/provider/DuckDuckGo.jpg"
-description='DuckDuckGo is a "search engine that doesn\'t track you." Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="../../providers/#ukusa">The company is based in the USA.</a>'
+description='The search engine that doesn\'t track you. Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="../../providers/#ukusa">The company is based in the USA.</a>'
 website="https://duckduckgo.com/"
 tor="http://3g2upl4pq6kufc4m.onion"
 forum="https://forum.privacytools.io/t/discussion-duckduckgo/285"
@@ -34,8 +34,8 @@ github="https://github.com/duckduckgo"
 
 {% include cardv2.html
 title="Qwant - France"
-image="/assets/img/provider/Qwant.png"
+image="/assets/img/provider/qwant.jpg"
-description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013.'
+description='Qwants philosophy is based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013. <a href="https://www.qwant.com/privacy">Privacy Policy.</a>'
 website="https://www.qwant.com/"
 forum="https://forum.privacytools.io/t/discussion-qwant/286"
 github="https://github.com/Qwant/"
@@ -54,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.</a></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://jivesearch.com/">Jive Search</a> - A free software search engine with a similar look and feel to Google.</a></li>
-  <li><a href="https://metager.de/en/">MetaGer</a> - An open-source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>
+  <li><a href="https://metager.de/en/">MetaGer</a> - An open source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>
   <li><a href="https://www.mojeek.com/">Mojeek</a> - Independent and unbiased search results with no user tracking.</li>
 </ul>

_includes/sections/self-contained-networks.html

@@ -21,7 +21,7 @@
   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."
+  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 card.html color="warning"
@@ -45,14 +45,9 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://zeronet.io/">ZeroNet</a> - Open, free, and uncensorable websites, using Bitcoin cryptography and BitTorrent network.</li>
+  <li><a href="https://zeronet.io/">ZeroNet</a> - Open, free and uncensorable websites, using Bitcoin cryptography and BitTorrent network.</li>
-  <li><a href="https://retroshare.cc/">RetroShare</a> - An open source, cross-platform, friend-to-friend, secure, and decentralized communication platform.</li>
+  <li><a href="https://retroshare.cc/">RetroShare</a> - Open Source cross-platform, Friend-2-Friend and secure decentralized communication platform.</li>
   <li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
-  <li><a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). <a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">
+  <li><a href="https://ipfs.io/">IPFS</a> - A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. (<a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">important privacy warning</a>)</li>
-    <span class="badge badge-danger" data-toggle="tooltip" title="">
+  <li><a href="https://yggdrasil-network.github.io/">Yggdrasil</a> - An early-stage implementation of a fully end-to-end encrypted IPv6 network. It is lightweight, self-arranging, supported on multiple platforms and allows pretty much any IPv6-capable application to communicate securely with other Yggdrasil nodes. Yggdrasil does not require you to have IPv6 Internet connectivity - it also works over IPv4. <span class="badge badge-warning" data-toggle="tooltip" title="The project is currently in early stages but it is being actively developed.">experimental <i class=\"far fa-question-circle\"></i></span> <span class="badge badge-danger" data-toggle="tooltip" title="Yggdrasil doesn't have a goal of providing anonymity and your peers know your IP address unless you are only using Tor/I2P peers.">privacy warning <i class="far fa-question-circle"></i></span></li>
-    <span class="fas fa-exclamation-triangle"></span>
-        Important privacy warning
-      </span>
-          </a></li>
-  <li><a href="https://yggdrasil-network.github.io/">Yggdrasil</a> - An early-stage implementation of a fully end-to-end encrypted IPv6 network. It is lightweight, self-arranging, supported on multiple platforms, and allows pretty much any IPv6-capable application to communicate securely with other Yggdrasil nodes. Yggdrasil does not require you to have IPv6 Internet connectivity - it also works over IPv4. <span class="badge badge-warning" data-toggle="tooltip" title="The project is currently in early stages but it is being actively developed.">experimental <i class=\"far fa-question-circle\"></i></span> <span class="badge badge-danger" data-toggle="tooltip" title="Yggdrasil doesn't have a goal of providing anonymity and your peers know your IP address unless you are only using Tor/I2P peers.">privacy warning <i class="far fa-question-circle"></i></span></li>
 </ul>

_includes/sections/selfhosted-cloud.html

@@ -4,39 +4,37 @@
   <strong>If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own.</strong>
 </div>
 
-{% include cardv2.html
+<div class="row mb-2">
-title="Nextcloud"
-image="/assets/img/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"
-mac="https://nextcloud.com/install/#install-clients"
-linux="https://nextcloud.com/install/#install-clients"
-freebsd="https://www.freshports.org/www/nextcloud/"
-openbsd="http://openports.se/www/nextcloud"
-netbsd="http://pkgsrc.se/www/php-nextcloud"
-fdroid="https://f-droid.org/packages/com.nextcloud.client/"
-googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
-ios="https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8"
-github="https://github.com/nextcloud"
-%}
 
-{% include cardv2.html
+  {% include card.html color="success"
-title="Tahoe-LAFS"
+  title="Pydio"
-image="/assets/img/tools/Tahoe-LAFS.png"
+  image="/assets/img/tools/Pydio.png"
-image-dark="/assets/img/tools/Tahoe-LAFS-dark.png"
+  url="https://pydio.com/"
-website="https://www.tahoe-lafs.org/"
+  footer="OS: Windows, macOS, Linux, iOS, Android."
-forum="https://forum.privacytools.io/t/discussion-tahoe-lafs/1662"
+  description="Pydio is open source software that turns instantly any server (on-premise, NAS, cloud IaaS or PaaS) into a file sharing platform for your company. It is an alternative
-description="Tahoe-LAFS is a free and open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
+  to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs."
-windows="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+  %}
-mac="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+
-linux="https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages"
+  {% include card.html color="primary"
-netbsd="http://pkgsrc.se/filesystems/tahoe-lafs"
+  title="Tahoe-LAFS"
-git="https://www.tahoe-lafs.org/trac/tahoe-lafs/browser"
+  image="/assets/img/tools/Tahoe-LAFS.png"
-%}
+  url="https://www.tahoe-lafs.org/"
+  footer="OS: Windows, macOS, Linux."
+  description="Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are
+  taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
+  %}
+
+  {% include card.html color="warning"
+  title="Nextcloud"
+  image="/assets/img/provider/Nextcloud.png"
+  url="https://nextcloud.com/"
+  footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
+  description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients."
+  %}
+
+</div>
 
 <h3>Worth Mentioning</h3>
 <ul>
-  <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - An open-source and end-to-end encrypted real-time collaborative editor that lets you share folders, media, and documents.</li>
+  <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - End-to-end encrypted real time collaboration sharing folders, media, and documents (open-source).</li>
 </ul>

_includes/sections/social-networks.html

@@ -7,20 +7,13 @@
 {% include cardv2.html
 title="Mastodon - Twitter Alternative"
 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>'
+description='Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like e-mail. It also has the most users, and the most diverse (in terms of interests) users, looks good, and is easy to setup. Feel welcome to join our hosted instance: <a href="https://social.privacytools.io/">social.privacytools.io</a>'
 website="https://joinmastodon.org/"
 forum="https://forum.privacytools.io/t/discussion-mastodon/289"
 github="https://github.com/tootsuite/mastodon"
-windows="https://joinmastodon.org/apps"
+android=""
-mac="https://joinmastodon.org/apps"
+ios=""
-linux="https://joinmastodon.org/apps"
+web=""
-freebsd="https://joinmastodon.org/apps"
-openbsd="https://joinmastodon.org/apps"
-netbsd="https://joinmastodon.org/apps"
-android="https://joinmastodon.org/apps"
-sailfish="https://joinmastodon.org/apps"
-ios="https://joinmastodon.org/apps"
-web="https://joinmastodon.org/#getting-started"
 %}
 
 {% include cardv2.html
@@ -30,8 +23,8 @@ description="diaspora* is based on three key philosophies: Decentralization, fre
 website="https://diasporafoundation.org/"
 forum="https://forum.privacytools.io/t/discussion-diaspora/290"
 github="https://github.com/diaspora/diaspora"
-android="https://wiki.diasporafoundation.org/Tools_to_use_with_Diaspora#Android"
+android=""
-web="https://diasporafoundation.org/"
+web=""
 %}
 
 {% include cardv2.html
@@ -41,37 +34,40 @@ description="Friendica has an emphasis on extensive privacy settings and easy se
 website="https://friendi.ca/"
 forum="https://forum.privacytools.io/t/discussion-friendica/291"
 github="https://github.com/friendica/friendica"
-windows="https://friendi.ca/resources/mobile-clients/"
+windows=""
-linux="https://friendi.ca/resources/mobile-clients/"
+linux=""
-android="https://friendi.ca/resources/mobile-clients/"
+android=""
-sailfish="https://friendi.ca/resources/mobile-clients/"
+web=""
-web="https://friendi.ca/"
 %}
 
 {% include cardv2.html
 title="PixelFed - Instagram Alternative"
 image="/assets/img/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>'
+description='A free and ethical photo sharing platform, powered by ActivityPub federation. Pixelfed is an open-source, federated platform. You can run your own instance or <a href="https://fediverse.party/en/pixelfed/">join one.</a>'
-website="https://pixelfed.org/"
+website="https://pixelfed.social/"
 forum="https://forum.privacytools.io/t/discussion-pixelfed/293"
 github="https://github.com/pixelfed"
-web="https://pixelfed.org/"
+web=""
 %}
 
 {% include cardv2.html
 title="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."
+description="A social communication software for both public and private communications. It is widely supported and has a large userbase. It is already used by the Free Software Foundation."
 website="https://gnu.io/social/"
 forum="https://forum.privacytools.io/t/discussion-gnu-social/292"
-gitlab="https://git.gnu.io/gnu/gnu-social/"
+github="https://github.com/foocorp/gnu-social"
-web="https://gnu.io/social/"
+android=""
+ios=""
+linux=""
+windows=""
+web=""
 %}
 
 <h3>Worth Mentioning</h3>
 <ul>
-  <li><a href="https://www.minds.com/">Minds</a> - An <a href="https://gitlab.com/minds">open-source</a> and distributed social networking service, integrating the blockchain to reward the community.</li>
+  <li><a href="https://www.minds.com/">Minds</a> - An <a href="https://gitlab.com/minds">open source</a> and distributed social networking service, integrating the blockchain to reward the community.</li>
-  <li><a href="https://movim.eu/">Movim</a> - A federated social platform that relies on the XMPP standard and therefore allows you to exchange with many other clients on all devices.</li>
+  <li><a href="https://movim.eu/">Movim</a> - Federated social platform that relies on the XMPP standard and therefore allows you to exchange with many other clients on all devices.</li>
 </ul>
 
 <h3>Related Information</h3>

_includes/sections/social-news-aggregator.html

@@ -7,13 +7,16 @@
 {% include cardv2.html
 title="Aether"
 image="/assets/img/tools/aether.png"
-description='<a href="https://github.com/nehbit/aether/blob/master/LICENSE.md">Aether is a free and open-source</a> decentralized social news aggregator with a built-in voting system.'
+description='<a href="https://github.com/nehbit/aether/blob/master/LICENSE.md">Free/libre and open source</a> decentralized social news aggregator with a built in voting system.'
-website="https://getaether.net/"
+website="https://github.com/nehbit/aether"
 forum="https://forum.privacytools.io/t/discussion-aether/1256"
 github="https://github.com/nehbit/aether"
-windows="https://getaether.net/download/"
+windows=""
-mac="https://getaether.net/download/"
+mac=""
-linux="https://getaether.net/download/"
+linux=""
+android=""
+ios=""
+bsd=""
 %}
 
 {% include cardv2.html
@@ -22,8 +25,13 @@ image="/assets/img/tools/tildes.png"
 description='Tildes is a web-based self-hostable online bulletin board. It is licensed under <a href="https://gitlab.com/tildes/tildes/blob/master/LICENSE">GPL 3.0</a>.'
 website="https://tildes.net"
 forum="https://forum.privacytools.io/t/discussion-tildes/1257"
-gitlab="https://gitlab.com/tildes/tildes"
+git="https://gitlab.com/tildes/"
-web="https://tildes.net"
+windows=""
+mac=""
+linux=""
+android=""
+ios=""
+bsd=""
 %}
 
 {% include cardv2.html
@@ -32,14 +40,18 @@ image="/assets/img/tools/raddle.png"
 description="Raddle is a public Postmill instance focused on privacy and anti-censorship."
 website="https://raddle.me"
 forum="https://forum.privacytools.io/t/discussion-raddle/1258"
-gitlab="https://gitlab.com/postmill/"
+git="https://gitlab.com/postmill/"
-web="https://raddle.me"
+windows=""
+mac=""
+linux=""
+android=""
+ios=""
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
   <li><a href="https://beta.akasha.world/">Akasha</a> - A decentralized online bulletin board using <a href="https://www.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a> and <a href="https://www.wikipedia.org/wiki/Ethereum">Ethereum</a>.</li>
-  <li><a href="https://dev.lemmy.ml/">Lemmy</a> - An <a href="https://github.com/dessalines/lemmy/blob/master/LICENSE">AGPL</a>-licensed self-hostable link aggregator intended to work in the <a href="https://www.wikipedia.org/wiki/Fediverse">Fediverse</a>.</li>
+  <li><a href="https://dev.lemmy.ml/">Lemmy</a> - An <a href="https://github.com/dessalines/lemmy/blob/master/LICENSE">AGPL</a> licensed self-hostable link aggregator intended to work in the <a href="https://www.wikipedia.org/wiki/Fediverse">Fediverse</a>.</li>
-  <li><a href="https://notabug.io/">notabug.io</a> - A <a href="https://github.com/notabugio/notabug/blob/master/LICENSE.md">free and open-source</a> P2P link aggregator with a strong resemblance to old.reddit.com (not to be confused with <a href="https://notabug.org/">NotABug.org</a>).</li>
+  <li><a href="https://notabug.io/">notabug.io</a> - notabug.io is a <a href="https://github.com/notabugio/notabug/blob/master/LICENSE.md">free and open source</a> p2p link aggregator with a strong resemblance to old.reddit.com (not to be confused with <a href="https://notabug.org/">NotABug.org</a>).</li>
 </ul>

_includes/sections/teamchat.html

@@ -1,62 +1,38 @@
 <h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Team Chat Platforms</h1>
 
 <div class="alert alert-warning" role="alert">
-        <strong>If your project or organization currently uses a platform like <a href="https://tosdr.org/#discord">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
+        <strong>If your project or organization currently uses a platform like <a href="https://web.archive.org/web/20171029114027/https://feedback.discordapp.com/forums/326712-discord-dream-land/suggestions/17094256-implement-whispersystems-encryption-for-voice-and">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
 </div>
 
-{%
+{% include cardv2.html
-  include cardv2.html
+title="Rocket.chat"
-  title="Riot.im (Matrix)"
+image="/assets/img/tools/rocket.chat.png"
-  image="/assets/img/tools/Riot.png"
+description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
-  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=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental</a>:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. The federation was also added afterwards potentially causing room for mistakes."
-  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://rocket.chat/"
-  website="https://about.riot.im/"
+forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
-  forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
+github="https://github.com/rocketchat/"
-  github="https://github.com/vector-im/riot-web/"
+android=""
-  windows="https://riot.im/download/desktop/"
+ios=""
-  mac="https://riot.im/download/desktop/"
+mac=""
-  linux="https://riot.im/download/desktop/"
+windows=""
-  fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
+linux=""
-  googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
-  ios="https://itunes.apple.com/us/app/vector.im/id1083446067"
-  web="https://riot.im/app/"
 %}
 
-{%
+{% include cardv2.html
-  include cardv2.html
+title="Keybase"
-  title="Rocket.chat"
+image="/assets/img/tools/keybase.png"
-  image="/assets/img/tools/rocket.chat.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>.'
-  description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
+labels="warning:<a href=//github.com/keybase/client/issues/6374>Experimental</a>:The server side of Keybase runs on proprietary code and is centralized."
-  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://keybase.io/"
-  website="https://rocket.chat/"
+forum="https://forum.privacytools.io/t/discussion-keybase/1224"
-  forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
+github="https://github.com/Keybase"
-  github="https://github.com/rocketchat/"
+android=""
-  windows="https://rocket.chat/install"
+ios=""
-  mac="https://itunes.apple.com/us/app/rocket-chat/id1086818840"
+mac=""
-  linux="https://rocket.chat/install"
+windows=""
-  fdroid="https://f-droid.org/packages/chat.rocket.android"
+linux=""
-  googleplay="https://play.google.com/store/apps/details?id=chat.rocket.android"
+web=""
-  ios="https://itunes.apple.com/app/rocket-chat/id1148741252"
-%}
-
-{%
-  include cardv2.html
-  title="Keybase"
-  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/"
-  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&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"
 %}
 
 

_includes/sections/voice-video-messenger.html

@@ -8,35 +8,33 @@
 title="Linphone"
 image="/assets/img/tools/Linphone.png"
 website="https://www.linphone.org/"
-description="Linphone is an open-source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication."
+description="Linphone is an open source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication."
 forum="https://forum.privacytools.io/t/discussion-linphone/751"
 github="https://github.com/BelledonneCommunications"
-windows="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+ios=""
-linux="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+android=""
-mac="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+windows=""
-fdroid="https://f-droid.org/packages/org.linphone"
+linux=""
-googleplay="https://play.google.com/store/apps/details?id=org.linphone"
+mac=""
-ios="https://itunes.apple.com/us/app/linphone/id360065638?mt=8"
+web=""
 %}
 
 {% include cardv2.html
 title="Mumble"
 image="/assets/img/tools/Mumble.png"
 website="https://mumble.info/"
-description="Mumble is an open-source, low-latency, and high quality voice chat application primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, <a href=\"https://github.com/mumble-voip/mumble/issues/1813\">it's missing end-to-end encryption</a>, so self-hosting is recommended."
+description="Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, <a href=\"https://github.com/mumble-voip/mumble/issues/1813\">it's missing end-to-end encryption</a>, so self-hosting is recommended."
 forum="https://forum.privacytools.io/t/discussion-mumble/1289"
 github="https://github.com/mumble-voip/"
-windows="https://www.mumble.info/downloads"
+windows=""
-linux="https://www.mumble.info/downloads"
+linux=""
-mac="https://www.mumble.info/downloads"
+mac=""
-android="https://www.mumble.info/downloads/#third-party-clients"
-ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1"
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://jitsi.org/">Jitsi Meet</a> - Jitsi Meet is a free and open-source multiplatform voice (VoIP), video conferencing, and instant messaging application. <span class="badge badge-warning" data-toggle="tooltip" title="Our Firefox tweaks recommend disabling WebRTC as it can be used to leak your IP address even behind a VPN, which is why Tor Browser disables it.">Requires WebRTC</span></li>
+  <li><a href="https://jitsi.org/">Jitsi Meet</a> - Jitsi Meet is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application.<span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"Our Firefox tweaks recommend disabling WebRTC as it can be used to leak your IP address even behind a VPN, which is why Tor Browser disables it.\">Requires WebRTC</span> </li>
 </ul>
 
 <h3>Related Information</h3>

_includes/sections/vpn.html

@@ -1,90 +1,307 @@
-<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Recommended VPN Service</h1>
+<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Privacy VPN Services</h1>
 
 <div class="alert alert-success" role="alert">
-  <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>
+  <strong>All providers listed here are outside the US, use encryption, accept Bitcoin, support OpenVPN and have a no logging policy.</strong>
 </div>
 
-<div class="container-fluid">
+{% assign eur_to_usd = 1.14 %}
+<div class="table-responsive">
+  <table class="table sortable-theme-bootstrap" data-sortable>
+    <thead>
+      <tr>
+        <th data-sorted="true" data-sorted-direction="descending">VPN Provider</th>
+        <th data-sortable="false">Website</th>
+        <th data-sortable="true">Since</th>
+        <th data-sortable="true">Yearly Price</th>
+        <th data-sortable="true">Free Trial</th>
+        <th data-sortable="true" title="Number of Servers"># Servers</th>
+        <th data-sortable="true">WireGuard</th>
+        <th data-sortable="true">Jurisdiction</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td data-value="AirVPN">
+          <a href="https://airvpn.org/"><img alt="AirVPN" src="/assets/img/provider/AirVPN.png" width="200" height="70"></a></td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://airvpn.org/" href="https://airvpn.org/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2010">2010</td>
+        <td data-value="{{ 54 | times: eur_to_usd }}">54 €</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>162</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-it"></span> Italy</td>
+      </tr>
 
-  <div class="row mb-2">
+      <tr>
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
+        <td data-value="AzireVPN">
-      <img src="/assets/img/provider/Mullvad.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Mullvad">
+          <a href="https://www.azirevpn.com/"><img alt="AzireVPN" src="/assets/img/provider/AzireVPN.png" width="200" height="70"></a>
-    </div>
+        </td>
-    <div class="col">
+        <td>
-    <h2>Mullvad <span class="badge badge-info">EUR €60/Year</span></h2>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.azirevpn.com/" href="https://www.azirevpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-    <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>
+        </td>
-    <h5><span class="badge badge-success">406+ Servers</span></h5>
+        <td data-value="2012">2012</td>
-    <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>
+        <td data-value="{{ 45 | times: eur_to_usd }}">45 €</td>
-    <h5><span class="badge badge-success">WireGuard Support</span></h5>
+        <td><span class="label label-success">Yes</span></td>
-    <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>
+        <td>22</td>
-    <h5><span class="badge badge-success">Independently Audited</span></h5>
+        <td><span class="label label-success">Yes</span></td>
-    <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>
+        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
-    <blockquote class="blockquote">
+      </tr>
-      <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">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-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>
 
+      <tr>
+        <td data-value="blackVPN">
+          <a href="https://www.blackvpn.com/"><img alt="blackVPN" src="/assets/img/provider/blackVPN.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.blackvpn.com/" href="https://www.blackvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2009">2009</td>
+        <td data-value="{{ 49 | times: eur_to_usd }}">49 €</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>31</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
+      </tr>
+
+      <tr>
+        <td data-value="ExpressVPN">
+          <a href="https://www.expressvpn.com/"><img alt="ExpressVPN" src="/assets/img/provider/ExpressVPN.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.expressvpn.com/" href="https://www.expressvpn.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="http://expressobutiolem.onion. Requires specific software to access: torproject.org" href="http://expressobutiolem.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
+        </td>
+        <td data-value="2009">2009</td>
+        <td data-value="100">$ 99.95</td> <!-- USD on December 28, 2018 -->
+        <td><span class="label label-success">Yes</span></td>
+        <td>148</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-vg"></span> British Virgin Islands</td>
+      </tr>
+
+      <tr>
+        <td data-value="FrootVPN">
+          <a href="https://www.frootvpn.com/"><img alt="FrootVPN" src="/assets/img/provider/FrootVPN.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.frootvpn.com/" href="https://www.frootvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
+        <td data-value="36">$ 35.88</td>
+        <td><span class="label label-warning">No</span></td>
+        <td>27</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+      </tr>
+
+      <tr>
+        <td data-value="hide.me">
+          <a href="https://hide.me/"><img alt="hide.me" src="/assets/img/provider/hide.me.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://hide.me/" href="https://hide.me/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2012">2012</td>
+        <td data-value="0"><a data-toggle="tooltip" data-placement="bottom" data-original-title="2 GB data transfer, 1 simultaneous connection" href="https://hide.me/pricing">Free</a></td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>160+</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-my"></span> Malaysia</td>
+      </tr>
+
+      <tr>
+        <td data-value="IVPN">
+          <a href="https://www.ivpn.net/"><img alt="IVPN" src="/assets/img/provider/IVPN.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ivpn.net/" href="https://www.ivpn.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2009">2009</td>
+        <td data-value="100">$ 100</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>38</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td><span class="flag-icon flag-icon-gi"></span> Gibraltar</td>
+      </tr>
+
+      <tr>
+        <td data-value="Mullvad">
+          <a href="https://mullvad.net/"><img alt="Mullvad" src="/assets/img/provider/Mullvad.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mullvad.net/" href="https://mullvad.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="http://xcln5hkbriyklr6n.onion. Requires specific software to access: torproject.org" href="http://xcln5hkbriyklr6n.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
+        </td>
+        <td data-value="2009">2009</td>
+        <td data-value="{{ 60 | times: eur_to_usd }}">60 €</td>
+        <td><span class="label label-success">No</span></td>
+        <td>281</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+      </tr>
+
+      <tr>
+        <td data-value="NordVPN">
+          <a href="https://nordvpn.com/"><img alt="NordVPN" src="/assets/img/provider/NordVPN.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://nordvpn.com/" href="https://nordvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2012">2012</td>
+        <td data-value="84">$ 83.88</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>5200+</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-pa"></span> Panama</td>
+      </tr>
+
+      <tr>
+        <td data-value="OVPN">
+          <a href="https://www.ovpn.com/"><img alt="OVPN" src="/assets/img/provider/ovpn.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ovpn.com/" href="https://www.ovpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
+        <td data-value="{{ 84 | times: eur_to_usd }}">84 €</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>67</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+      </tr>
+
+      <tr>
+        <td data-value="Perfect Privacy">
+          <a href="https://www.perfect-privacy.com/"><img alt="Perfect Privacy" src="/assets/img/provider/Perfect-Privacy.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.perfect-privacy.com/" href="https://www.perfect-privacy.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2008">2008</td>
+        <td data-value="{{ 119.99 | times: eur_to_usd }}">119.99 €</td>
+        <td><span class="label label-warning">No</span></td>
+        <td>54</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+      </tr>
+
+      <tr>
+        <td data-value="ProtonVPN">
+          <a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a     >
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonvpn.com/" href="https://protonvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2016">2016</td>
+        <td data-value="0"><a data-toggle="tooltip" data-placement="bottom" data-original-title="3 countries, 1 device, speed: low" href="https://protonvpn.com/pricing">Free</a></td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>396</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+      </tr>
+
+      <tr>
+        <td data-value="Proxy.sh">
+          <a href="https://proxy.sh/"><img alt="Proxy.sh" src="/assets/img/provider/Proxy.sh.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://proxy.sh/" href="https://proxy.sh/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2012">2012</td>
+        <td data-value="40">$ 40</td>
+        <td><span class="label label-warning">No</span></td>
+        <td>300+</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
+      </tr>
+
+      <tr>
+        <td data-value="Trust.Zone">
+          <a href="https://trust.zone/"><img alt="Trust.Zone" src="/assets/img/provider/Trust.Zone.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://trust.zone/" href="https://trust.zone/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
+        <td data-value="40">$ 39.95</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>164</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
+      </tr>
+      <tr>
+        <td data-value="VPNArea">
+          <a href="https://vpnarea.com/"><img alt="VPNArea" src="/assets/img/provider/vpnarea.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpnarea.com/" href="https://vpnarea.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
+        <td data-value="59">$ 59</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>204</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-bg"></span> Bulgaria</td>
+      </tr>
+      <tr>
+        <td data-value="VPNTunnel">
+          <a href="https://vpntunnel.com/"><img alt="VPNTunnel" src="/assets/img/provider/VPNTunnel.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpntunnel.com/" href="https://vpntunnel.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
+        <td data-value="{{ 35.88 | times: eur_to_usd }}">35.88 €</td>
+        <td><span class="label label-warning">No</span></td>
+        <td>800+</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
+      </tr>
+
+    </tbody>
+  </table>
 </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>
+  <strong>Note: Using a VPN provider will not make you anonymous. But it will give you a better privacy. 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">
+  <div class="row">
+    <div class="col-md-6">
+      <h3>Our VPN Provider Criteria</h3>
 
-<div class="container-fluid">
+      <ul>
+        <li>Operating outside the USA or other Five Eyes countries.<br>More: <a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus">Avoid all US and UK based services.</a></li>
+        <li>OpenVPN software support.</li>
+        <li>Accepts Bitcoin, cash, debit cards or cash cards as a payment method.</li>
+        <li>No personal information is required to create an account. Only username, password and <a href="/providers/email/"><i class="fas fa-link"></i> Email.</a></li>
+      </ul>
 
-  <div class="row mb-2">
+      <p>We're not affiliated with any of the above-listed VPN providers. This way we can give you honest recommendations.</p>
-    <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">
+      <h3>More VPN Providers</h3>
+      <ul>
+        <li><a href="https://www.reddit.com/r/privacytoolsIO/comments/43d4zs/you_guys_might_be_interested_in_this_a/">Guide to Choosing the Best VPN</a></li>
+        <li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
+      </ul>
     </div>
-    <div class="col">
+
-    <h2>ProtonVPN <span class="badge badge-info">Free</span> <span class="badge badge-info">USD $96/year</span></h2>
+    <div class="col-md-6">
-    <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>
+      <h3>Related VPN information</h3>
-    <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">
+      <ul>
-      <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>
+        <li><a href="https://vikingvpn.com/blogs/off-topic/beware-of-vpn-marketing-and-affiliate-programs">Beware of False Reviews - VPN Marketing and Affiliate Programs</a></li>
-      <footer class="blockquote-footer">Marc Loebekken, ProtonVPN AG Legal counsel</footer>
+        <li><a href="https://www.goldenfrog.com/take-back-your-internet/articles/7-myths-about-vpn-logging-and-anonymity">I am Anonymous When I Use a VPN - 7 Myths Debunked</a><br />(<strong>Note:</strong> While this is a good read, they also use the article for self-promotion)</li>
-    </blockquote>
+        <li><a href="https://torrentfreak.com/proxy-sh-vpn-provider-monitored-traffic-to-catch-hacker-130930/">Proxy.sh VPN Provider Sniffed Server Traffic to Catch Hacker</a></li>
-    <p>We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner.
+        <li><a href="https://proxy.sh/panel/knowledgebase.php?action=displayarticle&id=5">Ethical policy - All of the reasons why Proxy.sh might enable logging</a></li>
-    <h5><span class="badge badge-success">526+ Servers</span></h5>
+        <li><a href="https://www.ivpn.net/privacy">IVPN.net will collect your email and IP address after sign up</a><br />Read the <a data-toggle="tooltip" data-placement="top" data-original-title="The IP collected at signup is only used for a few seconds by our fraud module and then discarded, it is not stored. Storing them would significantly increase our own liability and certainly would not be in our interest. You're absolutely welcome to signup using Tor or a VPN.">Email statement</a> from IVPN.</li>
-    <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>
+        <li><a href="https://medium.com/@blackVPN/no-logs-6d65d95a3016">blackVPN announced to delete connection logs after disconnection</a></li>
-    <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
+        <li><a href="https://gist.github.com/kennwhite/1f3bc4d889b02b35d8aa">Don't use LT2P IPSec, use other protocols.</a></li>
-    <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>
+      </ul>
-    <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/layout/warrant-canary.jpg" width="450" height="236" class="img-fluid float-right ml-3" alt="Warrant Canary Example">
+<img src="/assets/img/layout/warrant-canary.jpg" width="450" height="236" class="img-fluid float-right" alt="Warrant Canary Example" style="margin-left:20px;">
 
 <p>A warrant canary is a posted document stating that an organization has not received any secret subpoenas during a specific period of time. If this document fails to be updated during the specified time then the user is to assume that the service has received such a subpoena and should stop using the service.</p>
 

_includes/sections/windows10.html

@@ -1,86 +1,86 @@
-<h1 id="win10" class="anchor"><a href="#win10"><i class="fas fa-link anchor-icon"></i></a> {% t windows_10.header %}</h1>
+<h1 id="win10" class="anchor"><a href="#win10"><i class="fas fa-link anchor-icon"></i></a> Don't use Windows 10 - It's a privacy nightmare</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>{% t windows_10.warning %}</strong>
+  <strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
 </div>
 
-<img src="/assets/img/layout/Windows-10-Privacy.png" width="367" height="369" class="img-fluid float-right ml-3" alt="{% t windows_10.alt %}">
+<img src="/assets/img/layout/Windows-10-Privacy.jpg" width="367" height="369" class="img-fluid float-right" alt="Windows 10 Privacy" style="margin-left:10px;">
 
 <ol>
-  <li><strong>{% t windows_10.data %}</strong>
+  <li><strong>Data syncing is by default enabled.</strong>
     <ul>
-      <li>{% t windows_10.data1 %}</li>
+      <li>Browsing history and open websites.</li>
-      <li>{% t windows_10.data2 %}</li>
+      <li>Apps settings.</li>
-      <li>{% t windows_10.data3 %}</li>
+      <li>WiFi hotspot names and passwords.</li>
     </ul>
   </li>
 
-  <li><strong>{% t windows_10.ad_id %}</strong>
+  <li><strong>Your device is by default tagged with a unique advertising ID.</strong>
     <ul>
-      <li>{% t windows_10.ad_id1 %}</li>
+      <li>Used to serve you with personalized advertisements by third-party advertisers and ad networks.</li>
     </ul>
   </li>
 
-  <li><strong>{% t windows_10.cortana %}</strong>
+  <li><strong>Cortana can collect any of your data.</strong>
     <ul>
-      <li>{% t windows_10.cortana1 %}</li>
+      <li>Your keystrokes, searches and mic input.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.cortana2 %}</li>
+      <li>Calendar data.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.cortana3 %}</li>
+      <li>Music you listen to.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.cortana4 %}</li>
+      <li>Credit Card information.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.cortana5 %}</li>
+      <li>Purchases.</li>
     </ul>
   </li>
 
-  <li><strong>{% t windows_10.collection %}</strong>
+  <li><strong>Microsoft can collect any personal data.</strong>
     <ul>
-      <li>{% t windows_10.collection1 %}</li>
+      <li>Your identity.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection2 %}</li>
+      <li>Passwords.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection3 %}</li>
+      <li>Demographics.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection4 %}</li>
+      <li>Interests and habits.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection5 %}</li>
+      <li>Usage data.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection6 %}</li>
+      <li>Contacts and relationships.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection7 %}</li>
+      <li>Location data.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection8 %}</li>
+      <li>Content like emails, instant messages, caller list, audio and video recordings.</li>
     </ul>
   </li>
 
-  <li><strong>{% t windows_10.sharing %}</strong>
+  <li><strong>Your data can be shared.</strong>
     <ul>
-      <li>{% t windows_10.sharing1 %}</li>
+      <li>When downloading Windows 10, you are authorizing Microsoft to share any of above-mentioned data with any third-party, with or without your consent.</li>
     </ul>
   </li>
 </ol>
 
-<p><a class="btn btn-warning" href="https://www.winprivacy.de/english-home/">{% t global.download %}: W10Privacy</a></p>
+<p><a class="btn btn-warning" href="https://www.winprivacy.de/english-home/">Download: W10Privacy</a></p>
 
-<p>{% t windows_10.tool %}</p>
+<p>This tool uses some known methods that attempt to disable major tracking features in Windows 10.</p>
 
-<h3>{% t global.related_information %}</h3>
+<h3>Related Information</h3>
 
 <ul>
-  <li><a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement</a> - Microsoft collects, uses and discloses personal information as described here. This allows OneDrive data, Cortana searches, and MS browser history to be sold to third parties.</li>
+  <li><a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement</a> - Microsoft collects, uses and discloses personal information as described here. This allows One Drive data, Cortana searches and MS browser history to be sold to third parties.</li>
   <li><a href="https://support.microsoft.com/en-us/help/4468233/cortana-and-privacy-microsoft-privacy">Cortana and privacy</a> - To personalize your experience and provide the best possible suggestions, Cortana accesses your email and other communications and collects data about your contacts (People), like their title, suffix, first name, last name, middle name, nicknames, and company name. If you call, email, or text someone or they call, email, or text you, Cortana collects that person’s email address or phone number.</li>
 </ul>
 
@@ -89,7 +89,7 @@
     <div class="col-md-6">
       <h3>Some good news</h3>
       <ul>
-        <li><a href="https://github.com/crazy-max/WindowsSpyBlocker/releases">WindowsSpyBlocker</a> - Open-source tool that blocks data collection.</li>
+        <li><a href="https://github.com/crazy-max/WindowsSpyBlocker/releases">WindowsSpyBlocker</a> - Open source tool that blocks data collection.</li>
         <li><a href="https://www.ghacks.net/2015/08/14/comparison-of-windows-10-privacy-tools/">Comparison of Windows 10 Privacy tools</a> - ghacks.net</li>
       </ul>
     </div>

_layouts/minimal.html

@@ -2,7 +2,6 @@
 <html lang="en">
 {% include head.html %}
 <body data-spy="scroll" data-target="#navbar">
-  <script src="/assets/js/applytheme.js?v=1"></script>
   <header>
   {% include nav.html %}
   <div id="top" class="py-4"></div>

_layouts/page.html

@@ -3,8 +3,8 @@ layout: default
 ---
 
 <div class="jumbotron p-5">
-  <h1 class="display-4">{{ page.title | flatify }}</h1>
+  <h1 class="display-4">{{ page.title }}</h1>
-  {% if page.description and page.hidedesc != true %}<p class="lead">{{ page.description | flatify }}</p>{% endif %}
+  {% if page.description and page.hidedesc != true %}<p class="lead">{{ page.description }}</p>{% endif %}
 </div>
 
 {{ content }}

_plugins/expand_nested_variable_filter.rb

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

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

_sass/ptio-font.scss

@@ -1,56 +0,0 @@
-/*
-  Icon Font: ptio-font
-*/
-
-@font-face {
-  font-family: "ptio-font";
-  src: url("../webfonts/ptio-font.eot");
-  src: url("../webfonts/ptio-font.eot?#iefix") format("embedded-opentype"),
-       url("../webfonts/ptio-font.woff2") format("woff2"),
-       url("../webfonts/ptio-font.woff") format("woff"),
-       url("../webfonts/ptio-font.ttf") format("truetype"),
-       url("../webfonts/ptio-font.svg#ptio-font") format("svg");
-  font-weight: normal;
-  font-style: normal;
-}
-
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  @font-face {
-    font-family: "ptio-font";
-    src: url("../webfonts/ptio-font.svg#ptio-font") format("svg");
-  }
-}
-
-[data-icon]:before { content: attr(data-icon); }
-
-[data-icon]:before,
-.ptio-f-droid:before,
-.ptio-ios:before,
-.ptio-linux:before,
-.ptio-macos:before,
-.ptio-mix:before,
-.ptio-netbsd:before,
-.ptio-openbsd:before,
-.ptio-sailfish-os:before {
-  display: inline-block;
-  font-family: "ptio-font";
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  line-height: 1;
-  text-decoration: inherit;
-  text-rendering: optimizeLegibility;
-  text-transform: none;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  font-smoothing: antialiased;
-}
-
-.ptio-f-droid:before { content: "\f100"; }
-.ptio-ios:before { content: "\f101"; }
-.ptio-linux:before { content: "\f102"; }
-.ptio-macos:before { content: "\f103"; }
-.ptio-mix:before { content: "\f107"; }
-.ptio-netbsd:before { content: "\f104"; }
-.ptio-openbsd:before { content: "\f105"; }
-.ptio-sailfish-os:before { content: "\f106"; }

assets/css/dark.scss

@@ -1,192 +0,0 @@
----
----
-@import '_vars';
-
-$dark-900: #181b21;
-$dark-800: #22262e;
-$dark-700: #343a46;
-$dark-600: #464f60;
-$light: #d8d8d8;
-$primary: #345e8e;
-$danger: #b63f4a;
-$secondary: $dark-600;
-$success: #2c7f40;
-$warning: #c6a339;
-$info: #218899;
-
-
-/*
- * HTML
- */
-
-body {
-  background: $dark-900;
-  color: $light;
-}
-a {
-  color: lighten($primary, 25%);
-}
-a:hover {
-  color: lighten($primary, 10%);
-}
-img {
-  filter: saturate(80%);
-}
-
-
-/*
- * Bootstrap
- */
-
-.alert a {
-  color: lighten($primary, 30%);
-}
-
-.bg-secondary, .btn-secondary, .badge-secondary { background-color: $secondary !important; }
-.btn-secondary, .card-secondary .card-header { border-color: $secondary !important; }
-.alert-secondary, .btn-secondary:hover {
-  color: $light;
-  background-color: darken($secondary, 10%);
-  border-color: darken($secondary, 10%);
-}
-
-.bg-primary, .btn-primary, .badge-primary { background-color: $primary !important; }
-.btn-primary, .card-primary .card-header { border-color: $primary !important; }
-.text-primary { color: $primary !important; }
-.alert-primary, .btn-primary:hover {
-  color: $light;
-  background-color: darken($primary, 10%);
-  border-color: darken($primary, 10%);
-}
-
-.bg-warning, .btn-warning, .badge-warning { background-color: $warning !important; }
-.btn-warning, .card-warning .card-header { border-color: $warning !important; }
-.btn-warning:hover { color: $dark-700 !important }
-.text-warning { color: $warning !important; }
-.card-warning > .text-dark { color: $dark-900 !important; }
-.alert-warning a { color: darken($primary, 6%); }
-.badge-warning a { color: $primary; }
-.alert-warning, .btn-warning:hover {
-  color: $dark-900;
-  background-color: darken($warning, 8%);
-  border-color: darken($warning, 8%);
-}
-
-.bg-info, .btn-info, .badge-info { background-color: $info !important; }
-.btn-info, .card-info .card-header { border-color: $info !important; }
-.text-info { color: $info !important; }
-.alert-info, .btn-info:hover {
-  color: $light;
-  background-color: darken($info, 10%);
-  border-color: darken($info, 10%);
-}
-
-.bg-success, .btn-success, .badge-success { background-color: $success !important; }
-.btn-success, .card-success .card-header { border-color: $success !important; }
-.text-success { color: $success !important; }
-.alert-success, .btn-success {
-  color: $light;
-  background-color: darken($success, 10%);
-  border-color: darken($success, 10%);
-}
-
-.bg-danger, .btn-danger, .badge-danger { background-color: $danger !important; }
-.btn-danger, .card-danger .card-header { border-color: $danger !important; }
-.text-danger { color: $danger !important; }
-.alert-danger, .btn-danger:hover {
-  color: $light;
-  background-color: darken($danger, 10%);
-  border-color: darken($danger, 10%);
-}
-
-.card {
-  box-shadow: none !important;
-}
-
-.dropdown-item:hover {
-  color: $light;
-  background-color: $dark-800;
-}
-
-.form-control,
-.form-control:focus {
-  color: $light;
-  background: $dark-800;
-  border-color: $dark-800;
-}
-
-.form-control[readonly],
-.form-control:disabled {
-  background: $dark-800;
-}
-
-.card,
-.jumbotron,
-.list-group-item {
-  background: $dark-800;
-}
-
-.blockquote {
-  border-color: $dark-800;
-}
-
-.bg-dark {
-  background-color: $dark-800 !important;
-}
-
-.dropdown-item {
-  color: $light;
-}
-
-.list-group-item {
-  border-color: $dark-700;
-}
-
-.text-dark {
-  color: $light !important;
-}
-
-table[data-sortable].sortable-theme-bootstrap {
-  color: $light;
-  background-color: $dark-800;
-}
-table[data-sortable].sortable-theme-bootstrap th,
-table[data-sortable].sortable-theme-bootstrap td {
-  border-color: $dark-600 !important;
-}
-table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"] {
-  color: $light;
-  background: $dark-700;
-}
-table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="ascending"]::after, {
-  border-bottom-color: $light;
-}
-table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="descending"]::after {
-  border-top-color: $light;
-}
-
-
-/*
- * Other
- */
-
-.nav-dropdown {
-  color: $light;
-  background-color: $dark-900;
-  border-color: $dark-800;
-}
-
-.nav-theme-icon:before {
-  color: $warning;
-  font-size: 1em;
-  content: "\f185";
-}
-
-.twitter { background: desaturate($twitter, 25%); }
-.mastodon { background: desaturate($mastodon, 25%); }
-.facebook { background: desaturate($facebook, 25%); }
-.mix { background: desaturate($mix, 25%); }
-.reddit { background: desaturate($reddit, 25%); }
-.linkedin { background: desaturate($linkedin, 25%); }
-.email { background: desaturate($email, 25%); }
-.diaspora { background: desaturate($diaspora, 25%); }

assets/css/style.scss

@@ -5,7 +5,6 @@
 @import 'bootstrap';
 @import 'flag-icon';
 @import 'fontawesome';
-@import 'ptio-font';
 @import 'sortable-theme-bootstrap';
 
 body {
@@ -127,10 +126,6 @@ h2, h3:not(.h5), h4, h5 {
   font-size: 5.5em;
 }
 
-.panel-font {
-  font-size: 120px;
-}
-
 .share-btn {
   border: 0;
   box-shadow: $share-btn-shadow;
@@ -162,7 +157,7 @@ h2, h3:not(.h5), h4, h5 {
 .twitter { background: $twitter; }
 .mastodon { background: $mastodon; }
 .facebook { background: $facebook; }
-.mix { background: $mix; }
+.stumbleupon { background: $stumbleupon; }
 .reddit { background: $reddit; }
 .linkedin    { background: $linkedin; }
 .email { background: $email; }
@@ -182,189 +177,9 @@ h2, h3:not(.h5), h4, h5 {
   text-align: justify;
 }
 
-.no-text-wrap {
-  white-space: nowrap;
-}
-
 footer {
   img,
   i {
     margin-right: 1rem;
   }
-}
+}
-
-.hover-text-decoration-none:hover {
-  text-decoration: none;
-  -webkit-text-decoration-skip: object;
-}
-
-.table td, .table th {
-  vertical-align: middle;
-}
-
-
-/*
- * Navbar
- */
-
-#navbar {
-  margin-left: auto;
-  margin-right: auto;
-  max-width: 1140px;
-  padding: .75rem 3rem;
-  color: rgba(255,255,255,0.5);
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-#navbar .menu {
-  position: relative;
-}
-
-.menu {
-  display: flex;
-  justify-content: space-between;
-}
-
-.nav-anchor {
-  display: inline;
-  color: inherit;
-}
-
-.nav-anchor:hover {
-  text-decoration: none;
-}
-
-.nav-anchor:hover,
-.nav-summary:hover,
-.nav-details[open] > summary > .nav-summary {
-  color: rgba(255,255,255,0.8);
-}
-
-.nav-dropdown {
-  color: var(--dark);
-  background-color: var(--light);
-  padding: .5rem 0;
-  margin-top: .5rem;
-  position: absolute;
-  border: 1px solid #dee2e6;
-  border-radius: .25rem;
-  box-shadow: 0 .5rem 1rem rgba(0,0,0,.15);
-  z-index: 10;
-}
-
-#nav-right > details > .nav-dropdown {
-  right: 0;
-}
-
-.nav-details {
-  display: inline;
-  position: relative;
-}
-
-.nav-details > summary {
-  list-style: none;
-}
-.nav-details > summary::-webkit-details-marker {
-  display: none;
-}
-
-#nav-right > .nav-details,
-#nav-right > .nav-anchor {
-  padding-left: 0.5rem;
-}
-#nav-left > .nav-details,
-#nav-left > .nav-anchor {
-  padding-right: 0.5rem;
-}
-
-input#nav-toggle,
-#nav-toggle-label {
-  display: none;
-}
-
-#nav-home-mobile {
-  display: none;
-}
-
-#nav-switch-theme {
-  /* We will make it visible with JavaScript
-   * as it does not work without it */
-  display: none;
-  cursor: pointer;
-}
-
-/*
- * Mobile hamburger menu
- */
-
-@media only screen and (max-width: 992px) {
-  .menu,
-  .nav-details,
-  .nav-anchor {
-    display: block;
-  }
-  .menu {
-    margin-top: 0.5rem;
-  }
-  #nav-home {
-    display: none;
-  }
-  #nav-home-mobile {
-    display: inline;
-  }
-  input#nav-toggle:checked ~ .menu {
-    display: none;
-  }
-  input#nav-toggle + label {
-    display: block;
-    cursor: pointer;
-    margin-top: 0.25rem;
-    float: right;
-  }
-  .nav-dropdown {
-    display: block;
-    position: relative;
-    max-height: 15.75em;
-    overflow-y: auto;
-    left: 0;
-    right: 0;
-  }
-  #nav-right > .nav-details,
-  #nav-right > .nav-anchor,
-  #nav-left > .nav-details,
-  #nav-left > .nav-anchor {
-    padding: 0 0;
-  }
-  #navbar {
-    padding: 1rem 3rem;
-  }
-}
-
-@media only screen and (max-width: 768px) {
-  #navbar {
-    padding: 1rem 2rem;
-  }
-}
-
-@media only screen and (max-width: 575px) {
-  #navbar {
-    padding: 1rem 1rem;
-  }
-}
-
-@media only screen and (max-height: 350px) {
-  .nav-dropdown {
-    max-height: 8em;
-  }
-}
-
-.nav-theme-icon:before {
-  color: var(--warning);
-  font-size: 0.875em;
-  content: "\f186";
-}