Merge branch 'master' into i18n

.github/CODEOWNERS

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

.github/CONTRIBUTING.md

@@ -7,6 +7,9 @@ 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
 
@@ -17,8 +20,7 @@ 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.
-- Must list source code in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md) (if applicable)
+- Open Source / Free Software is preferred but not required.
 - Prioritize Products without Vendor Lock-in (decentralized/self-hostable) or data interoperability.
 
 There can be exceptions if no software is available that meet the criteria.
@@ -29,16 +31,16 @@ Note: This criteria applies to all of privacytools.io
 
 ### 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`)
-
+- 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 acessable via free software (i.e OpenVPN, WireGuard)
+- Must be accessible via Open Source Software (e.g. OpenVPN, WireGuard)
 - Use Encryption
 - Accept Cryptocurrency
 - No logging policy
@@ -46,16 +48,16 @@ Note: This criteria applies to all of privacytools.io
 ### Email
 - Outside of USA
 - Support SMTP SSL
-- Accessable Using Free Software (i.e IMAP)
+- Accessible Using Open Source Software (e.g. allows IMAP)
 
 ### Hardware
-- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivlant (if applicable)
-- Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when avalible.
+- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or equivalent (if applicable)
+- Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when available.
 - Cannot lock users to a particular platform.
 
 ### Software
 - Must be able to download over encrypted network (can be a mirror)
-- Must be free software
+- Must be Open Source Software
 
 ### Encryption
 - Only verifiable encryption is to be trusted
@@ -68,3 +70,7 @@ Note: This criteria applies to all of privacytools.io
 
 - 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

@@ -1,3 +0,0 @@
-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, `dig +short txt qnamemintest.internet.nl` -->
+* [ ] supports QNAME minimization <!-- if you have access to the dig command run `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10 -->

.github/PULL_REQUEST_TEMPLATE.md

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

.gitignore

@@ -1,3 +1,8 @@
 _site/
 .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-policy/",
+    "privacyPolicyUrl" : "https://www.privacytools.io/privacy/",
     "termsOfServiceUrl" : "-",
     "isServiceProvider" : true,
     "foundingDate": "2015",

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/) 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/) or [our Discourse community](https://forum.privacytools.io/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. Thank you for participating.
 
 You can submit your suggestions here on GitHub [(Issues)](https://github.com/privacytoolsIO/privacytools.io/issues) and also in our [subreddit](https://www.reddit.com/r/privacytoolsIO/). Please refer to the [Contributing Guidelines](.github/CONTRIBUTING.md) before submitting. Thank you.
 
@@ -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,4 +39,5 @@ 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

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

@@ -11,3 +11,4 @@ sitemap:
 file: "/sitemap.xml"
 include: [".well-known"]
 languages: ["en", "pl"]
+exclude: ["font", "vendor"]

_i18n/en.yml

@@ -1,5 +1,5 @@
 global:
-  further_reading: "Further Reading"
+  further_reading: "Read also:"
   new: "New"
   home: "Home"
   participate: "Participate"
@@ -37,7 +37,7 @@ browser:
   privacy_addons: "Browser Add-ons"
   tweaks: "Firefox Tweaks"
   recommendations: "Recommendations"
-  webrtc_ip_leak: "WebRTC IP Leak Test"
+  webrtc_ip_leak: "WebRTC IP Leak"
 browser_addons:
   improve_your_privacy: "Improve your privacy with these browser add-ons."
   privacy_badger: "Privacy Badger"
@@ -45,7 +45,7 @@ browser_addons:
   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."
+  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."
@@ -54,10 +54,10 @@ browser_addons:
   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."
+  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: "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."
+  terms_of_service_didnt_read_description: "<strong>Terms of Service; Didn’t Read</strong> 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."
@@ -67,37 +67,37 @@ browser_addons:
   noScript_security_suite: "NoScript Security Suite"
   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_experts_only: "For Experts Only"
+  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 Notebooks"
+  notebook: "Digital Notebook"
   email_alt: "Email Alternatives"
   email_clients: "Email Clients"
   file_encryption: "File Encryption"
   file_sharing: "File Sharing"
-  password_managers: "Password Managers"
+  password_managers: "Password Manager"
   productivity: "Productivity Tools"
   rtc: "Real-Time Communication"
-  file_sync: "Secure File Sync"
-  networks: "Self Contained Networks"
-  cloud: "Self-Hosted Cloud Server"
+  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 Operating Systems"
-  mobile: "Mobile Operating Systems"
-  pc_os: "PC OS Recommendations"
+  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: "Use Tor on Android with"
-  blokada: "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!"
+  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:"
@@ -148,14 +148,12 @@ footer:
   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;."
-  kopimi: "kopimi"
-  kopimi_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."
   contact: "Contact"
-  donate: "Donate"
+  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 policy"
+  privacy_policy: "View our privacy statement"
   learn_more: "Learn More"
   javascript: "JavaScript Licenses"
 resources:
@@ -168,9 +166,10 @@ resources:
   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 comprimising your privacy, and what simple alternatives exist."
-  services: "Services"
+  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:
@@ -197,8 +196,8 @@ privacy_resources:
   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: "Keybase.io"
-  info4_d: "Get a public key, safely, starting just with someone's social media username."
+  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"
@@ -208,7 +207,7 @@ privacy_resources:
   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 portition of the internet behind it."
+  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"
@@ -241,7 +240,7 @@ participate:
   or: "or on"
   at: "at"
   discourse: "Join our Discourse community to stay up to date on privacy news or make suggestions!"
-  follow: "Follow us on"
+  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!"
@@ -279,7 +278,7 @@ contact:
   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."
+  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"
@@ -299,8 +298,8 @@ router:
   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 is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points."
+  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."
@@ -310,25 +309,26 @@ pc_os:
   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."
+  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 GNU/Linux 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."
+  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 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."
+  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."
+  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 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."
+  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"

_includes/card.html

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

_includes/cardv2.html

@@ -30,6 +30,9 @@
     <p class="card-text">
       <img
         src="{{include.image}}"
+        {% if include.image-dark %}
+        data-theme-src="{{include.image-dark}}"
+        {% endif %}
         height="120"
         width="120"
         class="panel-pic"
@@ -92,7 +95,7 @@
       <div class="mt-2">
           {% if include.windows %}
             {% if include.windows != "" %}
-              <a href="{{ include.windows }}">
+              <a href="{{ include.windows }}" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -102,27 +105,27 @@
 
           {% if include.mac %}
             {% if include.mac != "" %}
-              <a href="{{ include.mac }}">
-                <i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>
+              <a href="{{ include.mac }}" class="text-decoration-none hover-text-decoration-none">
+                <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>
+              <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.linux %}
             {% if include.linux != "" %}
-              <a href="{{ include.linux }}">
-                <i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>
+              <a href="{{ include.linux }}" class="text-decoration-none hover-text-decoration-none">
+                <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>
+              <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
-          {% if include.bsd %}
-            {% if include.bsd != "" %}
-              <a href="{{ include.bsd }}">
+          {% if include.freebsd %}
+            {% 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 %}
@@ -130,9 +133,29 @@
             {% 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 }}">
+              <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 %}
@@ -142,7 +165,7 @@
 
           {% if include.chrome %}
             {% if include.chrome != "" %}
-              <a href="{{ 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 %}
@@ -152,7 +175,7 @@
 
           {% if include.safari %}
             {% if include.safari != "" %}
-              <a href="{{ 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 %}
@@ -162,7 +185,7 @@
 
           {% if include.opera %}
             {% if include.opera != "" %}
-              <a href="{{ 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 %}
@@ -172,7 +195,7 @@
 
           {% if include.edge %}
             {% if include.edge != "" %}
-              <a href="{{ 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 %}
@@ -180,9 +203,29 @@
             {% 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 }}">
+              <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 %}
@@ -192,31 +235,31 @@
 
           {% if include.ios %}
             {% if include.ios != "" %}
-              <a href="{{ include.ios }}">
-                <i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>
+              <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="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>
+              <i class="ptio-ios fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
-          {% if include.fire %}
-            {% if include.fire != "" %}
-              <a href="{{ include.fire }}">
-                <i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>
+          {% 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="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>
+              <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 }}">
-                <i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>
+              <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-desktop fa-2x fa-fw d-inline pr-1"></i>
+              <i class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
@@ -225,25 +268,25 @@
           {{include.icon3}}
 
           {% if include.github %}
-            <a href="{{include.github}}">
+            <a href="{{include.github}}" class="text-decoration-none hover-text-decoration-none">
               <i class="fab fa-github fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.gitlab %}
-            <a href="{{include.gitlab}}">
+            <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}}">
+            <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}}">
+            <a href="{{include.source}}" class="text-decoration-none hover-text-decoration-none">
               <i class="fas fa-code-branch fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}

_includes/footer.html

@@ -31,8 +31,8 @@
         <i class="fab fa-linkedin-in pl-3"></i>
       </a>
 
-      <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="{% t footer.stumbleupon_title %}">
-        <i class="fab fa-stumbleupon pl-3"></i>
+      <a href="https://mix.com/mixit?su=submit&url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
+        <i class="ptio-mix pl-3"></i>
       </a>
 
       <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn diaspora" title="{% t footer.diaspora_title %}">
@@ -44,29 +44,25 @@
   <h3>{% t footer.copy_url_description %}</h3>
 
   <p>
-  <input type="text" value="www.privacytools.io - encryption against global mass surveillance" onclick="this.focus();this.select()" class="form-control input-lg">
+  <input type="text" value="privacytools.io - encryption against global mass surveillance" class="form-control input-lg onclick-select">
   <span class="help-block">{% t footer.for_easy_copy_paste %}</span>
   </p>
 
   <hr class="footer-divider" />
 
   <div class="row mt-3">
-    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center d-flex justify-content-center">
-      <a href="https://www.privacytools.io/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.CC0_title %}"><img alt="{% t footer.CC0 %}" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
+    <div class="col-sm-4 mb-3 d-flex justify-content-center d-flex justify-content-center">
+      <a href="/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.CC0_title %}"><img alt="{% t footer.CC0 %}" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
     </div>
 
-    <div class="col-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="{% t footer.kopimi_title %}"><img alt="{% t footer.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">
+    <div class="col-sm-4 mb-3 d-flex justify-content-center">
       <i class="far fa-envelope fa-2x"></i>
       <a href="/contact/">{% t footer.contact %}</a>
     </div>
 
-    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
-      <i class="fas fa-heart fa-2x text-danger"></i>
-      <a data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.donate_title %}" href="/donate/">{% t footer.donate %}</a>
+    <div class="col-sm-4 mb-3 d-flex justify-content-center">
+      <i class="fas fa-donate fa-2x"></i>
+      <a data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.donate_title %}" href="https://opencollective.com/privacytoolsio#section-contribute">{% t footer.donate %}</a>
     </div>
   </div>
 
@@ -78,7 +74,7 @@
     <p class="mt-2">
       <strong>{% t footer.no_ads %}</strong>
       <em>{% t footer.socially_motivated %}</em>
-      <a href="/privacy-policy/">{% t footer.privacy_policy %}</a>.
+      <a href="/privacy/">{% t footer.privacy_policy %}</a>.
     </p>
     <p class="text-left">
       Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong>

_includes/head.html

@@ -43,5 +43,6 @@
   <link rel="shortcut icon" href="/assets/img/favicons/favicon.ico">
 
   <!-- CSS stylesheets -->
-  <link href="/assets/css/style.css?v=5" rel="stylesheet">
+  <link href="/assets/css/style.css?v=8" rel="stylesheet">
+  <link id="dark-css" href="/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)">
 </head>

_includes/nav.html

@@ -11,7 +11,7 @@
 
       <div id="nav-left" class="position-relative flex-col">
         <a class="nav-anchor" href="/index.html">
-          <span id="nav-home" class="fas fa-home"></span>
+          <span id="nav-home" class="fas fa-home fa-fw"></span>
         </a>
 
         <!-- Provider -->
@@ -68,10 +68,11 @@
             <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> {% t software.email_clients %}</a>
             <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> {% t software.file_encryption %}</a>
             <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> {% t software.file_sharing %}</a>
+            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> {% t software.file_sync %}</a>
+            <a class="dropdown-item" href="/software/productivity/#metadata-removal-tools"><span class="far fa-eye-slash fa-fw"></span> {% t software.metadata_removal %}</a>
             <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> {% t software.password_managers %}</a>
             <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> {% t software.productivity %}</a>
             <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> {% t software.rtc %}</a>
-            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> {% t software.file_sync %}</a>
             <a class="dropdown-item" href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> {% t software.networks %}</a>
             <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> {% t software.cloud %}</a>
           </span>
@@ -103,7 +104,7 @@
         <details class="nav-details">
           <summary>
             <span class="nav-summary">
-              <span class="fas fa-language text-danger"></span>
+              <span class="fas fa-language text-danger fa-fw"></span>
               {% t global.language %}
               <span class="dropdown-toggle"></span>
             </span>
@@ -117,6 +118,7 @@
             <a href="https://privacytools.it-sec.rocks/" class="dropdown-item">Deutsch</a>
             <a href="https://privacytools-it.github.io/" class="dropdown-item">Italiano</a>
             <a href="https://privacytools.ru" class="dropdown-item">Русский</a>
+            <a href="https://privacytools.dreads-unlock.fr" class="dropdown-item">Français</a>
           </span>
         </details>
 
@@ -140,9 +142,12 @@
         </details>
 
         <a href="https://blog.privacytools.io/" class="nav-anchor">{% t service_descriptions.blog %} </a>
-        <a href="/donate/" class="nav-anchor">
-          {% t resources.donate %} <span class="fas fa-heart text-danger"></span>
+        <a href="/sponsors/" class="nav-anchor">
+          {% t resources.sponsors %}
         </a>
+        <span id="nav-switch-theme" class="nav-anchor">
+          Theme <span class="nav-theme-icon fas fa-fw"></span>
+        </span>
       </div>
     </div>
   </nav>

_includes/panel.html

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

_includes/scripts.html

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

_includes/sections/android-addons.html

@@ -6,16 +6,6 @@
 
 <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>{% t android_addons.block_ads %} <a href="https://blokada.org/">Blokada</a></h3>
-    <p><strong>Blokada</strong> {% t android_addons.blokada %}
-    </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">
@@ -37,3 +27,11 @@
   </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

@@ -23,19 +23,6 @@
 {%- 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=title1
-image="/assets/img/addons/privacy-badger.png"
-description=descr1
-website="https://www.eff.org/privacybadger"
-forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
-github="https://github.com/EFForg/privacybadger"
-firefox=""
-chrome=""
-opera=""
-android=""
-%}
-
 {% include cardv2.html
 title=title2
 image="/assets/img/addons/ublock-origin.png"
@@ -43,12 +30,10 @@ 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=""
-chrome=""
-safari=""
-opera=""
-edge=""
-android=""
+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
@@ -58,8 +43,8 @@ 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=""
-chrome=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete"
+chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
 %}
 
 {% include cardv2.html
@@ -69,10 +54,9 @@ 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=""
-chrome=""
-android=""
-opera=""
+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
@@ -82,9 +66,9 @@ description=descr5
 website="https://decentraleyes.org/"
 forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
 gitlab="https://git.synz.io/Synzvato/decentraleyes"
-firefox=""
-chrome=""
-opera=""
+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
@@ -92,12 +76,11 @@ title=title6
 image="/assets/img/addons/tosdr.png"
 description=descr6
 website="https://tosdr.org/"
-forum="https://forum.privacytools.io/t/discussion-decentraleyes/270"
+forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270"
 github="https://github.com/tosdr/"
-firefox=""
-chrome=""
-opera=""
-safari=""
+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
@@ -107,12 +90,23 @@ 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=""
-chrome=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake"
+chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
 %}
 
+{% include cardv2.html
+title="Privacy Badger: Stop Tracking"
+image="/assets/img/addons/privacy-badger.png"
+description="<strong>Privacy Badger</strong> is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse."
+website="https://www.eff.org/privacybadger"
+forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
+github="https://github.com/EFForg/privacybadger"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17"
+chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbdbbnkijodmdjhbjlgp"
+opera="https://addons.opera.com/en/extensions/details/privacy-badger/"
+%}
 
-<h2>{% t browser_addons.for_experts_only %}</h2>
+<h2>{% t browser_addons.for_power_users_only %}</h2>
 
 <div class="alert alert-warning" role="alert">
   <strong>{% t browser_addons.addon_warning %}</strong>
@@ -125,9 +119,9 @@ description=descr8
 website="https://addons.mozilla.org/firefox/addon/umatrix/"
 forum="https://forum.privacytools.io/t/discussion-umatrix/271"
 github="https://github.com/gorhill/uMatrix"
-firefox=""
-chrome=""
-opera=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/umatrix"
+chrome="https://chrome.google.com/webstore/detail/umatrix/ogfcmafjalglgifnmanfmnieipoejdcf"
+opera="https://addons.opera.com/en/extensions/details/umatrix"
 %}
 
 {% include cardv2.html
@@ -137,6 +131,6 @@ description=descr9
 website="https://addons.mozilla.org/firefox/addon/noscript/"
 forum="https://forum.privacytools.io/t/discussion-noscript-security-suite/272"
 github="https://github.com/hackademix/noscript"
-firefox=""
-chrome=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/noscript"
+chrome="https://chrome.google.com/webstore/detail/noscript/doojmbjmlfjjnbmnoijecmcbfeoakpjm"
 %}

_includes/sections/browser-fingerprint.html

@@ -4,8 +4,6 @@
   <strong>Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.</strong>
 </div>
 
-<img src="/assets/img/layout/browser-fingerprint.png" width="439" height="350" class="img-fluid float-right" alt="Fingerprint image" style="margin-left:20px;">
-
 <p>When you visit a web page, your browser voluntarily sends information about its configuration, such as available fonts, browser type, and add-ons. If this combination of information is unique, it may be possible to identify and track you without using cookies. EFF created a Tool called <a href="https://panopticlick.eff.org/">Panopticlick</a> to test your browser to see how unique it is.</p>
 
 <p>
@@ -14,7 +12,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 the TBB, 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 using the Tor Browser Bundle, will make your browser stick out from the masses.</p>
 
 <p>Modern web browsers have not been architected to assure personal web privacy. Rather than worrying about being fingerprinted, it seems more practical to use <a href="#addons"><i class="fas fa-link"></i> free software plugins</a> 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>
 
@@ -29,5 +27,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,19 +1,53 @@
-<h1 id="browser" class="anchor"><a href="#browser"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations</h1>
+<h1 id="browser" class="anchor">
+  <a href="#browser"><span class="fas fa-link anchor-icon"></span></a>
+  Browser Recommendations For Desktop
+</h1>
 
 {% include cardv2.html
-title="Mozilla Firefox"
+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
+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.firefox.com/"
+website="https://firefox.com"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
-github="https://github.com/mozilla"
-windows=""
-mac=""
-linux=""
-android=""
-ios=""
-bsd=""
+source="https://hg.mozilla.org/mozilla-central/"
+windows="https://www.mozilla.org/firefox/windows/"
+mac="https://www.mozilla.org/firefox/mac/"
+linux="https://www.mozilla.org/firefox/linux/"
+freebsd="https://www.freshports.org/www/firefox"
+openbsd="http://openports.se/www/mozilla-firefox"
+netbsd="http://pkgsrc.se/www/firefox"
+%}
+
+{% include cardv2.html
+title="Tor Browser - Provides Anonymity"
+image="/assets/img/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
@@ -21,12 +55,81 @@ 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/"
-forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
-git="https://trac.torproject.org/projects/tor"
-windows=""
-mac=""
-linux=""
-android=""
-ios=""
-bsd=""
+tor="http://expyuzz4wqqyqhjn.onion/"
+forum="https://forum.privacytools.io/t/discussion-tor-browser-for-android-browsers/1522"
+git="https://gitweb.torproject.org/tor-browser.git/"
+android="https://www.torproject.org/download/#android"
+fdroid="https://guardianproject.info/fdroid/"
+googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
 %}
+
+{% include cardv2.html
+title="Bromite"
+image="/assets/img/tools/bromite.png"
+description='Bromite is a Chromium-based browser with security enhancement patches from GrapheneOS and built-in adblocking and DNS over HTTPS support. More info can be found <a href="https://www.bromite.org/#main-features">here</a>.'
+website="https://www.bromite.org/"
+forum="https://forum.privacytools.io/t/discussion-bromite-browsers/1521"
+github="https://github.com/bromite/bromite"
+fdroid="https://www.bromite.org/fdroid"
+android="https://www.bromite.org/#download-bromite"
+%}
+
+<h3>Worth Mentioning for Android</h3>
+
+<ul>
+  <li>
+    <a href="https://www.stoutner.com/privacy-browser/">Privacy Browser</a>
+   - An open-source web browser focused on user privacy. Features include integrated ad blocking with <a href="https://easylist.to/">EasyList</a>, <a href="https://www.stoutner.com/privacy-browser-2-5/">SSL certificate pinning</a>, and <a href='https://guardianproject.info/apps/orbot/'>Tor Orbot proxy support.</a>
+    <a href="https://play.google.com/store/apps/details?id=com.google.android.webview&hl=en_US">
+      <span class="badge badge-warning" data-toggle="tooltip" title="Privacy Browser relies on the Android System WebView which needs to be kept up to date to fix security issues. One can update WebView by either installing it from Google Play or Aurora Store which you can get from F-Droid.">
+        <span class="fas fa-exclamation-triangle"></span>
+        Keep Android WebView up-to-date
+      </span>
+    </a>
+  </li>
+</ul>
+
+
+<h1 id="browser-ios" class="anchor"><a href="#browser-ios"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations For iOS</h1>
+
+{% include cardv2.html
+title="Firefox"
+image="/assets/img/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,15 +28,6 @@
   <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>
 
@@ -46,8 +37,6 @@
   <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>
@@ -74,26 +63,7 @@
   </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>
@@ -131,23 +101,14 @@
   </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>Firefox user.js Templates</h3>
+<h3 id="user.js">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,43 +4,56 @@
   <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 card.html color="success"
+{%
+  include cardv2.html
   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="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."
-  %}
+  description="<strong>Nextcloud</strong> is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server."
+  website="https://nextcloud.com/"
+  forum="https://forum.privacytools.io/t/discussion-nextcloud-calender-contacts-sync-tools/1535"
+  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"
-  url="../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."
-  %}
+  description='Many email providers also offer calendar and or contacts sync services. Refer to the <a href="/providers/email">Email Providers section</a> to choose an email provider and check if they also offer calendar and/or contacts sync.'
+  website="/providers/email"
+%}
 
-  {% include card.html color="warning"
+{%
+  include cardv2.html
   title="EteSync"
   image="/assets/img/provider/etesync.png"
-  url="https://www.etesync.com/"
-  footer="Client OS: Android, Web. Server OS: Linux."
-  description="EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free."
-  %}
-
-</div>
+  description="<strong>EteSync</strong> is a secure, end-to-end encrypted, and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $24 per year to use, or you can host the server yourself for free."
+  website="https://www.etesync.com/"
+  forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536"
+  github="https://github.com/etesync"
+  web="https://client.etesync.com/"
+  windows="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  mac="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  linux="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  fdroid="https://f-droid.org/packages/com.etesync.syncadapter/"
+  googleplay="https://play.google.com/store/apps/details?id=com.etesync.syncadapter"
+%}
 
 <h3>Worth Mentioning</h3>
 
 <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/#encrypt">encrypting</a> them).
+    <a href="../cloud">cloud backups</a> - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/">encrypting</a> them).
   </li>
 </ul>

_includes/sections/cloud-storage.html

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

_includes/sections/dns.html

@@ -1,30 +1,31 @@
 <h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Domain Name System (DNS)</h1>
 
-{% include cardv2.html
-title="OpenNIC - Service"
-image="/assets/img/tools/OpenNIC.png"
-description="OpenNIC is an alternate network information center/alternative DNS root which lists itself as an alternative to ICANN and its registries. Like all alternative root DNS systems, OpenNIC-hosted domains are unreachable to the vast majority of the Internet."
-website="https://www.opennic.org/"
-forum="https://forum.privacytools.io/t/discussion-opennic/338"
-github="https://github.com/OpenNIC"
+{%
+  include cardv2.html
+  title="Njalla - Domain Registration"
+  image="/assets/img/provider/Njalla.png"
+  description="Njalla is a privacy-aware domain registration service based in Nevis that only needs your email or XMPP address in order to register a domain name for you. It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal."
+  website="https://njal.la/"
+  tor="http://njalladnspotetti.onion"
+  forum="https://forum.privacytools.io/t/discussion-njalla/339"
 %}
 
-{% include cardv2.html
-title="Njalla - Domain Registration"
-image="/assets/img/provider/Njalla.png"
-description="Njalla only needs your email or jabber address in order to register a domain name for you. Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service."
-website="https://njal.la/"
-tor="http://njalladnspotetti.onion"
-forum="https://forum.privacytools.io/t/discussion-njalla/339"
-%}
-
-{% include cardv2.html
-title="DNSCrypt - Tool"
-image="/assets/img/tools/DNSCrypt.png"
-description="A protocol for securing communications between a client and a DNS resolver. The DNSCrypt protocol uses high-speed high-security elliptic-curve cryptography and is very similar to DNSCurve, but focuses on securing communications between a client and its first-level resolver."
-website="https://dnscrypt.info/"
-forum="https://forum.privacytools.io/t/discussion-dnscrypt/340"
-github="https://github.com/jedisct1/dnscrypt-proxy"
+{%
+  include cardv2.html
+  title="DNSCrypt-Proxy - Tool"
+  image="/assets/img/tools/DNSCrypt-Proxy.png"
+  description="DNSCrypt-Proxy is a command-line DNS proxy with support for the encrypted DNS protocols, DNS over HTTPS and DNSCrypt. Can cache results to improve speed, and allows filtering, forwarding, and cloaking."
+  website="https://github.com/jedisct1/dnscrypt-proxy/"
+  forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
+  github="https://github.com/jedisct1/dnscrypt-proxy/"
+  windows="https://github.com/jedisct1/dnscrypt-proxy/releases"
+  linux=""
+  mac="https://github.com/jedisct1/dnscrypt-proxy/releases"
+  freebsd="https://www.freshports.org/dns/dnscrypt-proxy2/"
+  openbsd="http://openports.se/net/dnscrypt-proxy"
+  netbsd="http://pkgsrc.se/net/dnscrypt-proxy2"
+  android=""
+  ios=""
 %}
 
 <h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> Encrypted ICANN DNS Providers</h1>
@@ -47,6 +48,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <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>
@@ -54,7 +56,12 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td data-value="AdGuard">
           <a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard</a>
         </td>
-        <td>Anycast (based in <span class="flag-icon flag-icon-cy"></span> Cyprus)</td>
+        <td>Anycast (based in
+          <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">
@@ -65,19 +72,44 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Ads, trackers, malicious domains</td>
+        <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><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>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-ch"></span>
+            Switzerland,
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-jp"></span>
+            Japan,
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-de"></span>
+            Germany
+          </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">
@@ -85,22 +117,54 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         </td>
         <td>Hobby Project</td>
         <td>No</td>
-        <td data-value="dot/443">DoH, <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853"><strong>DoT</strong></span>, DNSCrypt</td>
+        <td data-value="dot/443">
+          <span class="no-text-wrap">
+            DoH,
+            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
+              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
+            </span>
+          </span>
+          DNSCrypt
+        </td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Ads, trackers, malicious domains <span class="badge badge-warning" data-toggle="tooltip" data-original-title="And some wildcard, IDN, and non-ASCII domains."><a href="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"><i class="fas fa-exclamation-triangle"></i></a></span></td>
+        <td>
+          <span class="no-text-wrap">
+            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 <span class="flag-icon flag-icon-us"></span> US)</td>
+        <td>Anycast (based in
+          <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">
@@ -112,18 +176,20 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>Yes</td>
         <td>Yes</td>
         <td>No</td>
-        <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>
+        <td>?</td>
+        <td>Self</td>
       </tr>
 
       <tr>
         <td data-value="CZ.NIC">
           <a href="https://www.nic.cz/odvr/">CZ.NIC</a>
         </td>
-        <td><span class="flag-icon flag-icon-cz"></span> Czech Republic</td>
+        <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">
@@ -136,13 +202,19 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <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><span class="flag-icon flag-icon-de"></span> Germany</td>
+        <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">
@@ -150,18 +222,40 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         </td>
         <td>Hobby Project</td>
         <td>No</td>
-        <td data-value="dot/443">DoH, <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853"><strong>DoT</strong></span>, DNSCrypt</td>
+        <td data-value="dot/443">
+          <span class="no-text-wrap">
+            DoH,
+            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
+              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
+            </span>
+          </span>
+          DNSCrypt
+        </td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Based on server choice</td>
+        <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><span class="flag-icon flag-icon-at"></span> Austria</td>
+        <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">
@@ -169,37 +263,116 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         </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">DoH, <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853"><strong>DoT</strong></span></td>
+        <td data-value="dot/443">
+          <span class="no-text-wrap">
+            DoH,
+            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
+              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>
+            </span>
+          </span>
+        </td>
         <td>Yes</td>
         <td>Yes</td>
         <td>No</td>
         <td>?</td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.ipax.at/">IPAX OG</a>
+          </span>
+        </td>
       </tr>
 
       <tr>
         <td data-value="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><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>
+          <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>Based on user choice</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice
+          </span>
+        </td>
         <td>?</td>
+        <td>Self</td>
+      </tr>
+
+      <tr>
+        <td data-value="NixNet">
+          <a href="https://nixnet.xyz/dns/">NixNet</a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            Anycast (based in
+            <span class="flag-icon flag-icon-us"></span>
+            US),
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-us"></span>
+            US,
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-lu"></span>
+            Luxembourg
+          </span>
+        </td>
+        <td>
+          <a 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><span class="flag-icon flag-icon-nl"></span> The Netherlands</td>
+        <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">
@@ -216,13 +389,23 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
             <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, comprised 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, composed 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">
@@ -233,15 +416,30 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Malicious domains</td>
+        <td>
+          <span class="no-text-wrap">
+            Malicious domains
+          </span>
+        </td>
         <td>?</td>
+        <td>
+          Self,
+          <span class="no-text-wrap">
+            <a href="https://www.pch.net/">Packet Clearing House</a>
+          </span>
+        </td>
       </tr>
 
       <tr>
         <td data-value="SecureDNS">
           <a href="https://securedns.eu/">SecureDNS</a>
         </td>
-        <td><span class="flag-icon flag-icon-nl"></span> The Netherlands</td>
+        <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">
@@ -252,15 +450,76 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Based on server choice</td>
+        <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 <span class="flag-icon flag-icon-dk"></span> Denmark)</td>
+        <td>Anycast (based in
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-dk"></span>
+            Denmark),
+          </span>
+
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-dk"></span>
+            Denmark,
+            </span>
+
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-us"></span>
+            US
+          </span>
+        </td>
         <td>
           <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">
@@ -273,77 +532,92 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <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>
-    <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.</li>
-    <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>
+<ul>
+  <li>DNS-over-TLS (DoT) - A security protocol for encrypted DNS on a dedicated port 853. Some providers support port 443 which generally works everywhere while port 853 is often blocked by restrictive firewalls. DoT has two modes:</li>
+    <ul>
+        <li>Oppurtunistic mode: the client attempts to form a DNS-over-TLS connection to the server on port 853 without performing certificate validation. If it fails, it will use unencrypted DNS. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="In other words automatic mode leaves your DNS traffic vulnerable to SSL strip and MITM attacks"><i class="fas fa-exclamation-triangle"></i></span></li>
+        <li>Strict mode: the client connects to a specific hostname and performs certificate validation for it. If it fails, no DNS queries are made until it succeeds.</li>
+    </ul>
+  <li>DNS-over-HTTPS (DoH) - Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="DoH contains metadata such as user-agent (which may include system information) that is sent to the DNS server."><a href="https://tools.ietf.org/html/rfc8484#section-8.2"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+  <li>DNSCrypt - An older yet robust method of encrypting DNS.</li>
+</ul>
 
-  <h4>How to verify DNS is encrypted</h4>
+<h4>How to verify DNS is encrypted</h4>
 
-  <ul>
-    <li>DoH / DoT
-      <ul>
-        <li>Check <a href="https://www.dnsleaktest.com/">DNSLeakTest.com</a>. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title="Your DNS provider may not appear with their own name, so compare the responses to what you know or can find about your DNS provider. Just ensure you don't see your ISP or old unencrypted DNS provider."><i class="fas fa-exclamation-triangle"></i></span></li>
-        <li>Check the website of your DNS provider. They may have a page for telling "you are using our DNS." Examples include <a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard</a> and <a href="https://1.1.1.1/help">Cloudflare</a>.</li>
-        <li>If using Firefox's trusted recursive resolver (TRR), navigate to <code>about:networking#dns</code>. If the TRR column says "true" for some fields, you are using DoH. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title='Some fields will say "false" depending on the the value of network.trr.mode in about:config'><a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver"><i class="fas fa-exclamation-triangle"></i></a></span></li>
-      </ul>
-    </li>
-    <li>dnscrypt-proxy - Check <a href="https://github.com/jedisct1/dnscrypt-proxy/wiki/Checking">dnscrypt-proxy's wiki on how to verify that your DNS is encrypted</a>.
-    </li>
-    <li>DNSSEC - Check <a href="https://dnssec.vs.uni-due.de/">DNSSEC Resolver Test by Matthäus Wander</a>.</li>
-    <li>QNAME Minimization - Run <code><a href="https://en.wikipedia.org/wiki/Dig_(command)">dig</a> +short txt qnamemintest.internet.nl</code> from the command-line (taken from <a href="https://nlnetlabs.nl/downloads/presentations/unbound_qnamemin_oarc24.pdf">this NLnet Labs presentation</a>). You should see this display: <code>"HOORAY - QNAME minimisation is enabled on your resolver :)!"</code></li>
-  </ul>
+<ul>
+  <li>DoH / DoT
+    <ul>
+      <li>Check <a href="https://www.dnsleaktest.com/">DNSLeakTest.com</a>. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title="Your DNS provider may not appear with their own name, so compare the responses to what you know or can find about your DNS provider. Just ensure you don't see your ISP or old unencrypted DNS provider."><i class="fas fa-exclamation-triangle"></i></span></li>
+      <li>Check the website of your DNS provider. They may have a page for telling "you are using our DNS." Examples include <a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard</a> and <a href="https://1.1.1.1/help">Cloudflare</a>.</li>
+      <li>If using Firefox's trusted recursive resolver (TRR), navigate to <code>about:networking#dns</code>. If the TRR column says "true" for some fields, you are using DoH. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title='Some fields will say "false" depending on the the value of network.trr.mode in about:config'><a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+    </ul>
+  </li>
+  <li>dnscrypt-proxy - Check <a href="https://github.com/jedisct1/dnscrypt-proxy/wiki/Checking">dnscrypt-proxy's wiki on how to verify that your DNS is encrypted</a>.</li>
+  <li>DNSSEC - Check <a href="https://dnssec.vs.uni-due.de/">DNSSEC Resolver Test by Matthäus Wander</a>.</li>
+  <li>QNAME Minimization - Run <code>dig +short txt qnamemintest.internet.nl</code> from the command-line (taken from <a href="https://nlnetlabs.nl/downloads/presentations/unbound_qnamemin_oarc24.pdf">this NLnet Labs presentation</a>). If you are on Windows 10, run <code>Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl</code> from the PowerShell. You should see this display: <code>"HOORAY - QNAME minimisation is enabled on your resolver :)!"</code></li>
+</ul>
 
-  <h3>Worth Mentioning and Additional Information</h3>
+<h3 id="clients">Worth Mentioning and Additional Information</h3>
 
-  <ul>
-    <li><strong>Encrypted DNS clients for desktop:</strong>
+<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><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.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>
+          <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>
-    </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>
-        <li><em><a href="https://apps.apple.com/app/id1452162351">DNSCloak</a></em> - An <a href="https://github.com/s-s/dnscloak">open-source</a> DNSCrypt and DoH client for iOS by <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"A charitable non-profit host organization for international Free Software projects."' href="https://techcultivation.org/">the Center for the Cultivation of Technology gemeinnuetzige GmbH</a>.</li>
-        <li><em><a href="https://git.frostnerd.com/PublicAndroidApps/smokescreen/blob/master/README.md">Nebulo</a></em> - An open-source application for Android supporting DoH and DoT. It also supports caching DNS responses and locally logging DNS queries.</li>
-      </ul>
-    </li>
-    <li><strong>Local DNS servers:</strong>
-      <ul>
-        <li><em><a href="https://namecoin.info/">Namecoin</a></em> - A decentralized DNS open-source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
-        <li><em><a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby">Stubby</a></em> - An open-source application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.</li>
-      </ul>
-    </li>
-    <li><strong>Network wide DNS servers:</strong>
-      <ul>
-        <li><em><a href="https://pi-hole.net/">Pi-hole</a></em> - A network-wide DNS server mainly for the Raspberry Pi. Blocks ads, tracking, and malicious domains for all devices on your network.</li>
-        <li><em><a href="https://gitlab.com/quidsup/notrack">NoTrack</a></em> - A network-wide DNS server like Pi-hole for blocking ads, tracking, and malicious domains.</li>
-      </ul>
-    </li>
-    <li><strong>Further reading:</strong>
-      <ul>
-        <li>On Firefox, DoH and ESNI</li>
-            <ul>
-                <li><a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver">Trusted Recursive Resolver (DoH) on MozillaWiki</a></li>
-                <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1500289">Firefox bug report requesting the ability to use ESNI without DoH</a></li>
-                <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1542754">Firefox bug report requesting the ability to use Android 9+'s Private DNS (DoT) and benefit from encrypted SNI without having to enable DoH</a></li>
-                <li><a href="https://blog.cloudflare.com/encrypted-sni/">Encrypt it or lose it: how encrypted SNI works on Cloudflare blog</a></li>
-            </ul>
-        <li><a href="https://www.isc.org/blogs/qname-minimization-and-privacy/">QNAME Minimization and Your Privacy</a> by the Internet Systems Consortium (ISC)</li>
-        <li><a href="https://www.isc.org/dnssec/">DNSSEC and BIND 9</a> by the ISC</li>
-      </ul>
-    </li>
-  </ul>
-</div>
+    </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,25 +4,26 @@
 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=""
-mac=""
-linux=""
+windows="https://github.com/Bitmessage/PyBitmessage/releases"
+mac="https://github.com/Bitmessage/PyBitmessage/releases"
+linux="https://repology.org/project/pybitmessage/versions"
 %}
 
 {% include cardv2.html
 title="RetroShare"
 image="/assets/img/tools/RetroShare.png"
-description="Retroshare creates encrypted connections to your friends. Nobody can spy on you. Retroshare is completely decentralized. This means there are no central servers. It is entirely Open-Source and free. There are no costs, no ads and no Terms of Service."
+description="Retroshare creates encrypted connections to your friends. Nobody can spy on you. Retroshare is completely decentralized. This means there are no central servers. It is entirely open-source and free. There are no costs, no ads, and no Terms of Service."
 website="https://retroshare.cc/"
 forum="https://forum.privacytools.io/t/discussion-retroshare/662"
 github="https://github.com/RetroShare/RetroShare"
-windows=""
-mac=""
-linux=""
+windows="https://retroshare.cc/downloads.html#windows"
+mac="https://retroshare.cc/downloads.html#mac"
+linux="https://retroshare.cc/downloads.html#gnulinux"
+freebsd="https://retroshare.cc/downloads.html#freebsd"
 %}
 
 

_includes/sections/email-clients.html

@@ -7,10 +7,12 @@ 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=""
-mac=""
-linux=""
-bsd=""
+windows="https://www.thunderbird.net/en-US/"
+mac="https://www.thunderbird.net/en-US/"
+linux="https://www.thunderbird.net/en-US/"
+freebsd="https://www.freshports.org/mail/thunderbird/"
+openbsd="http://openports.se/mail/mozilla-thunderbird"
+netbsd="http://pkgsrc.se/mail/thunderbird"
 %}
 
 {% include cardv2.html
@@ -20,10 +22,12 @@ 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=""
-mac=""
-linux=""
-bsd=""
+windows="https://www.claws-mail.org/win32/"
+mac="https://www.claws-mail.org/faq/index.php/Installation_and_Configuration#What_do_I_need_to_compile_Claws_Mail.3F"
+linux="https://www.claws-mail.org/downloads.php?section=downloads"
+freebsd="https://www.freshports.org/mail/claws-mail/"
+openbsd="http://openports.se/mail/claws-mail"
+netbsd="http://pkgsrc.se/mail/claws-mail"
 %}
 
 

_includes/sections/email-providers.html

@@ -30,7 +30,11 @@
           <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>
+          <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>
@@ -46,7 +50,11 @@
           <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="flag-icon flag-icon-ch"></span> Switzerland</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>
@@ -63,7 +71,11 @@
           <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>
+          <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>
@@ -79,7 +91,11 @@
           <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>
+          <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>
@@ -95,7 +111,11 @@
           <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>
+          <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>
@@ -111,7 +131,11 @@
           <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>
+          <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>
@@ -128,7 +152,11 @@
           <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><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+        <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>
@@ -145,7 +173,11 @@
           <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><span class="flag-icon flag-icon-no"></span> Norway</td>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-no"></span> Norway
+          </span>
+        </td>
         <td data-value="1000">1 GB</td>
         <td data-value="1995">$ 19.95</td>
         <td data-value="1"><span class="label label-primary">Accepted</span></td>
@@ -161,7 +193,11 @@
           <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><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-nl"></span> Netherlands
+          </span>
+        </td>
         <td data-value="25000">25 GB</td>
         <td data-value="3489">29 €</td>
         <td data-value="0"><span class="label label-success">No</span></td>
@@ -177,7 +213,11 @@
           <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><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
+        <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="0"><span class="label label-success">Accepted</span></td>
@@ -193,7 +233,11 @@
           <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>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-de"></span> Germany
+          </span>
+        </td>
         <td data-value="1000">1 GB</td>
         <td data-value="0"><span class="label label-warning">Free</span></td>
         <td data-value="0"><span class="label label-primary">No</span></td>
@@ -211,7 +255,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" alt="Mail-in-a-Box" style="margin-right:10px;"></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 mr-3" alt="Mail-in-a-Box"></a>
 <p>Take it a step further and get control of your email with this easy-to-deploy mail server in a box. Mail-in-a-Box lets you become your own mail service provider in a few easy steps. It's sort of like making your own Gmail, but one you control from top
 to bottom. Technically, Mail-in-a-Box turns a fresh cloud computer into a working mail server. But you don't need to be a technology expert to set it up. <strong>More: <a href="https://mailinabox.email/">https://mailinabox.email/</a></strong></p>
 

_includes/sections/file-encryption.html

@@ -1,48 +1,61 @@
 <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 an encryption software here.</strong>
+  <strong>If you are currently not using encryption software for your hard disk, emails, or file archives, you should pick one here.</strong>
 </div>
 
-<div class="row mb-2">
-
-  {% include card.html color="success"
+{%
+  include cardv2.html
   title="VeraCrypt - Disk Encryption"
   image="/assets/img/tools/VeraCrypt.png"
-  url="https://veracrypt.fr/"
-  footer="OS: Windows, macOS, Linux."
-  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
-  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."
-  %}
+  description="<strong>VeraCrypt</strong> is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file or encrypt a partition or the entire storage device with pre-boot authentication. VeraCrypt is a fork of the discontinued TrueCrypt project. It was initially released on June 22, 2013. According to its developers, security improvements have been implemented and issues raised by the initial TrueCrypt code audit have been addressed."
+  website="https://veracrypt.fr/"
+  forum="https://forum.privacytools.io/t/discussion-veracrypt-file-encryption/1532"
+  git="https://www.veracrypt.fr/code/"
+  windows="https://www.veracrypt.fr/en/Downloads.html"
+  linux="https://www.veracrypt.fr/en/Downloads.html"
+  mac="https://www.veracrypt.fr/en/Downloads.html"
+%}
 
-  {% include card.html color="primary"
+{%
+  include cardv2.html
   title="GNU Privacy Guard - Email Encryption"
   image="/assets/img/tools/GnuPG.png"
-  url="https://gpgtools.org/"
-  footer="OS: Windows, macOS, Linux, Android, BSD."
-  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
-  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. <a href=\"https://gpgtools.org/\">GPGTools for macOS</a>."
-  %}
+  description="<strong>GnuPG</strong> is a GPL-licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German government."
+  website="https://gnupg.org/"
+  forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533"
+  git="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git"
+  windows="https://gpg4win.org/download.html"
+  linux="https://gnupg.org/download/index.html#binary"
+  freebsd="https://www.freshports.org/security/gnupg/"
+  openbsd="http://openports.se/security/gnupg"
+  netbsd="http://pkgsrc.se/security/gnupg"
+  mac="https://gpgtools.org/"
+  fdroid="https://f-droid.org/app/org.sufficientlysecure.keychain"
+  googleplay="https://play.google.com/store/apps/details?id=org.sufficientlysecure.keychain"
+%}
 
-  {% include card.html color="warning"
+{%
+  include cardv2.html
   title="PeaZip - File Archive Encryption"
   image="/assets/img/tools/PeaZip.png"
-  url="http://www.peazip.org/"
-  footer="OS: Windows, Linux, BSD."
-  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
-  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>
-  <p><strong>macOS alternative:</strong> <a href=\"https://www.keka.io/\">Keka</a> is a free file archiver."
-  %}
-
-</div>
+  description="<strong>PeaZip</strong> is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It also supports 180+ archive formats."
+  website="http://www.peazip.org"
+  forum="https://forum.privacytools.io/t/discussion-peazip-file-encryption/1534"
+  source="https://osdn.net/projects/peazip"
+  windows="https://www.peazip.org/peazip-64bit.html"
+  linux="https://www.peazip.org/peazip-linux.html"
+  freebsd="https://www.freshports.org/archivers/peazip/"
+  openbsd="https://www.peazip.org/peazip-bsd.html"
+  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://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="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="Firefox Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether to add an optional password for an extra layer of security."
 forum="https://forum.privacytools.io/t/discussion-firefox-send/755"
 github="https://github.com/mozilla/send"
-web=""
-android=""
+web="https://send.firefox.com/"
+googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsend"
 %}
 
 {% include cardv2.html
@@ -16,28 +16,34 @@ 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 to 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 for you to share so that the recipients can access and download the files."
 forum="https://forum.privacytools.io/t/discussion-onionshare/754"
 github="https://github.com/micahflee/onionshare"
-windows=""
-mac=""
-linux=""
+windows="https://onionshare.org/#downloads"
+mac="https://onionshare.org/#downloads"
+linux="https://onionshare.org/#downloads"
+freebsd="https://www.freshports.org/www/onionshare/"
+openbsd="http://openports.se/net/onionshare"
 %}
 
 {% include cardv2.html
 title="Magic Wormhole"
 image="/assets/img/tools/Magic-Wormhole.png"
-website="https://github.com/warner/magic-wormhole"
-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."
+website="https://magic-wormhole.readthedocs.io"
+description="Magic Wormhole is a package that provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. Their motto: \"Get things from one computer to another, safely.\""
 forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756"
 github="https://github.com/warner/magic-wormhole"
-windows=""
-mac=""
-linux=""
+windows="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+mac="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+linux="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+freebsd="https://www.freshports.org/net/py-magic-wormhole/"
+openbsd="https://pypi.org/project/magic-wormhole/"
+netbsd="https://pypi.org/project/magic-wormhole/"
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
   <li><a href="https://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,24 +1,36 @@
-<h1 id="sync" class="anchor"><a href="#sync"><i class="fas fa-link anchor-icon"></i></a> Secure File Sync Software</h1>
+<h1 id="sync" class="anchor">
+  <a href="#sync">
+    <i class="fas fa-link anchor-icon"></i>
+  </a>
+  File Sync
+</h1>
 
-<div class="row mb-2">
-
-  {% include card.html color="success"
-  title="SparkleShare"
-  image="/assets/img/tools/SparkleShare.png"
-  url="https://sparkleshare.org/"
-  footer="OS: Windows, macOS, Linux."
-  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
-  kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
-  %}    {% include card.html color="primary"
+{%
+  include cardv2.html
   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."
-  %}
+  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"
+%}
 
-</div>
+{%
+  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."
+  website="https://sparkleshare.org/"
+  forum="https://forum.privacytools.io/t/discussion-sparkleshare/1626"
+  github="https://github.com/hbons/SparkleShare"
+  linux="https://www.sparkleshare.org/"
+  mac="https://github.com/hbons/SparkleShare/releases/"
+%}
 
 <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" alt="UKUSA Agreement" style="margin-left:10px;">
+<img src="/assets/img/layout/UKUSA.png" width="260" height="115" class="img-fluid float-right ml-2" alt="UKUSA Agreement">
 
-<p>The UKUSA Agreement is an agreement between the United Kingdom, United States, Australia, Canada, and New Zealand to cooperatively collect, analyze, and share intelligence. Members of this group, known as the <a href="https://www.giswatch.org/en/communications-surveillance/unmasking-five-eyes-global-surveillance-practices">Five Eyes</a>, focus on gathering and analyzing intelligence from different parts of the world. While Five Eyes countries have agreed to <a href="https://www.pbs.org/newshour/world/an-exclusive-club-the-five-countries-that-dont-spy-on-each-other">not spy on each other</a> as adversaries, leaks by Snowden have revealed that some Five Eyes members monitor each other's citizens and <a href="https://www.theguardian.com/uk/2013/jun/21/gchq-cables-secret-world-communications-nsa">share intelligence</a> to <a href="https://www.theguardian.com/politics/2013/jun/10/nsa-offers-intelligence-british-counterparts-blunkett">avoid breaking domestic laws</a> that prohibit them from spying on their own citizens. The Five Eyes alliance also cooperates with groups of third-party countries to share intelligence (forming the Nine Eyes and Fourteen Eyes), however Five Eyes and third-party countries can and do spy on each other.</p>
+<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,3 +1,7 @@
+<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>

_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 us world famous."
+description="Bahnhof is one of Sweden’s largest network operators, founded in 1994. They specialize in innovative data center construction: Extreme security coupled with low-cost green energy has made them world famous."
 website="https://www.bahnhof.net/"
 forum="https://forum.privacytools.io/t/discussion-bahnhof-net/341"
 %}
@@ -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="Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service and VPS provider."
+description="Njalla is a privacy-aware domain registration service and VPS provider based in Nevis (with VPS data centers in Sweden). It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal."
 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: Orange Website"
+title="VPS, Hosting, & Domain: 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,25 +14,30 @@ labels="success:VoIP"
 website="https://signal.org/"
 forum="https://forum.privacytools.io/t/discussion-signal/664"
 github="https://github.com/signalapp"
-android=""
-ios=""
+windows="https://signal.org/download/"
+mac="https://signal.org/download/"
+linux="https://signal.org/download/"
+googleplay="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
+android="https://signal.org/android/apk/#apk-danger"
+ios="https://apps.apple.com/us/app/signal-private-messenger/id874139669"
 %}
 
 
 {% include cardv2.html
 title="Wire"
 image="/assets/img/tools/wire.png"
-description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
+description="Wire is a free and end-to-end encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
 labels="warning:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text>Warning</a>:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.|success:VoIP"
 website="https://wire.com/"
 forum="https://forum.privacytools.io/t/discussion-wire/750"
 github="https://github.com/wireapp/"
-android=""
-ios=""
-mac=""
-windows=""
-linux=""
-web=""
+windows="https://wire.com/en/download"
+mac="https://wire.com/en/download"
+linux="https://wire.com/en/download"
+googleplay="https://play.google.com/store/apps/details?id=com.wire"
+android="https://wire.com/en/download"
+ios="https://itunes.apple.com/app/wire/id930944768?mt=8"
+web="https://app.wire.com"
 %}
 
 <h3>Complete Comparison</h3>
@@ -46,20 +51,21 @@ web=""
 <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><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://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.</li>
+  <li><a href="https://about.riot.im/">Riot</a> - An open-source, federated messenger that utilizes the Matrix protocol. This application is primarily recommended as a large group/team chat solution. While Riot has the ability to perform 1-on-1 communications we believe there are better solutions for direct communications.</li>
+  <li><a href="https://retroshare.cc/">RetroShare</a> - An end-to-end encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </li>
   <li><a href="https://xmpp.org/">XMPP</a> - Federated instant messaging protocol with <a href="https://conversations.im/omemo/">OMEMO</a>, OTR, or OpenPGP end-to-end encryption:</li>
   <ul>
-    <li><a href="https://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://conversations.im/">Conversations</a> (Android) - An open-source Jabber/XMPP client for Android 4.4+ smartphones. <span class="badge badge-success">OMEMO</span></li>
+    <li><a href="https://gajim.org/">Gajim</a> (FreeBSD, Linux, Windows) - An open-source fully featured XMPP client. <span class="badge badge-success">OMEMO</span></li>
     <li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development. <span class="badge badge-success">OMEMO</span> <span class="badge badge-success">VoIP</span></li>
-    <li><a href="https://omemo.top/">Other OMEMO ready clients</a>.</li>
+    <li><a href="https://omemo.top/">Other OMEMO-ready clients</a>.</li>
   </ul>
   <li><a href="https://www.kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
   <li><a href="https://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
   <li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
-  <li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. <span class="badge badge-success">VoIP</span></li>
-  <li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you full control over your communications and an unmatched level of privacy. Jami has <em>text messaging, video and audio calls, file transfer, video conferencing</em>. <span class="badge badge-success">VoIP</span></li>
+  <li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging, and video calling software. <span class="badge badge-success">VoIP</span></li>
+  <li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you full control over your communications and an unmatched level of privacy. Jami has text messaging, video and audio calls, file transfer, and video conferencing. <span class="badge badge-success">VoIP</span></li>
 </ul>
 
 
@@ -75,4 +81,3 @@ web=""
     <li><a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a></li>
   </ul>
 </ul>
-

_includes/sections/key-disclosure-law.html

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

_includes/sections/live-operating-systems.html

@@ -24,7 +24,7 @@ description=live_os_knoppix_descr
 badges="info:GNU/Linux"
 labels=live_os_knoppix_labels
 website="https://www.knopper.net/knoppix/index-en.html"
-source="https://www.knopper.net/knoppix-info/index-en.html"
+source="https://www.knopper.net/knoppix-info/index-en.html#license"
 %}
 
 {% include cardv2.html

_includes/sections/mobile-operating-systems.html

@@ -14,6 +14,7 @@
 {% include cardv2.html
 title="GrapheneOS"
 image="/assets/img/tools/GrapheneOS.png"
+image-dark="/assets/img/tools/GrapheneOS-dark.png"
 description=mobile_os_grapheneos_descr
 badges="info:AOSP"
 labels=mobile_os_grapheneos_labels

_includes/sections/notebooks.html

@@ -1,22 +1,24 @@
 <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, 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."
+description="Joplin is a free, open-source, and fully-featured note-taking and to-do application which can handle a large number of markdown notes organized into notebooks and tags. It offers end-to-end encryption and can sync through Nextcloud, Dropbox, and more. It also offers easy import from Evernote and plain-text notes."
 website="https://joplinapp.org/"
 github="https://github.com/laurent22/joplin"
-windows=""
-mac=""
-linux=""
-ios=""
-android=""
-firefox=""
-chrome=""
+windows="https://joplinapp.org/#desktop-applications"
+mac="https://joplinapp.org/#desktop-applications"
+linux="https://joplinapp.org/#desktop-applications"
+freebsd="https://www.npmjs.com/package/joplin"
+googleplay="https://joplinapp.org/images/BadgeAndroid.png"
+android="https://joplinapp.org/#mobile-applications"
+ios="https://itunes.apple.com/us/app/joplin/id1315599797"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/joplin-web-clipper/"
+chrome="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek"
 %}
 
 {% include cardv2.html
@@ -25,12 +27,13 @@ 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=""
-mac=""
-linux=""
-ios=""
-android=""
-web=""
+windows="https://standardnotes.org/#get-started"
+mac="https://standardnotes.org/#get-started"
+linux="https://standardnotes.org/#get-started"
+ios="https://itunes.apple.com/us/app/standard-notes/id1285392450"
+fdroid="https://f-droid.org/packages/com.standardnotes/"
+googleplay="https://play.google.com/store/apps/details?id=com.standardnotes"
+web="https://app.standardnotes.org/"
 %}
 
 {% include cardv2.html
@@ -39,10 +42,13 @@ 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=""
-mac=""
-linux=""
-android=""
+windows="https://turtlapp.com/download/"
+mac="https://turtlapp.com/download/"
+linux="https://turtlapp.com/download/"
+googleplay="https://play.google.com/store/apps/details?id=com.lyonbros.turtl"
+android="https://turtlapp.com/download/"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/turtl-bookmarking/"
+chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheihjadlpcml"
 %}
 
 <h3>Warning</h3>
@@ -55,6 +61,6 @@ android=""
 
 <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> - Open source and self-hosted solution. For PHP / MySQL servers.</li>
+  <li><a href="https://paperwork.cloud/">Paperwork</a> - An open-source and self-hosted solution. For PHP / MySQL servers.</li>
   <li><a href="https://orgmode.org">Org-mode</a> - A major mode for GNU Emacs. Org-mode is for keeping notes, maintaining TODO lists, planning projects, and authoring documents with a fast and effective plain-text system. </li>
 </ul>

_includes/sections/operating-systems.html

@@ -1,7 +1,7 @@
 <h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> {% t pc_os.pc_operating_systems %}</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>{% t pc_os.ms_apple_warning %}</strong>
+  <strong>{% t pc_os.ms_warning %}</strong>
 </div>
 
 {%- capture pc_os_contrib_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
@@ -36,21 +36,50 @@ image="/assets/img/tools/Debian.png"
 description=pc_os_debian_descr
 badges="info:GNU/Linux"
 website="https://www.debian.org/"
-git="https://salsa.debian.org/qa/debsources"
 tor="http://sejnfjrq6szgca7v.onion"
+gitlab="https://salsa.debian.org/qa/debsources"
 %}
 
-<h3>{% t pc_os.warning %}</h3>
-
-<ul>
-  <li><a href="#win10"><i class="fas fa-link"></i> {% t pc_os.win10_nightmare %}</a></li>
-</ul>
-
 <h3>{% t pc_os.worth_mentioning %}</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="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> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t pc_os.whonix_descr %}</li>
+  <li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> - {% t pc_os.whonix_descr %}</li>
+</ul>
+
+<h3>{% t pc_os.warning %}</h3>
+
+<ul>
+  <li><a href="#win10"><i class="fas fa-link"></i> {% t pc_os.win10_nightmare %}</a></li>
+</ul>
+
+<h4 id="cpuvulns">Remember to check CPU vulnerability mitigations</h4>
+
+<p><em><a href="https://support.microsoft.com/en-us/help/4073757/protect-windows-devices-from-speculative-execution-side-channel-attack">This also affects Windows 10</a>, but it doesn't expose this information or mitigation instructions as easily. MacOS users check <a href="https://support.apple.com/en-us/HT210108">How to enable full mitigation for Microarchitectural Data Sampling (MDS) vulnerabilities on Apple Support</a>.</em></p>
+
+<p>When running a enough recent Linux kernel, you can check the CPU vulnerabilities it detects by <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code>. By using <code>tail -n +1</code> instead of <code>cat</code>, the file names are also visible.</p>
+
+<p>
+    In case you have an Intel CPU, you may notice "SMT vulnerable" display after running the <code>tail</code> command. To mitigate this, disable <a href="https://en.wikipedia.org/wiki/Hyper-threading">hyper-threading</a> from the UEFI/BIOS. You can also take the following mitigation steps below if your system/distribution uses GRUB and supports <code>/etc/default/grub.d/</code>:
+</p>
+
+<ol>
+  <li><code>sudo mkdir /etc/default/grub.d/</code> to create a directory for additional grub configuration</li>
+  <li><code>echo GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT l1tf=full,force mds=full,nosmt mitigations=auto,nosmt nosmt=force" | sudo tee /etc/default/grub.d/mitigations.cfg</code> to create a new grub config file source with the echoed content</li>
+  <li><code>sudo grub-mkconfig -o /boot/grub/grub.cfg</code> to generate a new grub config file including these new kernel boot flags</li>
+  <li><code>sudo reboot</code> to reboot</li>
+  <li>after the reboot, check <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code> again to see that everything referring to SMT now says "SMT disabled."</li>
+</ol>
+
+<h5>Further reading</h5>
+
+<ul>
+  <li><a href="https://cpu.fail/">CPU.fail</a></li>
+  <li><a href="https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/">Hardware vulnerabilities index on The Linux kernel user's and administrator's guide</a></li>
+  <li><a href="https://www.cyberciti.biz/faq/install-update-intel-microcode-firmware-linux/">How to install/update CPU microcode firmware on Linux</a> - Regardless of your CPU manufacturer, you should always install the latest microcode packages available to be protected from CPU vulnerabilities, especially if the command above reports <strong>no microcode</strong> in its output.</li>
+  <li><a href="https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html">MDS - Microarchitectural Data Sampling on The Linux kernel user's and administrator's guide</a></li>
+  <li><a href="https://mdsattacks.com/">RIDL and Fallout: MDS attacks on mdsattacks.com</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Simultaneous_multithreading">Simultaneous multithreading on Wikipedia</a></li>
 </ul>

_includes/sections/participate.html

@@ -5,7 +5,7 @@
 <p>{% t participate.up_to_date %} {% t participate.software_updates %} {% t participate.follow_news %} {% t participate.keep_up %} {% t participate.find_an_issue %} <strong>{% t participate.talk_to_us %}</strong> {% t participate.find_us_on %} <a rel="me" href="https://social.privacytools.io/@privacytools">{% t participate.mastodon %}</a> {% t participate.or %} <a href="https://chat.privacytools.io">Matrix</a> {% t participate.at %} <code class="highlighter-rouge">#general:privacytools.io</code>.</p>
 
 {%- capture discourse -%}{% t participate.discourse %}{%- endcapture -%}
-{%- capture mastodon -%}{% t participate.follow %} Mastodon {% t participate.or %} Twitter{%- 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 -%}
@@ -33,7 +33,7 @@
 
   {% include card.html color="warning"
   title=github
-  image="/assets/img/icons/github.png"
+  font="fab fa-github"
   url="https://github.com/privacytoolsIO/privacytools.io"
   website="GitHub"
   description=github2

_includes/sections/password-managers.html

@@ -8,19 +8,24 @@
   include cardv2.html
   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."
+  description="<strong>Bitwarden</strong> is a free and open-source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
   website="https://bitwarden.com/"
   forum="https://forum.privacytools.io/t/discussion-bitwarden/1343"
   github="https://github.com/bitwarden"
   web="https://vault.bitwarden.com/#/"
-  linux="https://vault.bitwarden.com/download/?app=desktop&platform=linux"
-  mac="https://vault.bitwarden.com/download/?app=desktop&platform=macos"
+  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"
-  android="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
+  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"
 %}
 
@@ -32,29 +37,41 @@
   website="https://keepassxc.org/"
   forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
   github="https://github.com/keepassxreboot/keepassxc"
-  web="https://keepassxc.org/"
+  windows="https://keepassxc.org/download/#windows"
   linux="https://keepassxc.org/download/#linux"
   mac="https://keepassxc.org/download/#mac"
+  freebsd="https://www.freshports.org/security/keepassxc/"
+  openbsd="http://openports.se/security/keepassxc"
+  netbsd="http://pkgsrc.se/security/keepassxc"
+  fdroid="https://f-droid.org/packages/com.kunzisoft.keepass.libre/"
+  googleplay="https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free"
+  firefox="https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser"
+  chrome="https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk"
 %}
 
 {%
   include cardv2.html
   title="LessPass - Browser"
   image="/assets/img/tools/LessPass.png"
-  description="<strong>LessPass</strong> is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
+  description="<strong>LessPass</strong> is a free and open-source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
   website="https://lesspass.com/"
   forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
-  github="https://github.com/keepassxreboot/keepassxc"
+  github="https://github.com/lesspass/lesspass"
+  windows="https://pypi.org/project/lesspass/"
+  mac="https://pypi.org/project/lesspass/"
+  linux="https://pypi.org/project/lesspass/"
+  freebsd="https://pypi.org/project/lesspass/"
   firefox="https://addons.mozilla.org/en-US/firefox/addon/lesspass/"
   chrome="https://chrome.google.com/webstore/detail/lesspass/lcmbpoclaodbgkbjafnkbbinogcbnjih"
-  android="https://play.google.com/store/apps/details?id=com.lesspass.android&hl=en"
+  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> - 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.
+    <a href="https://masterpassword.app">Master Password</a> - A password manager based on an ingenious password-generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site, and your master password. No syncing, backups, or internet access needed.
   </li>
 
   <li>

_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 256bit AES. It is the improved version of ZeroBin."
-website="https://bin.privacytools.io/"
+description="PrivateBin is a minimalist, open-source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256-bit AES. It is the improved version of ZeroBin."
+website="https://privatebin.info/"
 forum="https://forum.privacytools.io/t/discussion-privatebin/296"
 github="https://github.com/PrivateBin/PrivateBin"
 %}
@@ -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, realtime collaborative editor. Data is encrypted/decrypted in the browser using 256bit AES."
+description="CryptPad is an open-source, zero knowledge, and real-time collaborative editor. Data is encrypted/decrypted in the browser, using Salsa20 with Poly1305 to encrypt pads."
 website="https://cryptpad.fr/pad/"
 forum="https://forum.privacytools.io/t/discussion-cryptpad/1270"
 github="https://github.com/xwiki-labs/cryptpad"

_includes/sections/privacy-resources.html

@@ -16,7 +16,7 @@
 <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.erfahrungen.com/mit/anonymisierung/t/"><strong>{% t privacy_resources.info6 %}</strong></a> - {% t privacy_resources.info6_d %}</li>
-  <li><a href="https://keybase.io/"><strong>{% t privacy_resources.info4 %}</strong></a> - {% t privacy_resources.info4_d %}</li>
+  <li><a href="https://openwireless.org/"><strong>{% t privacy_resources.info4 %}</strong></a> - {% t privacy_resources.info4_d %}</li>
   <li><a href="https://privacy.net/us-government-surveillance-spying-data"><strong>{% t privacy_resources.info8 %}</strong></a> - {% t privacy_resources.info8_d %}</li>
   <li><a href="https://www.reddit.com/r/privacytoolsIO/wiki/index"><strong>{% t privacy_resources.info1 %}</strong></a> - {% t privacy_resources.info1_d %}</li>
   <li><a href="https://www.grc.com/securitynow.htm"><strong>{% t privacy_resources.info2 %}</strong></a> - {% t privacy_resources.info2_d %}</li>

_includes/sections/productivity-tools.html

@@ -1,43 +1,85 @@
 <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"
-    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"
+{%
+  include cardv2.html
   title="Etherpad"
   image="/assets/img/tools/Etherpad.png"
-  url="https://etherpad.org/"
-  footer="OS: Windows, macOS, Linux."
-  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>"
-  %}
+  image-dark="/assets/img/tools/Etherpad-dark.png"
+  description="<strong>Etherpad</strong> is a highly customizable open-source online editor providing collaborative editing in real time. <a href=https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad>Here are a list of sites that run Etherpad</a>."
+  website="https://etherpad.org/"
+  forum="https://forum.privacytools.io/t/discussion-etherpad-productivity-tools/1538"
+  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"
-  url="https://write.as/"
+  image-dark="/assets/img/tools/WriteAs-dark.png"
+  description="<strong>Write.as</strong> is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model."
+  website="https://write.as/"
+  forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539"
   tor="http://writeas7pm7rcdqg.onion"
-  footer="OS: Windows, macOS, Linux, Android, iOS, Chrome OS, Web."
-  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."
-  %}
-
-</div>
+  git="https://code.as/writeas"
+  web="https://write.as/pad"
+  windows="https://github.com/writeas/writeas-cli"
+  mac="https://github.com/writeas/writeas-cli"
+  linux="https://write.as/apps"
+  chrome="https://write.as/apps"
+  googleplay="https://play.google.com/store/apps/details?id=com.abunchtell.writeas"
+  ios="https://itunes.apple.com/app/apple-store/id1000755153"
+%}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
   <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
   <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
-  <li><a href="https://disroot.org/">disroot.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, 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://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://disroot.org/">Disroot</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
+  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open-source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
+  <li><a href="https://framadate.org/">Framadate</a> - A free and open-source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
+  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open-source office suite.</li>
+  <li><a href="https://vscodium.com/">VSCodium</a> - 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/router-firmware.html

@@ -15,7 +15,6 @@ badges="info:Linux"
 labels=router_openwrt_labels
 website="https://openwrt.org/"
 git="https://git.openwrt.org/"
-github="https://github.com/openwrt"
 %}
 
 {% include cardv2.html
@@ -41,5 +40,5 @@ git="https://gogs.librecmc.org/libreCMC/libreCMC"
 
 <ul>
   <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - {% t router.openbsd_descr %}</li>
-  <li><a href="https://dd-wrt.com/">DD-WRT</a>  <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t router.ddwrt_descr %}</li>
+  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t router.ddwrt_descr %}</li>
 </ul>

_includes/sections/search-engines.html

@@ -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"
-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>'
+description='searx is an <a href="https://github.com/asciimoo/searx">open-source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">List of Instances</a> or try <a href="https://search.privacytools.io/">search.privacytools.io</a>'
 website="https://searx.me/"
 tor="http://ulrn6sryqaifefld.onion"
 forum="https://forum.privacytools.io/t/discussion-searx/283"
@@ -17,7 +17,7 @@ github="https://github.com/asciimoo/searx"
 {% include cardv2.html
 title="StartPage - Netherlands"
 image="/assets/img/provider/StartPage.png"
-description="Google search results, with complete privacy protection. Behind StartPage is a European company that has been obsessive about privacy since 2006."
+description="StartPage is a search engine that provides Google search results with complete privacy protection. Behind StartPage is a European company that has been obsessive about privacy since 2006."
 website="https://www.startpage.com/"
 forum="https://forum.privacytools.io/t/discussion-startpage/284"
 %}
@@ -25,7 +25,7 @@ forum="https://forum.privacytools.io/t/discussion-startpage/284"
 {% include cardv2.html
 title="DuckDuckGo - USA"
 image="/assets/img/provider/DuckDuckGo.png"
-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>'
+description='DuckDuckGo is a "search engine that doesn\'t track you." Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="../../providers/#ukusa">The company is based in the USA.</a>'
 website="https://duckduckgo.com/"
 tor="http://3g2upl4pq6kufc4m.onion"
 forum="https://forum.privacytools.io/t/discussion-duckduckgo/285"
@@ -35,7 +35,7 @@ github="https://github.com/duckduckgo"
 {% include cardv2.html
 title="Qwant - France"
 image="/assets/img/provider/Qwant.png"
-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>'
+description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013.'
 website="https://www.qwant.com/"
 forum="https://forum.privacytools.io/t/discussion-qwant/286"
 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://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://yacy.net/">YaCy</a> - A free-software P2P search engine powered by its users.</a></li>
+  <li><a href="https://jivesearch.com/">Jive Search</a> - A free-software search engine with a similar look and feel to Google.</a></li>
+  <li><a href="https://metager.de/en/">MetaGer</a> - An open-source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>
   <li><a href="https://www.mojeek.com/">Mojeek</a> - Independent and unbiased search results with no user tracking.</li>
 </ul>

_includes/sections/self-contained-networks.html

@@ -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,9 +45,14 @@
 <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://retroshare.cc/">RetroShare</a> - Open Source cross-platform, Friend-2-Friend and secure decentralized communication platform.</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://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> - 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>
-  <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>
+  <li><a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). <a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">
+    <span class="badge badge-danger" data-toggle="tooltip" title="">
+    <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,37 +4,39 @@
   <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>
 
-<div class="row mb-2">
+{% include cardv2.html
+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 card.html color="success"
-  title="Pydio"
-  image="/assets/img/tools/Pydio.png"
-  url="https://pydio.com/"
-  footer="OS: Windows, macOS, Linux, iOS, Android."
-  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
-  to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs."
-  %}
-
-  {% include card.html color="primary"
-  title="Tahoe-LAFS"
-  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>
+{% include cardv2.html
+title="Tahoe-LAFS"
+image="/assets/img/tools/Tahoe-LAFS.png"
+image-dark="/assets/img/tools/Tahoe-LAFS-dark.png"
+website="https://www.tahoe-lafs.org/"
+forum="https://forum.privacytools.io/t/discussion-tahoe-lafs/1662"
+description="Tahoe-LAFS is a free and open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
+windows="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+mac="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+linux="https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages"
+netbsd="http://pkgsrc.se/filesystems/tahoe-lafs"
+git="https://www.tahoe-lafs.org/trac/tahoe-lafs/browser"
+%}
 
 <h3>Worth Mentioning</h3>
 <ul>
-  <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - End-to-end encrypted real time collaboration sharing folders, media, and documents (open-source).</li>
+  <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - An open-source and end-to-end encrypted real-time collaborative editor that lets you share folders, media, and documents.</li>
 </ul>

_includes/sections/social-networks.html

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

_includes/sections/social-news-aggregator.html

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

_includes/sections/teamchat.html

@@ -1,38 +1,62 @@
 <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://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>
+        <strong>If your project or organization currently uses a platform like <a href="https://tosdr.org/#discord">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
 </div>
 
-{% include cardv2.html
-title="Rocket.chat"
-image="/assets/img/tools/rocket.chat.png"
-description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
-labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental</a>:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. The federation was also added afterwards potentially causing room for mistakes."
-website="https://rocket.chat/"
-forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
-github="https://github.com/rocketchat/"
-android=""
-ios=""
-mac=""
-windows=""
-linux=""
+{%
+  include cardv2.html
+  title="Riot.im (Matrix)"
+  image="/assets/img/tools/Riot.png"
+  description="Riot.im is a federated free-software messaging application based on the <a href\"https://matrix.org/\">Matrix</a> protocol, a recent open protocol for real-time communication offering optional E2E encryption. It also has bridging functionality, allowing you to connect to other chat protocols such as IRC or Telegram."
+  labels="warning:<a href=//github.com/vector-im/riot-web/issues/6779>Experimental E2EE</a>:The end-to-end encryption is currently in beta, and the mobile client states 'End-to-end encryption is in beta and may not be reliable. You should not yet trust it to secure data.'"
+  website="https://about.riot.im/"
+  forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
+  github="https://github.com/vector-im/riot-web/"
+  windows="https://riot.im/download/desktop/"
+  mac="https://riot.im/download/desktop/"
+  linux="https://riot.im/download/desktop/"
+  fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
+  googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
+  ios="https://itunes.apple.com/us/app/vector.im/id1083446067"
+  web="https://riot.im/app/"
 %}
 
-{% 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"
-github="https://github.com/Keybase"
-android=""
-ios=""
-mac=""
-windows=""
-linux=""
-web=""
+{%
+  include cardv2.html
+  title="Rocket.chat"
+  image="/assets/img/tools/rocket.chat.png"
+  description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
+  labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental E2EE</a>:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. Federation was also added afterwards, potentially causing room for mistakes."
+  website="https://rocket.chat/"
+  forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
+  github="https://github.com/rocketchat/"
+  windows="https://rocket.chat/install"
+  mac="https://itunes.apple.com/us/app/rocket-chat/id1086818840"
+  linux="https://rocket.chat/install"
+  fdroid="https://f-droid.org/packages/chat.rocket.android"
+  googleplay="https://play.google.com/store/apps/details?id=chat.rocket.android"
+  ios="https://itunes.apple.com/app/rocket-chat/id1148741252"
+%}
+
+{%
+  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,33 +8,35 @@
 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"
-ios=""
-android=""
-windows=""
-linux=""
-mac=""
-web=""
+windows="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+linux="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+mac="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+fdroid="https://f-droid.org/packages/org.linphone"
+googleplay="https://play.google.com/store/apps/details?id=org.linphone"
+ios="https://itunes.apple.com/us/app/linphone/id360065638?mt=8"
 %}
 
 {% include cardv2.html
 title="Mumble"
 image="/assets/img/tools/Mumble.png"
 website="https://mumble.info/"
-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."
+description="Mumble is an open-source, low-latency, and high quality voice chat application primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, <a href=\"https://github.com/mumble-voip/mumble/issues/1813\">it's missing end-to-end encryption</a>, so self-hosting is recommended."
 forum="https://forum.privacytools.io/t/discussion-mumble/1289"
 github="https://github.com/mumble-voip/"
-windows=""
-linux=""
-mac=""
+windows="https://www.mumble.info/downloads"
+linux="https://www.mumble.info/downloads"
+mac="https://www.mumble.info/downloads"
+android="https://www.mumble.info/downloads/#third-party-clients"
+ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1"
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <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>
+  <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>
 </ul>
 
 <h3>Related Information</h3>

_includes/sections/vpn.html

@@ -12,11 +12,11 @@
     </div>
     <div class="col">
     <h2>Mullvad <span class="badge badge-info">EUR €60/Year</span></h2>
-    <p><strong>Mullvad</strong> is a fast and inexpensive VPN with a serious focus on transparency and security, they have been in operation since <strong>2009</strong>. It is the only VPN provider that currently meets our criteria for recommendation. Mullvad is based in <span class="flag-icon flag-icon-se"></span> Sweden and does not have a free trial. Visit <a href="https://mullvad.net/">mullvad.net</a> to create an account.</p>
-    <h5><span class="badge badge-success">409+ Servers</span></h5>
-    <p>Mullvad has 409 servers in 38 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</p>
+    <p><strong>Mullvad</strong> is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since <strong>2009</strong>. It is the only VPN provider that currently meets our criteria for recommendation. Mullvad is based in <span class="flag-icon flag-icon-se"></span> Sweden and does not have a free trial. Visit <a href="https://mullvad.net/">mullvad.net</a> to create an account.</p>
+    <h5><span class="badge badge-success">406+ Servers</span></h5>
+    <p>Mullvad has 409 servers in 39 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</p>
     <h5><span class="badge badge-success">WireGuard Support</span></h5>
-    <p>In addition to standard OpenVPN connections, Mullvad supports Wireguard. Wireguard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.</p>
+    <p>In addition to standard OpenVPN connections, Mullvad supports WireGuard. WireGuard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.</p>
     <h5><span class="badge badge-success">Independently Audited</span></h5>
     <p>Mullvad's VPN clients have been audited by Cure53 and Assured AB in a pentest report <a href="https://cure53.de/pentest-report_mullvad_v2.pdf">published at cure53.de</a>. The security researchers concluded:</p>
     <blockquote class="blockquote">
@@ -55,10 +55,10 @@
       <footer class="blockquote-footer">Marc Loebekken, ProtonVPN AG Legal counsel</footer>
     </blockquote>
     <p>We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner.
-    <h5><span class="badge badge-success">442+ Servers</span></h5>
-    <p>ProtonVPN has 442 servers in 33 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</p>
+    <h5><span class="badge badge-success">526+ Servers</span></h5>
+    <p>ProtonVPN has 526 servers in 42 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</p>
     <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
-    <p>ProtonVPN does technically accept Bitcoin payments, however you either need to have an existing account, or contact their support team in advance to register with Bitcoin.</p>
+    <p>ProtonVPN does technically accept Bitcoin payments; however, you either need to have an existing account, or contact their support team in advance to register with Bitcoin.</p>
     <h5><span class="badge badge-success">Mobile Clients</span></h5>
     <p>In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for iOS or Android allowing for easy connections to their servers.</p>
     <h5><span class="badge badge-info">Extra Functionality</span></h5>
@@ -72,12 +72,12 @@
     </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>
+    <p><strong>IVPN</strong> is another strong premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar and offers a 3 day free trial. Unfortunately, due to its lack of an independent security audit, it does not meet the complete criteria for recommendation, see our notes below.</p>
     <h5><span class="badge badge-danger">No Security Audit</span></h5>
     <p>IVPN has undergone a <a href="https://cure53.de/audit-report_ivpn.pdf">no-logging audit from Cure53</a> which concluded in agreement with IVPN's no-logging claim. However, IVPN has not undergone a more comprehensive security audit by an independent third party, and therefore cannot be strongly recommended at this time. We have still chosen to list it on this page with the assumption that an audit will be published soon: The IVPN team <a href="https://twitter.com/yaelwrites/status/1161796418220089344">reportedly plans to begin the process in September</a>.</p>
     <p>We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner.
-    <h5><span class="badge badge-success">70+ Servers</span></h5>
-    <p>IVPN has 70 servers in 29 countries at the time of writing this page. Typically the more servers a provider offers, the better. IVPN has a decent (but not exceptional) server count that will most likely provide adequate coverage to most users.</p>
+    <h5><span class="badge badge-success">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>

_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" alt="Warrant Canary Example" style="margin-left:20px;">
+<img src="/assets/img/layout/warrant-canary.jpg" width="450" height="236" class="img-fluid float-right ml-3" alt="Warrant Canary Example">
 
 <p>A warrant canary is a posted document stating that an organization has not received any secret subpoenas during a specific period of time. If this document fails to be updated during the specified time then the user is to assume that the service has received such a subpoena and should stop using the service.</p>
 

_includes/sections/windows10.html

@@ -4,7 +4,7 @@
   <strong>{% t windows_10.warning %}</strong>
 </div>
 
-<img src="/assets/img/layout/Windows-10-Privacy.png" width="367" height="369" class="img-fluid float-right" alt="{% t windows_10.alt %}" style="margin-left:10px;">
+<img src="/assets/img/layout/Windows-10-Privacy.png" width="367" height="369" class="img-fluid float-right ml-3" alt="{% t windows_10.alt %}">
 
 <ol>
   <li><strong>{% t windows_10.data %}</strong>
@@ -80,7 +80,7 @@
 <h3>{% t global.related_information %}</h3>
 
 <ul>
-  <li><a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement</a> - Microsoft collects, uses and discloses personal information as described here. This allows One Drive 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 OneDrive data, Cortana searches, and MS browser history to be sold to third parties.</li>
   <li><a href="https://support.microsoft.com/en-us/help/4468233/cortana-and-privacy-microsoft-privacy">Cortana and privacy</a> - To personalize your experience and provide the best possible suggestions, Cortana accesses your email and other communications and collects data about your contacts (People), like their title, suffix, first name, last name, middle name, nicknames, and company name. If you call, email, or text someone or they call, email, or text you, Cortana collects that person’s email address or phone number.</li>
 </ul>
 
@@ -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,6 +2,7 @@
 <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>

_sass/_vars.scss

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

_sass/ptio-font.scss

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

about/javascript/index.html

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

assets/css/dark.scss

@@ -0,0 +1,192 @@
+---
+---
+@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,6 +5,7 @@
 @import 'bootstrap';
 @import 'flag-icon';
 @import 'fontawesome';
+@import 'ptio-font';
 @import 'sortable-theme-bootstrap';
 
 body {
@@ -126,6 +127,10 @@ h2, h3:not(.h5), h4, h5 {
   font-size: 5.5em;
 }
 
+.panel-font {
+  font-size: 120px;
+}
+
 .share-btn {
   border: 0;
   box-shadow: $share-btn-shadow;
@@ -157,7 +162,7 @@ h2, h3:not(.h5), h4, h5 {
 .twitter { background: $twitter; }
 .mastodon { background: $mastodon; }
 .facebook { background: $facebook; }
-.stumbleupon { background: $stumbleupon; }
+.mix { background: $mix; }
 .reddit { background: $reddit; }
 .linkedin    { background: $linkedin; }
 .email { background: $email; }
@@ -177,6 +182,10 @@ h2, h3:not(.h5), h4, h5 {
   text-align: justify;
 }
 
+.no-text-wrap {
+  white-space: nowrap;
+}
+
 footer {
   img,
   i {
@@ -184,6 +193,16 @@ footer {
   }
 }
 
+.hover-text-decoration-none:hover {
+  text-decoration: none;
+  -webkit-text-decoration-skip: object;
+}
+
+.table td, .table th {
+  vertical-align: middle;
+}
+
+
 /*
  * Navbar
  */
@@ -272,8 +291,16 @@ input#nav-toggle,
   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 */
+/*
+ * Mobile hamburger menu
+ */
 
 @media only screen and (max-width: 992px) {
   .menu,
@@ -335,3 +362,9 @@ input#nav-toggle,
     max-height: 8em;
   }
 }
+
+.nav-theme-icon:before {
+  color: var(--warning);
+  font-size: 0.875em;
+  content: "\f186";
+}

assets/js/applytheme.js

@@ -0,0 +1,6 @@
+if (localStorage.getItem("colorScheme") === "dark") {
+  document.querySelector("#dark-css").removeAttribute("media"); // Set dark theme
+}
+else if (localStorage.getItem("colorScheme") === "light") {
+  document.querySelector("#dark-css").setAttribute("media", "invalid"); // Set light theme
+}

assets/js/main.js

@@ -1,6 +1,10 @@
 $(function() {
   $("[data-toggle='tooltip']").tooltip();
 });
+document.querySelectorAll(".onclick-select").forEach(element => {
+  element.addEventListener("click", element.select);
+});
+
 
 // Navbar dropdowns
 const navSections = document.querySelectorAll(".nav-details");
@@ -27,6 +31,67 @@ function navSectionsClose(event) {
   });
 }
 
+
+// Dark/Light color scheme switch button
+document.querySelector("#nav-switch-theme").style.display = "inline";
+document.querySelector("#nav-switch-theme").addEventListener("click", changeColorScheme);
+
+function changeColorScheme() {
+  // Use whatever users want
+  if (localStorage.getItem("colorScheme") === "dark") {
+    // Change to light theme
+    if (window.matchMedia("(prefers-color-scheme: dark)").matches === false) {
+      document.querySelector("#dark-css").setAttribute("media", "(prefers-color-scheme: dark)");
+      localStorage.removeItem("colorScheme");
+    } else {
+      // by setting invalid media it will just not apply CSS for anyone
+      document.querySelector("#dark-css").setAttribute("media", "invalid");
+      localStorage.setItem("colorScheme", "light");
+    }
+  }
+  // Change to dark theme
+  else if (localStorage.getItem("colorScheme") === "light") {
+    if (window.matchMedia("(prefers-color-scheme: dark)").matches === true) {
+      document.querySelector("#dark-css").setAttribute("media", "(prefers-color-scheme: dark)");
+      localStorage.removeItem("colorScheme");
+    } else {
+      // media was set to prefers-color-scheme: dark
+      document.querySelector("#dark-css").removeAttribute("media");
+      localStorage.setItem("colorScheme", "dark");
+    }
+  }
+
+  // Just use whatever browsers want
+  else if (window.matchMedia("(prefers-color-scheme: dark)").matches === true) {
+    // Change to light Theme
+    document.querySelector("#dark-css").setAttribute("media", "invalid");
+    localStorage.setItem("colorScheme", "light");
+  } else {
+    // Change to dark theme
+    document.querySelector("#dark-css").removeAttribute("media");
+    localStorage.setItem("colorScheme", "dark");
+  }
+  fixThemeImages();
+}
+
+
+// Fix images in dark theme
+function fixThemeImages() {
+  document.querySelectorAll('[data-theme-src]').forEach(function(image) {
+    tempSrc = image.src;
+    image.src = image.getAttribute("data-theme-src");
+    image.setAttribute("data-theme-src", tempSrc);
+  });
+}
+if (
+  (localStorage.getItem("colorScheme") === "dark") ||
+  (window.matchMedia("(prefers-color-scheme: dark)").matches ^
+    localStorage.getItem("colorScheme") === "light")
+) {
+  fixThemeImages();
+}
+
+
 // Matomo
 var _paq = window._paq || [];
 /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -36,6 +101,7 @@ _paq.push(["enableLinkTracking"]);
   var u = "https://stats.privacytools.io/";
   _paq.push(["setTrackerUrl", u + "matomo.php"]);
   _paq.push(["setSiteId", "1"]);
+  _paq.push(['setSecureCookie', true]);
   var d = document,
     g = d.createElement("script"),
     s = d.getElementsByTagName("script")[0];

assets/webfonts/ptio-font-preview.html

@@ -0,0 +1,324 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>ptio-font glyphs preview</title>
+
+    <style>
+      /* Page Styles */
+
+      * {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        margin: 0;
+        padding: 0;
+      }
+
+      body {
+        background: #fff;
+        color: #444;
+        font: 16px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
+      }
+
+      a,
+      a:visited {
+        color: #888;
+        text-decoration: underline;
+      }
+      a:hover,
+      a:focus { color: #000; }
+
+      header {
+        border-bottom: 2px solid #ddd;
+        margin-bottom: 20px;
+        overflow: hidden;
+        padding: 20px 0;
+      }
+
+      header h1 {
+        color: #888;
+        float: left;
+        font-size: 36px;
+        font-weight: 300;
+      }
+
+      header a {
+        float: right;
+        font-size: 14px;
+      }
+
+      .container {
+        margin: 0 auto;
+        max-width: 1200px;
+        min-width: 960px;
+        padding: 0 40px;
+        width: 90%;
+      }
+
+      .glyph {
+        border-bottom: 1px dotted #ccc;
+        padding: 10px 0 20px;
+        margin-bottom: 20px;
+      }
+
+      .preview-glyphs { vertical-align: bottom; }
+
+      .preview-scale {
+        color: #888;
+        font-size: 12px;
+        margin-top: 5px;
+      }
+
+      .step {
+        display: inline-block;
+        line-height: 1;
+        position: relative;
+        width: 10%;
+      }
+
+      .step .letters,
+      .step i {
+        -webkit-transition: opacity .3s;
+        -moz-transition: opacity .3s;
+        -ms-transition: opacity .3s;
+        -o-transition: opacity .3s;
+        transition: opacity .3s;
+      }
+
+      .step:hover .letters { opacity: 1; }
+      .step:hover i { opacity: .3; }
+
+      .letters {
+        opacity: .3;
+        position: absolute;
+      }
+
+      .characters-off .letters { display: none; }
+      .characters-off .step:hover i { opacity: 1; }
+
+      
+      .size-12 { font-size: 12px; }
+      
+      .size-14 { font-size: 14px; }
+      
+      .size-16 { font-size: 16px; }
+      
+      .size-18 { font-size: 18px; }
+      
+      .size-21 { font-size: 21px; }
+      
+      .size-24 { font-size: 24px; }
+      
+      .size-36 { font-size: 36px; }
+      
+      .size-48 { font-size: 48px; }
+      
+      .size-60 { font-size: 60px; }
+      
+      .size-72 { font-size: 72px; }
+      
+
+      .usage { margin-top: 10px; }
+
+      .usage input {
+        font-family: monospace;
+        margin-right: 3px;
+        padding: 2px 5px;
+        text-align: center;
+      }
+
+      .usage .point { width: 150px; }
+
+      .usage .class { width: 250px; }
+
+      footer {
+        color: #888;
+        font-size: 12px;
+        padding: 20px 0;
+      }
+
+      /* Icon Font: ptio-font */
+
+      @font-face {
+  font-family: "ptio-font";
+  src: url("./ptio-font.eot");
+  src: url("./ptio-font.eot?#iefix") format("embedded-opentype"),
+       url("./ptio-font.woff2") format("woff2"),
+       url("./ptio-font.woff") format("woff"),
+       url("./ptio-font.ttf") format("truetype"),
+       url("./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("./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"; }
+    </style>
+
+    <!--[if lte IE 8]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+    <script>
+      function toggleCharacters() {
+        var body = document.getElementsByTagName('body')[0];
+        body.className = body.className === 'characters-off' ? '' : 'characters-off';
+      }
+    </script>
+  </head>
+
+  <body class="characters-off">
+    <div id="page" class="container">
+      <header>
+        <h1>ptio-font contains 8 glyphs:</h1>
+        <a onclick="toggleCharacters(); return false;" href="#">Toggle Preview Characters</a>
+      </header>
+
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-f-droid" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf100;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-ios" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf101;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-linux" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf102;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-macos" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf103;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-mix" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf107;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-netbsd" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf104;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-openbsd" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf105;" />
+        </div>
+      </div>
+      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-sailfish-os" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf106;" />
+        </div>
+      </div>
+      
+
+      <footer>
+        Made with love using <a href="http://fontcustom.com">Font Custom</a>.
+      </footer>
+    </div>
+  </body>
+</html>

assets/webfonts/ptio-font.svg

@@ -0,0 +1,151 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2019-9-22: Created with FontForge (http://fontforge.org)
+-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<metadata>
+Created by FontForge 20190801 at Sun Sep 22 19:49:38 2019
+ By Dawid Potocki
+
+</metadata>
+<defs>
+<font id="ptio-font" horiz-adv-x="512" >
+  <font-face 
+    font-family="ptio-font"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="512"
+    panose-1="2 0 5 3 0 0 0 0 0 0"
+    ascent="448"
+    descent="-64"
+    bbox="-0.00195312 -64.0039 512.014 448"
+    underline-thickness="25.6"
+    underline-position="-51.2"
+    unicode-range="U+0020-F107"
+  />
+    <missing-glyph />
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
+ />
+    <glyph glyph-name="f-droid" unicode="&#xf100;" 
+d="M14.5039 444.762v0.00683594c3.76562 -0.101562 8.65625 -2.63086 10.915 -5.64551l38.6768 -50.0527c3.51758 1.23047 7.30176 1.90137 11.25 1.90137h361.307c3.94727 0 7.73145 -0.670898 11.248 -1.90137l38.6758 50.0498
+c2.25879 3.01465 7.14941 5.54297 10.915 5.64453c0.107422 0.00292969 0.282227 0.00585938 0.390625 0.00585938c7.79102 0 14.1143 -6.32422 14.1143 -14.1152c0 -2.72754 -1.37988 -6.6709 -3.08008 -8.80273l-40.6318 -52.582
+c1.44629 -3.77539 2.24121 -7.87891 2.24121 -12.1748v-79.0352c0 -18.7656 -15.1074 -33.873 -33.873 -33.873h-361.307c-18.7656 0 -33.8721 15.1074 -33.8721 33.873v79.0352c0 4.29492 0.793945 8.39648 2.23926 12.1709l-40.6318 52.583
+c-1.70117 2.13184 -3.08105 6.0752 -3.08105 8.80273c0 7.79102 6.32324 14.1143 14.1152 14.1143c0.107422 0 0.28125 -0.00195312 0.388672 -0.00488281zM147.324 348.627v0c-21.0352 0 -38.1064 -17.0713 -38.1064 -38.1064v0
+c0 -21.0352 17.0713 -38.1064 38.1064 -38.1064v0c21.0352 0 38.1064 17.0713 38.1064 38.1064v0c0 21.0352 -17.0713 38.1064 -38.1064 38.1064zM367.497 348.627c-21.0342 0 -38.1055 -17.0713 -38.1055 -38.1064v0c0 -21.0352 17.0713 -38.1064 38.1055 -38.1064
+h0.000976562c21.0352 0 38.1064 17.0713 38.1064 38.1064v0c0 21.0352 -17.0723 38.1064 -38.1064 38.1064h-0.000976562zM75.3438 232.938h361.301c18.7646 0 33.8721 -15.1074 33.8721 -33.873v-225.816c0 -18.7656 -15.1064 -33.873 -33.8721 -33.873h-361.301
+c-18.7656 0 -33.8721 15.1074 -33.8721 33.873v225.816c0 18.7656 15.1064 33.873 33.8721 33.873zM255.998 204.71c-65.3486 0 -118.553 -53.2041 -118.553 -118.553c0 -65.3477 53.2041 -118.553 118.553 -118.553c65.3477 0 118.552 53.2051 118.552 118.553
+c0 65.3486 -53.2041 118.553 -118.552 118.553zM255.998 183.253c53.7549 0 97.0977 -43.3428 97.0977 -97.0977s-43.3428 -97.0977 -97.0977 -97.0977c-53.7559 0 -97.0977 43.3428 -97.0977 97.0977s43.3418 97.0977 97.0977 97.0977zM255.998 156.724
+l-0.00292969 -0.00195312c-32.5244 0 -60.0645 -22.4082 -68.1191 -52.5068h36.2764c6.25879 11.125 18.0098 18.6348 31.8438 18.6348c20.4668 0 36.6953 -16.2285 36.6953 -36.6953s-16.2285 -36.6953 -36.6953 -36.6953c-14.7617 0 -27.2246 8.49902 -33.0781 20.8838
+h-35.6152c7.25195 -31.2285 35.3633 -54.7568 68.6953 -54.7568c38.7725 0 70.5684 31.7949 70.5684 70.5693c0 38.7734 -31.7959 70.5684 -70.5684 70.5684z" />
+    <glyph glyph-name="ios" unicode="&#xf101;" 
+d="M125.831 448h260.341c69.7109 0 125.831 -56.1201 125.831 -125.831v-260.341c0 -69.7109 -56.1201 -125.831 -125.831 -125.831h-260.341c-69.7109 0 -125.831 56.1201 -125.831 125.831v260.341c0 69.7109 56.1201 125.831 125.831 125.831zM59.2627 96.6289h32.8428
+v139.813h-32.8428v-139.813zM75.6191 254.78c10.2881 0 18.334 7.91406 18.334 17.8066c0 10.0244 -8.0459 17.9385 -18.334 17.9385c-10.1572 0 -18.2021 -7.91406 -18.2021 -17.9385c0 -9.89355 8.0459 -17.8066 18.2021 -17.8066zM201.456 290.132
+c-55.5283 0 -90.3516 -37.8545 -90.3516 -98.4004s34.8174 -98.2686 90.3516 -98.2686c55.3975 0 90.2197 37.7227 90.2197 98.2686s-34.8174 98.4004 -90.2197 98.4004zM201.456 261.111c33.9004 0 55.5283 -26.9062 55.5283 -69.3799
+c0 -42.3398 -21.6309 -69.249 -55.5283 -69.249c-34.0312 0 -55.5283 26.9062 -55.5283 69.249c0 42.4746 21.5 69.3799 55.5283 69.3799zM305.53 150.183c1.45117 -35.0879 30.2061 -56.7168 73.9971 -56.7168c46.0342 0 75.0547 22.6865 75.0547 58.8281
+c0 28.3584 -16.3564 44.3203 -55.0029 53.1543l-21.8955 5.0127c-23.3467 5.54004 -32.9775 12.9268 -32.9775 25.5898c0 15.8281 14.5098 26.3789 36.0088 26.3789c21.7637 0 36.6689 -10.6846 38.251 -28.4893h32.4492
+c-0.791992 33.5029 -28.4883 56.1914 -70.4346 56.1914c-41.4199 0 -70.834 -22.8184 -70.834 -56.585c0 -27.1699 16.6191 -44.0576 51.7051 -52.1006l24.666 -5.80371c24.0049 -5.67188 33.7686 -13.5859 33.7686 -27.3027c0 -15.8281 -15.96 -27.1699 -38.9092 -27.1699
+c-23.2129 0 -40.7568 11.4756 -42.8652 29.0205h-32.9775z" />
+    <glyph glyph-name="linux" unicode="&#xf102;" 
+d="M451.886 44.2285l-0.000976562 0.00292969c11.0996 -12.3984 15.8984 -21.4971 15.499 -29.6963c-0.5 -8.2002 -6.49902 -13.7998 -13.8994 -18.2988c-14.8994 -8.99902 -37.2979 -15.7988 -50.8965 -32.1973c-14.2002 -16.8984 -31.6992 -26.5977 -48.2969 -27.8975
+c-16.5 -1.30078 -31.998 6.29883 -40.2979 22.998v0.0996094c-1.09961 2.09961 -1.89941 4.39941 -2.49902 6.69922c-21.498 -1.19922 -40.1963 5.2998 -55.0947 4.09961c-21.999 -1.19922 -35.7979 -6.49902 -48.2969 -6.59863
+c-4.7998 -10.5996 -14.2988 -17.5986 -25.8984 -20.1992c-15.9971 -3.69922 -36.0957 0 -55.8936 10.3994c-18.4971 9.79883 -41.9961 8.89941 -59.2949 12.499c-8.69922 1.7998 -16.2979 4.99902 -20.0977 12.2988c-3.7002 7.29883 -3 17.2979 2.19922 31.6973
+c1.7002 5.09961 0.400391 12.6992 -0.799805 20.7979c-0.599609 3.90039 -1.2002 7.89941 -1.2002 11.7998c0 4.29883 0.700195 8.49902 2.7998 12.3984c4.5 8.5 11.7998 12.0986 18.499 14.499s12.7988 4 16.999 8.2998c5.19922 5.49902 10.0986 14.3984 16.5977 20.1982
+c-2.59961 17.1963 0.200195 35.3955 6.2002 53.2939c12.5967 37.8975 39.1953 74.1934 58.0938 96.6914c16.0986 22.8975 20.7988 41.2959 22.498 64.6943c1.10059 31.7969 -24.4971 135.389 77.8945 135.188c80.8936 -0.0996094 76.2949 -85.3916 75.7949 -131.288
+c-0.300781 -30.0977 16.2979 -50.4961 33.3965 -71.9951c15.2002 -18 35.0986 -44.2969 46.4971 -74.3936c9.2998 -24.6006 12.8994 -51.7969 3.7002 -79.0947c1.39941 -0.5 2.7998 -1.2002 4.09961 -2c1.39941 -0.799805 2.7002 -1.7998 4 -2.89941
+c6.59863 -5.59961 8.69922 -14.2988 10.499 -22.3984c1.89941 -8.09863 3.59961 -15.6982 7.19922 -19.6982zM255.603 360.714h0.000976562c-3.19922 -7.19922 -3.89941 -14.8984 -2.89941 -21.7979c3.59961 -0.900391 8.89941 -2.40039 12.999 -4.39941
+c-2.09961 12.1982 4.49902 23.498 11.7988 22.998c8.89941 -0.300781 13.8984 -15.499 9.09961 -27.2979c-0.800781 -1.90039 -2.7998 -3.40039 -3.90039 -4.59961c6.69922 -2.30078 10.999 -4.10059 12.5986 -4.90039c7.90039 9.5 10.7998 26.1982 4.2998 40.3975
+c-9.7998 21.3984 -34.1973 21.7979 -43.9971 -0.400391zM214.905 372.214l0.000976562 -0.00195312c-18.8994 0 -23.998 -37.4951 -8.39941 -52.0938c7.79883 5.69922 6.89941 4.69922 5.89941 5.49902c-8 6.89941 -6.59961 27.3975 1.7998 28.0977
+c6.29883 0.5 10.7988 -10.6992 9.59863 -19.5986c3.09961 2.10059 6.69922 3.60059 10.1992 4.59961c1.7002 19.2988 -8.99902 33.498 -19.0986 33.498zM202.571 304.373v0.000976562c-4.67871 -4.16504 2.83789 -10.7852 9.23438 -15.0332
+c7.7998 -4.59961 11.999 -11.499 19.998 -14.999c2.59961 -1.09961 5.7002 -1.89941 9.59961 -2.09961c18.3984 -1.09961 27.0977 11.2988 38.1973 14.8984c9.13184 2.93262 27.8037 17.0635 12.1982 22.1064c-11.2988 4.89941 -16.2979 5.2002 -22.5977 9.2998
+c-10.2988 6.59863 -18.7979 8.89844 -25.8975 8.89844c-14.3994 0 -23.2129 -9.7832 -27.8984 -14.1982c-0.513672 -0.485352 -6.63477 -4.27441 -12.834 -8.87402zM198.104 -17.0264l-0.000976562 -0.000976562c2.10059 20.5 -24.9951 34.9072 -34.4941 54.8057
+l-19.5977 35.5967c-6.7998 9.19922 -13.7988 14.7988 -21.8984 15.999c-7.69922 1.19922 -12.1992 -1.40039 -17.2988 -6.89941c-4.7998 -5.09961 -8.7998 -12.2998 -14.2988 -17.999c-7.7998 -6.49902 -3.46777 -3.30859 -13.7666 -7.00879
+c-6.2998 -2.19922 -9.67383 1.18066 -13.1729 -5.51855c-2.7002 -4.99902 -2.10059 -12.1992 -0.900391 -19.998c1.2002 -7.89941 3 -16.2988 0.600586 -23.8984v-0.200195c-5 -13.6982 -5 -18.8076 -2.60059 -23.5068c7.90039 -15.3994 38.7402 -1.04199 68.6377 -16.8408
+c31.3965 -16.3994 66.0918 -19.6279 68.791 15.4697zM203.207 11.0391h-0.000976562c37.5967 -25.6973 82.1943 -15.6982 114.291 7.19922c3.2002 11 6.2998 13.7119 6.7998 21.4111c0.799805 15.1992 1.59961 28.6982 4.39941 39.8975
+c3.09961 12.5986 9.2998 23.0977 21.3984 27.2979c2.2998 21.0977 18.6992 21.0977 38.2969 12.498c7.74512 -0.880859 18.4053 -13.8916 -24.2979 3.69141c-5.29883 29.0977 -17.498 62.9043 -23.5977 74.3027c-11.5 21.3975 -29.498 61.7178 -37.1973 92.1143
+c-4.5 -6.39941 -12.3994 -11.8984 -22.2979 -14.998c-4.7002 -1.5 -9.69922 -5.5 -15.8994 -9c-13.8994 -7.99902 -29.998 -8.79883 -42.3965 1.2002c-4.5 3.59961 -7.99902 7.59961 -12.5986 10.2988c-1.60059 0.900391 -5.09961 3.2998 -6.2002 4.10059
+c-2 -37.7979 -27.2979 -81.7168 -39.2969 -109.114c-8.2998 -19.6973 -13.1992 -59.9453 -13.7988 -80.6436c-50.0469 44.9688 11.1963 143.627 -15.5986 27.9473c3.5 -11.1982 11.0996 -21.498 24.5977 -29.8975c0 0 24.7988 -14.2979 38.2979 -32.4971
+c7.39941 -9.99902 9.69922 -18.6982 7.39941 -24.8975c-2.5 -6.7002 -9.59961 -8.89941 -16.6992 -8.89941c4.7998 -6 5.60254 -6.40527 14.3994 -12.0117zM450.692 14.4092h0.00195312c1.61133 9.45215 -6.78027 17.3408 -12.0107 24.373
+c-10 11.3008 -7.10352 30.2266 -16.9805 38.752c-6.92188 5.97363 -6.30957 8.30957 -14.5107 8.71191c-7.7002 -8.79883 -25.7988 -19.5977 -38.3975 -16.2988c-11.499 2.90039 -17.998 10.293 -18.7979 23.4912c-0.299805 -0.199219 -0.700195 -0.299805 -1 -0.5
+c-7.09961 -3.89941 -4.96777 -4.79199 -7.56738 -15.0918c-2.5 -10.1992 -3.40039 -23.498 -4.2002 -38.6973c-0.700195 -11.7998 -6.19922 -26.3984 -9.89941 -40.5967c-3.49902 -13.1992 -6.50391 -17.6836 -1.80371 -28.7832
+c7.19922 -14.498 13.8164 -20.3359 28.0146 -19.2363c14.1982 1.10059 28.6523 10.9092 41.8516 26.6074c21.9971 26.5977 54.4004 20.4707 55.2998 37.2686z" />
+    <glyph glyph-name="macos" unicode="&#xf103;" 
+d="M22.3262 393.681h467.347c12.3691 0 22.3262 -9.95703 22.3262 -22.3262v-358.71c0 -12.3691 -9.95703 -22.3262 -22.3262 -22.3262h-467.347c-12.3691 0 -22.3262 9.95703 -22.3262 22.3262v358.71c0 12.3691 9.95801 22.3262 22.3262 22.3262zM300.661 369.122
+l-0.000976562 -0.0146484c-36.5176 -22.0273 -54 -80.3857 -76.6523 -205.402h76.6523v-38.3877h0.015625v-40.0879c22.4736 5.59863 49.1221 16.54 74.249 37.6279c1.98633 1.61719 4.37598 2.4043 6.74707 2.4082c3.04688 0.00488281 6.06152 -1.28711 8.13965 -3.78125
+c3.80176 -4.43457 3.16797 -11.0869 -1.2666 -14.8877c-29.9707 -25.0566 -61.8877 -37.2373 -87.8691 -43.0752v-39.0908c0.287109 -5.34766 4.68652 -9.56738 10.1084 -9.56738h170.269c5.60938 0 10.125 4.51562 10.125 10.125v334.01
+c0 5.6084 -4.51562 10.124 -10.125 10.124h-180.392zM126.22 311.817c-6.59766 0 -11.9082 -5.31055 -11.9082 -11.9072v-47.6279c0 -6.59668 5.31152 -11.9072 11.9082 -11.9072s11.9072 5.31055 11.9072 11.9072v47.6279c0 6.59668 -5.31152 11.9072 -11.9072 11.9072z
+M130.371 125.282h0.000976562c-3.04004 0.00488281 -6.08008 -1.28613 -8.21875 -3.78125c-3.69531 -4.43457 -3.16699 -11.0859 1.37305 -14.8877c17.3174 -14.4668 64.8281 -48.1475 132.511 -48.1475c3.70117 0 8.45508 0.0996094 13.9736 0.558594v21.123
+c-0.618164 -0.0507812 -1.23438 -0.100586 -1.83203 -0.142578c-4.75098 -0.316406 -8.86914 -0.422852 -12.1416 -0.422852c-60.8193 0 -103.477 30.1992 -118.997 43.292c-1.94043 1.61621 -4.30469 2.4043 -6.66895 2.4082zM385.811 311.818
+c6.59668 0 11.9082 -5.31055 11.9082 -11.9072v-47.6279c0 -6.59668 -5.31152 -11.9072 -11.9082 -11.9072c-6.5957 0 -11.9072 5.31055 -11.9072 11.9072v47.6279c0 6.59668 5.31152 11.9072 11.9072 11.9072z" />
+    <glyph glyph-name="mix" unicode="&#xf107;" 
+d="M-0.00195312 443.982l512.007 -0.0517578v-284.611c0 -27.709 -23.001 -50.166 -51.3604 -50.166c-28.3701 0 -51.3721 22.4561 -51.3721 50.1543v25.5312c0 27.709 -23.001 50.165 -51.3604 50.165c-26.0381 0 -47.5518 -18.918 -50.9121 -43.4502v-77.7139
+c-0.0107422 -27.7305 -22.916 -50.208 -51.1689 -50.208c-28.2637 0 -51.168 22.4775 -51.168 50.2188v196.529c0 27.7402 -22.9062 50.2295 -51.1689 50.2295c-26.9404 0 -49.002 -20.4502 -50.998 -46.3867l-0.0322266 -324.046
+c0 -27.709 -22.9375 -50.166 -51.2324 -50.166c-28.2959 0 -51.2334 22.457 -51.2334 50.166v453.806z" />
+    <glyph glyph-name="netbsd" unicode="&#xf104;" 
+d="M98.8613 362.14c0 0 -1.45508 3.38184 -5.55566 1.11816c-3.40918 -1.89062 -1.63574 -5.38379 -1.63574 -5.38379l64.0791 -135.497h15.5439l-72.4336 139.764zM280.757 11.126l-48.4775 93.5566h-20.876l48.6963 -102.967s4.90723 -9.69141 15.4375 -4.33398
+c10.5264 5.35742 5.22168 13.7441 5.22168 13.7441zM459.44 371.419c-60.7549 29.1592 -115.723 15.2344 -177.202 -3.16406c-61.8916 -18.5117 -116.944 -28.5312 -178.791 -3.29785c6.7373 -12.0391 10.1104 -18.0576 16.8516 -30.0869
+c6.18848 -11.0654 12.3857 -22.1299 18.5771 -33.1904c6.74023 -12.0361 10.1094 -18.0498 16.8506 -30.084c49.2402 -13.917 90.0186 4.13184 133.778 26.0068c52.5449 26.2529 100.007 49.8721 160.042 36.1875c-50.7344 25.4053 -96.7275 19.1094 -149.778 4.7168
+c51.9375 26.4404 100.837 47.0049 159.675 32.9121zM99.6621 155.143c0 -10.1494 0 -19.9785 0.311523 -25.1357c-1.09082 -1.86523 -5.46094 -3.59082 -9.20605 -3.59082c-0.158203 0 -5.30957 7.96387 -12.6445 17.0215l-36.0576 44.6484
+c-8.89453 11.2412 -14.2031 17.6387 -17.0127 19.9814c-0.779297 -1.55859 -0.779297 -4.21094 -0.779297 -9.98828v-30.291c0 -12.6455 0.62207 -24.3506 2.34082 -28.5693c1.40625 -3.27539 4.99414 -4.21289 9.05273 -4.98926l4.37012 -0.62793
+c1.24707 -1.25195 0.936523 -4.53223 0 -5.45996c-8.42871 0.304688 -14.6719 0.467773 -20.915 0.467773c-5.77539 0 -11.5488 -0.163086 -17.4795 -0.467773c-0.9375 0.927734 -1.25 4.20801 0 5.45996l2.65234 0.46875c4.21387 0.9375 7.17773 1.87305 8.58203 5.14844
+c1.56152 4.21875 2.1875 15.9238 2.1875 28.5693v39.6562c0 8.58203 0 11.0781 -1.09277 13.2646c-1.09473 2.65527 -3.43555 4.21777 -8.89844 5.30859l-4.36816 0.626953c-1.09277 1.24902 -0.9375 4.99512 0.62207 5.46094
+c7.33691 -0.304688 15.1406 -0.46582 21.543 -0.46582c5.30566 0 9.83301 0.15625 13.1104 0.466797c1.56348 -7.02441 11.708 -18.8848 25.7549 -35.5928l13.1113 -15.457c7.02539 -8.11816 11.3945 -13.5771 14.9873 -17.1729
+c0.623047 1.56445 0.623047 4.22168 0.623047 7.02539v21.5479c0 12.6426 -0.623047 24.3516 -2.34277 28.5732c-1.40527 3.27344 -4.83789 4.20605 -9.05176 4.9873l-4.21582 0.626953c-1.24609 1.24902 -0.935547 4.52637 0 5.46094
+c8.43164 -0.304688 14.5186 -0.46582 20.918 -0.46582c5.77246 0 11.3936 0.15625 17.4824 0.466797c0.936523 -0.935547 1.24609 -4.21289 0 -5.46387l-2.81055 -0.46582c-4.05664 -0.94043 -7.02441 -1.87305 -8.43066 -5.1543
+c-1.71387 -4.21387 -2.34082 -15.9229 -2.34082 -28.5703v-37.3125zM137.06 193.233l0.000976562 -0.00195312c16.2314 0 24.9727 -10.46 24.9727 -22.4854c0 -2.96582 -0.779297 -5.15039 -5.61621 -5.15039h-29.9697c-3.58984 0 -3.9043 -0.30957 -3.9043 -2.80762
+c0 -11.7109 7.49414 -23.1064 22.0088 -23.1064c4.37207 0 10.3027 0.932617 14.5166 8.11621c1.7168 0.310547 4.05859 -0.936523 4.05859 -3.58594c-6.40039 -13.2725 -17.9502 -17.8047 -27.3164 -17.8047c-21.0713 0 -32.4639 14.8359 -32.4639 31.8525
+c0 19.6719 14.2031 34.9736 33.7129 34.9736zM135.474 186.187c-5.47949 0.0712891 -12.2588 -6.91406 -11.6406 -11.5713c0.421875 -3.1709 5.40625 -2.18848 11.417 -2.18848c5.5791 0 9.72559 -0.0146484 9.08301 5.93848
+c-0.342773 3.18066 -1.58105 7.11914 -8.33301 7.79199c-0.173828 0.0166016 -0.349609 0.0263672 -0.526367 0.0292969zM192.808 182.614c-2.02832 0 -2.18457 -0.152344 -2.18457 -3.59082v-23.4102c0 -8.74805 0 -18.4277 10.9258 -18.4277
+c2.18555 0 4.68164 1.09082 6.55762 2.33887c1.55664 -0.463867 2.49414 -2.18066 2.18066 -4.05566c-4.37012 -4.68066 -12.7979 -9.05762 -22.4746 -9.05762c-12.957 0 -17.4814 7.49609 -17.4814 17.8057v34.8066c0 3.28223 -0.15625 3.59082 -2.9668 3.59082h-4.83594
+c-1.71875 0.636719 -2.18652 3.75 -0.939453 4.8457c4.83789 1.71191 9.20898 4.52637 12.9561 7.02051c2.80957 2.02832 6.71289 5.30371 11.5508 12.1836c1.08984 0.620117 3.90234 0.459961 4.68359 -0.78418v-11.7109c0 -2.96387 0.15625 -3.12012 2.96484 -3.12012
+h13.8936c0.780273 -0.62207 1.24707 -1.56445 1.24707 -2.96777c0 -1.7168 -0.466797 -4.52246 -2.02734 -5.4668h-14.0518zM256.05 232.106l-0.000976562 0.000976562c14.9814 0 24.9756 -1.7207 31.8389 -5.78125c6.71289 -4.05762 10.7676 -10.6182 10.7676 -19.8232
+c0 -13.1172 -11.0791 -18.2676 -15.917 -19.5195c-1.56348 -0.305664 -3.125 -0.935547 -3.125 -1.71484c0 -0.466797 0.78418 -0.931641 2.19043 -1.25c12.3301 -2.65527 22.7842 -10.7656 22.9424 -25.9062c0.157227 -14.3652 -8.42676 -22.7979 -18.2578 -26.2363
+c-9.83789 -3.43262 -21.541 -3.90137 -31.0635 -3.90137c-5.61719 0 -11.5488 0.630859 -16.0771 0.630859c-7.65137 0 -15.2998 -0.163086 -24.1934 -0.47168c-1.24707 0.93457 -1.24707 4.99219 0 5.45996l4.52637 0.938477
+c7.02148 1.40234 7.95996 2.49707 7.95996 16.5479v55.1094h-0.00390625c0 15.7637 -0.3125 17.4775 -6.86719 18.2637l-4.21484 0.62793c-1.4043 0.78125 -1.71777 5.46289 0.625 5.61914c11.8643 0.77832 23.2588 1.40625 38.8701 1.40625zM254.441 225.473v-0.000976562
+c-1.76953 -0.00390625 -3.63965 -0.158203 -5.6084 -0.482422c-1.28809 -14.2012 -1.10254 -27.3037 0.666992 -38.333c36.2344 -6.14355 35.5342 38.8789 4.94141 38.8164zM257.315 180.149c-2.44727 -0.0126953 -5.07617 -0.327148 -7.88477 -0.990234
+c-0.90332 -15.3789 -2.64355 -36.0166 3.02344 -42.4365c36.3223 -7.48047 37.2148 43.5928 4.86133 43.4268zM338.793 126.106c-14.3564 0 -23.2559 4.05957 -26.5312 5.92969c-2.96582 3.43457 -4.99316 14.6738 -4.99316 25.292
+c1.08984 2.02637 4.68262 2.18652 5.92969 0.46875c3.12109 -10.1465 13.5762 -24.5088 26.8467 -24.5088c11.5479 0 16.8584 7.96094 16.8584 15.7637c0 12.6445 -11.8613 20.1387 -21.2285 24.8203c-11.2383 5.62793 -23.4131 14.9873 -23.5664 30.4482
+c0 17.6377 13.5801 29.8203 36.2119 29.8203c5.14941 0 11.5479 -0.62793 17.7949 -2.50391c2.02832 -0.624023 3.43066 -0.931641 5.30566 -1.24609c1.24316 -3.43457 2.81055 -11.8652 2.81055 -22.3271c-0.782227 -1.86816 -4.68555 -2.02734 -6.08789 -0.472656
+c-2.65527 7.96777 -9.37012 19.3652 -20.6074 19.3652c-10.2988 0 -15.917 -6.71582 -15.917 -14.5166c0 -7.18457 6.39258 -13.7373 14.1982 -17.7979l10.3057 -5.46875c9.67578 -5.15039 22.0088 -14.2031 22.0088 -31.376
+c0 -19.2041 -15.7715 -31.6904 -39.3389 -31.6904zM421.767 232.106h0.00292969c12.7979 0 25.5938 -1.25781 36.3662 -5.1543c20.4502 -7.33691 31.6836 -25.7588 31.6836 -45.2705c0 -20.9238 -9.98828 -37.7871 -27.9355 -46.6826
+c-10.6143 -5.3125 -23.417 -7.33398 -39.4941 -7.33398c-7.33203 0 -15.1445 0.939453 -20.7598 0.939453c-7.49512 0 -15.4551 -0.163086 -24.3486 -0.472656c-1.24805 0.935547 -1.24805 4.68066 0 5.46094l4.83789 0.780273
+c7.02344 1.24609 7.96094 2.33887 7.96094 16.7061v55.2666c0 14.8291 -0.313477 17.7939 -7.49414 18.5752l-2.96387 0.30957c-1.55859 0.78125 -1.55762 5.31348 0.314453 5.46973c13.1104 0.77832 25.2822 1.40625 41.8301 1.40625zM422.556 225.047v0.000976562
+c-5.07617 0.0341797 -8.65625 -0.895508 -9.32324 -2.29102c-2.66992 -5.58594 -1.23828 -26.0488 -1.23828 -43.29c0 -9.74219 -0.780273 -28.2441 1.97168 -35.71c2.36816 -6.42188 16.1582 -8.36621 24.3096 -5.06641c14.5264 3.88965 26.752 17.084 26.752 40.7764
+c0 23.6904 -11.2891 38.0635 -26.5166 42.8965c-5.83301 1.87305 -11.4766 2.65332 -15.9551 2.68359zM483.961 220.124c0 3.86426 1.37109 7.16797 4.11523 9.9043c2.74219 2.73633 6.04883 4.10645 9.91309 4.10645s7.16699 -1.37012 9.90332 -4.10645
+c2.73438 -2.73633 4.10352 -6.04004 4.10352 -9.9043c0 -3.86816 -1.36914 -7.17188 -4.10352 -9.91602c-2.73633 -2.74316 -6.03906 -4.11523 -9.90332 -4.11523s-7.1709 1.37207 -9.91309 4.11523c-2.74414 2.74414 -4.11523 6.04785 -4.11523 9.91602zM509.699 220.124
+c0 3.2373 -1.14062 5.99902 -3.42578 8.28516c-2.28418 2.28418 -5.04395 3.42773 -8.28418 3.42773c-3.2373 0 -6.00391 -1.14355 -8.29395 -3.42773c-2.29199 -2.28613 -3.4375 -5.04785 -3.4375 -8.28516c0 -3.23926 1.14551 -6.00391 3.4375 -8.2959
+c2.29004 -2.28809 5.05664 -3.43555 8.29395 -3.43555c3.24023 0 6 1.14746 8.28418 3.43555c2.28516 2.29199 3.42578 5.05664 3.42578 8.2959zM502.343 211.687l-4.39551 7.43066h-2.49609v-7.43066h-2.45117v17.2354h4.42285
+c4.15039 0 6.22461 -1.59082 6.22461 -4.76953c0 -2.21191 -1.11621 -3.77637 -3.34863 -4.6875l4.72559 -7.77832h-2.68164zM495.451 226.835v-5.76172c0.206055 -0.0283203 0.744141 -0.0390625 1.61133 -0.0390625c1.60059 0 2.67773 0.204102 3.22852 0.613281
+c0.552734 0.412109 0.829102 1.19434 0.829102 2.35059c0 1.90527 -1.24219 2.8584 -3.72461 2.8584h-0.97168l-0.972656 -0.0214844z" />
+    <glyph glyph-name="openbsd" unicode="&#xf105;" 
+d="M236.825 430.384l-0.00390625 -0.000976562c6.49023 0 15.1904 -30.6533 18.166 -41.9072c11.9443 -1.06055 23.7666 -3.20703 35.3203 -6.41113c6.5127 11.2148 21.3896 35.4941 27.3115 33.9072c6.64844 -1.7832 6.77246 -37.4941 6.6875 -47.041
+c8.88672 -4.53125 16.7617 -9.33594 25.5195 -15.2646c9.5791 9.46777 29.1562 27.7998 34.2979 24.8311c6.54102 -3.77344 -4.96484 -44.5771 -6.1377 -48.6709c6.08301 -6.29785 11.4844 -12.7168 17.2871 -20.3496c12.0723 6.8125 34.1689 18.4023 38.2178 14.3535
+c5.62012 -5.62012 -18.1172 -46.1211 -18.1172 -46.1211c7.46484 -14.1406 14.3145 -36.8926 17.1396 -61.5322h11.04c4.85938 23.1143 5.38184 63.6875 36.2412 63.8926c20.2002 -0.160156 35.7412 -40.6865 31.4912 -66.792
+c-27.9131 59.208 -42.0557 15.3535 -41.9082 -21.2842c-0.149414 -36.6387 14.0635 -80.3428 41.9082 -21.2842c4.31641 -26.5215 -11.1201 -65.7578 -31.4912 -66.792c-26.1611 0 -26.2842 23.5459 -34.6777 56.8779h-13.4521
+c-2.78809 -16.6533 -9.68457 -36.8906 -17.1152 -54.5186c0 0 24.5625 -40.5039 18.9424 -46.124c-4.05078 -4.04883 -26.1475 7.54199 -38.2178 14.3535c-5.29688 -7.16602 -11.0723 -13.9639 -17.2881 -20.3496c1.17383 -4.09277 12.6787 -44.8945 6.13867 -48.6709
+c-5.14062 -2.96875 -24.7178 15.3643 -34.2979 24.833c-8.11035 -5.72363 -16.6416 -10.8262 -25.5195 -15.2666c0.0859375 -9.54688 -0.0390625 -45.2598 -6.6875 -47.041c-5.92188 -1.58691 -20.7988 22.6914 -27.3105 33.9072
+c-11.5557 -3.2041 -23.3779 -5.35059 -35.3213 -6.41113c-2.97559 -11.252 -11.6758 -41.9072 -18.165 -41.9072c-6.46875 0 -15.1367 30.4678 -18.1396 41.8105c-10.6924 1.02539 -23.1855 3.54199 -35.3447 6.50879c-6.5127 -11.2148 -21.3906 -35.4941 -27.3115 -33.9082
+c-6.64844 1.78418 -6.77344 37.4951 -6.6875 47.042c-8.70312 4.60352 -16.9072 9.4209 -25.5195 15.2656c-9.57812 -9.46777 -29.1553 -27.8018 -34.2979 -24.832c-6.54102 3.77344 4.96484 44.5771 6.13867 48.6709c-6.01367 6.27539 -11.5352 12.9062 -17.2881 20.3486
+c-12.0713 -6.81152 -34.1689 -18.4023 -38.2178 -14.3535c-5.62012 5.62012 18.9434 46.125 18.9434 46.125c-5.75488 12.8633 -11.2656 30.085 -15.6406 46.2646l-14.3936 -8.31055c-9.1709 -5.29492 -20.8174 -2.17383 -26.1123 6.99707s-2.17285 20.8164 6.99805 26.1113
+l27.2852 15.7529l-27.6611 15.9707c-9.1709 5.29395 -12.291 16.9404 -6.99609 26.1113c3.47461 6.01855 9.68457 9.43164 16.1348 9.57031c8.72461 0.0986328 17.293 -7.29785 25.2061 -11.3662c3.23047 14.1279 9.06641 29.5391 15.1797 44.3311
+c0 0 -24.5635 40.501 -18.9434 46.1211c4.0498 4.04883 26.1475 -7.54199 38.2178 -14.3535c5.17383 6.34082 10.75 13.6689 17.2881 20.3496c-1.17383 4.09277 -12.6797 44.8945 -6.13867 48.6709c5.14062 2.96875 24.7178 -15.3643 34.2979 -24.833
+c7.62695 4.8584 16.2646 10.4629 25.5195 15.2666c-0.0859375 9.54688 0.0390625 45.2598 6.6875 47.041c5.92188 1.58691 20.7979 -22.6885 27.3105 -33.9043c9.75098 2.55176 23.2236 4.84668 35.3477 6.50488c3.00293 11.3418 11.6709 41.8105 18.1396 41.8105z
+M331.305 288.467h-0.000976562c-9.4873 -0.251953 -37.2041 -17.0605 -37.2041 -17.0605l23.4482 -23.4492s21.1914 34.9434 16.3428 39.791c-0.530273 0.530273 -1.4209 0.749023 -2.58594 0.71875zM115.361 260.174h-0.00195312
+c-4.05566 -6.20117 -6.2207 -13.4482 -6.23242 -20.8584c0 -21.1152 17.1172 -38.2314 38.2314 -38.2314s38.2314 17.1172 38.2305 38.2314c-0.00390625 7.40723 -2.16016 14.6543 -6.20508 20.8584h-64.0225zM327.861 206.086v-33.1611s39.6904 9.72363 39.6904 16.5811
+c0 6.85645 -39.6904 16.5801 -39.6904 16.5801zM305.547 136.023l-23.4502 -23.4482s34.9434 -21.1904 39.791 -16.3428c4.84863 4.85059 -16.3408 39.791 -16.3408 39.791zM136.006 248.405c6.38281 0 11.5635 -5.18066 11.5635 -11.5635
+s-5.18066 -11.5635 -11.5635 -11.5645c-6.38379 0 -11.5645 5.18066 -11.5645 11.5645c0 6.38281 5.18066 11.5635 11.5645 11.5635v0z" />
+    <glyph glyph-name="sailfish-os" unicode="&#xf106;" 
+d="M239.769 222.605c-11.4141 10.8955 -22.3721 21.6104 -30.2852 33.8428c22.7197 37.4824 74.7539 61.9209 89.7939 68.3789c7.97656 -8.08496 29.3818 -26.8418 59.3174 -30.5283c-12.4111 -4.33789 -90.0459 -32.6748 -118.826 -71.6934zM273.846 137.217
+c-3.18262 -36.752 -26.1406 -67.9053 -57.2451 -93.6426c7.45605 11.8359 13.0605 25.4229 14.3574 40.418c3.04492 35.1318 -20.8027 59.2383 -43.8682 82.5508c-23.4609 23.7178 -45.623 46.1191 -42.7217 79.6289c3.38086 39.0117 26.9619 74.2695 55.8828 103.484
+c-8.00977 -14.3174 -14.5615 -30.292 -15.9004 -45.748c-3.75879 -43.3828 23.8643 -69.7168 48.2354 -92.9512c22.6357 -21.5801 44.0146 -41.9619 41.2598 -73.7402zM115.549 -15.4014c32.7227 23.9971 58.3789 54.3105 72.8184 87.2432
+c9.34277 21.3096 13.1855 42.0693 11.4873 61.2559c11.5439 -14.3115 19.3672 -29.4902 17.7666 -47.9482c-4.0498 -46.7656 -59.8418 -80.1377 -60.6416 -80.6104l0.0332031 -0.0537109c-13.8223 -7.38086 -27.8496 -14.0068 -41.4639 -19.8867zM275.343 328.354
+c-21.7207 -11.1953 -53.5498 -30.9551 -72.9688 -58.332c-3.87793 9.62891 -5.75977 20.3291 -4.68652 32.7275c3.14941 36.3359 41.2373 78.7871 47.2354 85.2666c22.3223 16.585 43.6084 29.3535 58.0869 37.4072c-10.4688 -21.8428 -25.5312 -59.2666 -27.667 -97.0693z
+M504.92 339.496c-1.28711 3.41992 -5.0791 5.17969 -8.51465 3.94922l-48.834 -17.4229c-20.5029 -6.7168 -44.3447 -13.7236 -64.9502 -17.665c-44.3867 -8.47559 -76.1631 28.3672 -76.4717 28.7305c-1.83301 2.18555 -4.85254 2.96875 -7.51953 1.94824
+c-0.608398 -0.233398 -4.04395 -1.57324 -9.31348 -3.93945c5.41309 51.6455 34.9971 102.254 35.3203 102.8c1.49512 2.5293 1.16504 5.74023 -0.8125 7.91309c-1.97754 2.17383 -5.13965 2.80078 -7.80078 1.55176
+c-1.77539 -0.837891 -44.0107 -20.8828 -88.1533 -55.3516c-59.9961 -46.8467 -92.5762 -95.5273 -96.834 -144.687c-3.4375 -39.6777 21.9707 -65.3604 46.543 -90.1992c1.4082 -1.42383 2.81152 -2.84082 4.20312 -4.25586
+c8.31445 -22.0557 6.37891 -48.1729 -5.6709 -75.6553c-21.5723 -49.2031 -70.1602 -92.3076 -129.971 -115.305c-18.9434 -7.28125 -34.8359 -12.8438 -34.9932 -12.9004c-3.32422 -1.15918 -5.17773 -4.69531 -4.24805 -8.08789
+c0.810547 -2.9541 3.49219 -4.92383 6.44824 -4.92383c0.441406 0 0.883789 0.0439453 1.3291 0.134766c10.0469 2.02344 74.2061 18.9258 136.608 50.3584c4.25977 2.14551 8.39453 4.31641 12.457 6.49805l0.00195312 -0.00390625
+c0.0166016 0.00976562 0.0654297 0.0371094 0.0859375 0.0517578c77.2275 41.5039 118.729 89.5742 123.359 143.022c2.9541 34.0928 -16.4551 56.5459 -37.6768 77.2021c26.7793 38.7305 114.028 68.5859 115.03 68.9258l86.1172 30.7246
+c27.3418 8.91504 48.9072 17.3955 50.4531 18.0068c3.39648 1.34082 5.09082 5.1582 3.80664 8.5791z" />
+  </font>
+</defs></svg>

build.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 set -e # halt script on error
 
 bundle exec jekyll build

font/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "fontcustom", "~> 2.0"

font/Gemfile.lock

@@ -0,0 +1,27 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ffi (1.11.1)
+    fontcustom (2.0.0)
+      json (~> 1.4)
+      listen (>= 1.0, < 4.0)
+      thor (~> 0.14)
+    json (1.8.6)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    ruby_dep (1.5.0)
+    thor (0.20.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fontcustom (~> 2.0)
+
+BUNDLED WITH
+   2.0.1

font/LICENSE

@@ -0,0 +1,13 @@
+Copyright (c) 2019, Dawid Potocki
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

font/Makefile

@@ -0,0 +1,11 @@
+build:
+	bundle exec fontcustom compile -F
+	mv ptio-font.woff assets/webfonts
+	mv _sass/ptio-font.css ../_sass/ptio-font.scss
+	mv assets/webfonts/* ../assets/webfonts/
+	sed -i -e 's/..\/assets\//..\//g' ../_sass/ptio-font.scss
+
+default:
+	build
+
+.PHONY: build

font/README.md

@@ -0,0 +1,39 @@
+# ptio-font
+
+This font contains icons we need, which Font Awesome does not have.
+
+| Name        | CSS class             | Issue |
+|---          |---                    |---    |
+| F-Droid     | `ptio-f-droid`        | https://github.com/FortAwesome/Font-Awesome/issues/15492 |
+| iOS         | `ptio-ios`            | https://github.com/FortAwesome/Font-Awesome/issues/4935  |
+| macOS       | `ptio-macos`          | https://github.com/FortAwesome/Font-Awesome/issues/4936  |
+| OpenBSD     | `ptio-openbsd`        | https://github.com/FortAwesome/Font-Awesome/issues/5345  |
+| NetBSD      | `ptio-netbsd`         | https://github.com/FortAwesome/Font-Awesome/issues/15496 |
+| Sailfish OS | `ptio-sailfish-os`    | https://github.com/FortAwesome/Font-Awesome/issues/15498 |
+
+We also have custom Linux icon (`ptio-linux`), because I (@dawidpotocki) made it before and looks cleaner.
+And since we are bundling additional font anyway, why not.
+
+## Building
+
+To build the font, you will need some of the following tools installed.
+
+| Name              | Notes                                                         |
+|---                |---                                                            |
+| `make`            | Use distro's package manager                                  |
+| `ruby`            | Use distro's package manager                                  |
+| `bundler`         | Run `gem install bundler`                                     |
+|                   |                                                               |
+|                   |                                                               |
+| `woff-tools`      | Use distro's package manager                                  |
+| or                |                                                               |
+| `yarn` or `npm`   | Use distro's package manager                                  |
+| `sfnt2woff`       | Run `yarn global add sfnt2woff` or `npm install -g sfnt2woff` |
+
+Then just run the following commands to build the font:
+
+```
+$ cd font/
+$ bundle   # it will install FontCustom
+$ make build   # it will build a font and css
+```

font/fontcustom.yml

@@ -0,0 +1,15 @@
+font_name: ptio-font
+css_selector: .ptio-{{glyph}}
+preprocessor_path: ""
+autowidth: false
+no_hash: true
+force: false
+debug: false
+quiet: false
+
+input:
+  vectors: svg
+
+output:
+  fonts: assets/webfonts
+  css: _sass