Update sponsors.html

https://github.com/privacytoolsIO/privacytools.io/pull/1451#issuecomment-553954762

.github/CODEOWNERS

@@ -2,18 +2,22 @@
 *.md @privacytoolsIO/editorial
 /assets/ @privacytoolsIO/editorial
 /pages/ @privacytoolsIO/editorial
+/_includes/ @JonahAragon @privacytoolsIO/editorial
 /_includes/sections/ @privacytoolsIO/editorial
-/index.html @privacytoolsIO/editorial
 /font/ @dawidpotocki
 
 # Administration Related Files
+/index.html @JonahAragon @privacytoolsIO/editorial
+/_includes/sections/header.html @JonahAragon @privacytoolsIO/editorial
+/_includes/sections/participate.html @JonahAragon @privacytoolsIO/editorial
+/pages/sponsors.html @JonahAragon
 /pages/donate.html @JonahAragon @BurungHantu1605
 /assets/js/redirects.js @JonahAragon
 /.well-known/ @JonahAragon
 /404.html @JonahAragon
-/.github/CODEOWNERS @JonahAragon @BurungHantu1605
+/.github/CODEOWNERS @JonahAragon
 /.github/FUNDING.yml @JonahAragon @BurungHantu1605
-/LICENSE.txt @JonahAragon @BurungHantu1605
+/LICENSE.txt @JonahAragon
 /.travis.yml @JonahAragon @Shifterovich @nitrohorse
 /CNAME @JonahAragon
 /nginx/ @JonahAragon

.github/CONTRIBUTING.md

@@ -1,6 +1,22 @@
 # Contributing Guidelines
 
-Please read this before contributing.
+Please read this document in full before contributing.
+
+- [Rules](#rules)
+- [Quality over Quantity](#quality-over-quantity)
+- [Software Criteria](#software-criteria)
+  - [Main (All Software)](#main)
+  - [Providers](#providers)
+    - [DNS](#dns)
+    - [VPN](#vpn)
+    - [Email](#email)
+  - [Hardware](#hardware)
+  - [Software](#software)
+  - [Encryption](#encryption)
+  - [Operating Systems](#operating-systems)
+- [Images](#images)
+- [Licensing](#licensing)
+- [Contributing via email](#contributing-via-email)
 
 ## Rules
 
@@ -9,14 +25,16 @@ Please read this before contributing.
 - Be constructive.
 - Please feel free to *review changes* in the *files changed* tab of any
   pull request at any time.
-- See also our [Code of Conduct](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md)
+- See also our [Code of Conduct](https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md)
 
 ## Quality over Quantity
 
 We're trying to keep it simple and promote the best tools, not all of them.
 
 ## Software Criteria
+
 ### Main
+
 - Easy to use. Could your mother use that tool or service? Usability is most important.
 - Cross-platform / Accessible.
 - Privacy respecting.
@@ -25,47 +43,71 @@ We're trying to keep it simple and promote the best tools, not all of them.
 
 There can be exceptions if no software is available that meet the criteria.
 
-Note: This criteria applies to all of privacytools.io
+Note: This criteria applies to all of the PrivacyTools website and recommendations.
+
 ### Providers
+
 - Prioritize Products by privacy respecting nationality.
 
 ### DNS
 
-- supports DoH or DoT (We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it).
-- supports DNSSEC (https://dnssec.vs.uni-due.de/ can test your current DNS provider).
-- doesn't log IP addresses during normal operation (If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs).
-- preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10)
+- Supports DoH or DoT (We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it).
+- Supports DNSSEC (https://dnssec.vs.uni-due.de/ can test your current DNS provider).
+- Doesn't log IP addresses during normal operation (If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs).
+- Preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10)
 
 ### VPN
+
+See https://www.privacytools.io/providers/vpn/#criteria for more details.
+
 - Prioritize Products by privacy respecting nationality.
 - Cannot be based in USA or UK.
-- Must be accessible via Open Source Software (i.e OpenVPN, WireGuard)
+- Must be accessible via Open Source Software (e.g. OpenVPN, WireGuard)
 - Use Encryption
 - Accept Cryptocurrency
 - No logging policy
 
 ### Email
+
 - Outside of USA
 - Support SMTP SSL
-- Accessable Using Open Source 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 equivalent (if applicable)
-- Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when avalible.
+- Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when available.
 - Cannot lock users to a particular platform.
 
 ### Software
+
 - Must be able to download over encrypted network (can be a mirror)
 - Must be Open Source Software
 
 ### Encryption
+
 - Only verifiable encryption is to be trusted
 
-### OSes
+### Operating Systems
+
 - Must state if recommends, depends on, or offers non-free software (contrib)
 - No Tracking Policy (opt-in analytics is ok)
 
 ## Images
 
-- 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))
+- Provider logos are 200px x 70px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/provider/Mullvad.png))
+- Tool logos are 120px x 120px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/tools/Firefox.png))
+
+## Licensing
+
+The content and original technology of this website is made available under the Creative Commons Zero v1.0 Universal license text. Some files or folders may include works from other projects with separate licenses, and will be marked as such. **By contributing to this repository, contributors do not necessarily agree to sign a CLA or legally transfer their copyright to the project, but they do at a minimum agree to license their work under the current license of this repository: In this case, the Creative Commons Zero v1.0 Universal.**
+
+## Contributing via email
+
+If you have a GitHub account, or are able to create a GitHub account, we ask that you do not submit issues via email.
+
+If you do not have a GitHub account, you may submit software recommendations or other issues via email without creating a GitHub account by emailing `privacytools@fire.fundersclub.com`. The subject line of your email will become the issue title. Your name will be included in the posted issue.
+
+This repository uses [@fire-bot](https://github.com/fire-bot), [a service](https://fire.fundersclub.com) from FundersClub that converts incoming emails to GitHub issues. By sending a message to the email address above, you will be sharing your email address and message content with FundersClub. FundersClub has a privacy policy at [https://fundersclub.com/catalyst-privacy-policy/](https://fundersclub.com/catalyst-privacy-policy/) you should review before using this service. Any attachments you send via this service may be stored indefinitely by FundersClub for the purpose of making them available within the submitted GitHub issue.
+
+You can view an example of the created issues' format at [#1444](https://github.com/privacytoolsIO/privacytools.io/issues/1444).

.github/FUNDING.yml

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

.well-known/librehost.json

@@ -2,14 +2,14 @@
     "@context" : "http://schema.org",
     "@type" : "Organization",
     "organizationType" : "Informal collective",
-    "name" : "privacytools.io",
+    "name" : "PrivacyTools",
     "tagLine" : "Private Services: No Ads, No Google Analytics, No Affiliates, and No Cross-Site Requests",
     "homeUrl" : "https://www.privacytools.io/",
     "logo" : "https://www.privacytools.io/assets/img/layout/shield.svg",
-    "description": "privacytools.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.",
+    "description": "PrivacyTools is a socially motivated website that provides information and services for protecting your security and privacy online. No Ads, No Google Analytics, No Affiliates, and No Cross-Site Requests.",
     "communicationLanguages": ["en"],
     "contactUrl": "https://www.privacytools.io/contact/",
-    "privacyPolicyUrl" : "https://www.privacytools.io/privacy-policy/",
+    "privacyPolicyUrl" : "https://www.privacytools.io/privacy/",
     "termsOfServiceUrl" : "-",
     "isServiceProvider" : true,
     "foundingDate": "2015",

CODE_OF_CONDUCT.md

@@ -1,88 +0,0 @@
-# privacytools.io Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to make participation in our project and
-our community a harassment-free experience for everyone, regardless of a
-distinction of any kind, such as age, body size, disability, ethnicity, sex
-characteristics, gender identity and expression, level of experience,
-education, socio-economic status, nationality, personal appearance, race,
-religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention
-  or advances
-* Trolling, insulting/derogatory, antagonistic comments and personal or
-  political attacks
-* Promoting intolerance
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of
-acceptable behavior and are expected to take appropriate and fair
-corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem
-inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies within all project spaces, and it also applies
-when an individual is representing as a part of the project or its
-community in public spaces.
-
-Examples of representing a project or community include using an official
-project e-mail address, posting via an official social media account, or
-acting as an appointed representative at an online or offline event.
-Representation of a project may be further defined and clarified by
-project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting blacklight447 via email on
-blacklight447@privacytools.io or [any team member on our forum].
-The reports should include information on whether they can be shared to
-other team members and how much may be told.
-
-[any team member on our forum]:https://forum.privacytools.io/g/team
-
-All complaints will be reviewed and investigated and will result in a
-response that is deemed necessary and appropriate to the circumstances.
-The project team is obligated to maintain confidentiality with regard to the
-reporter of an incident. Further details of specific enforcement policies
-may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is forked from and licensed under Creative Commons
-BY-4.0, [Contributor Covenant version 1.4] by privacytools.io, which you can
-[find on our GitHub repository].
-
-[find on our GitHub repository]:https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md
-[Contributor Covenant version 1.4]:https://contributor-covenant.org/version/1/4

README.md

@@ -6,9 +6,9 @@ _Encryption Against Global Mass Surveillance._
 
 # Contributing
 
-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...
+It's important for a website like PrivacyTools to be up-to-date. Keep an eye on software updates of the applications listed here. Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So if you find an error, or you think a provider should not be listed here, or a qualified service provider is missing or a browser plugin is not the best choice anymore or anything else...
 
-**Talk to us 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

@@ -1,6 +1,8 @@
-title: Privacy Tools - Encryption Against Global Mass Surveillance
-description: You are being watched. Knowledge, encryption and privacy tools to protect you against global mass surveillance.
+title: PrivacyTools - Encryption Against Global Mass Surveillance
+name: PrivacyTools
+description: You are being watched. PrivacyTools provides knowledge, encryption, and software recommendations to protect you against global mass surveillance.
 url: "https://www.privacytools.io"
+production_url: "https://www.privacytools.io"
 sass:
   style: compressed
 plugins:

_includes/breadcrumbs.html

@@ -0,0 +1,22 @@
+<nav id="breadcrumb" aria-label="breadcrumb">
+  {% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
+  <ol class="breadcrumb" itemscope itemtype="https://schema.org/BreadcrumbList">
+    <li class="breadcrumb-item">
+      <a href="/"><i class="fas fa-home" aria-hidden="true"></i> <span>Home</span></a>
+    </li>
+    {% for crumb in crumbs offset: 1 %}
+    {% if forloop.last %}
+    <li class="breadcrumb-item active" aria-current="page" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+      <link href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}" itemprop="item"  />
+      <span itemprop="name">{{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}</span>
+      <meta itemprop="position" content="{{ forloop.index }}" />
+    </li>
+    {% else %}
+    <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+      <a href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}" itemprop="item"><span itemprop="name">{{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}</span></a>
+      <meta itemprop="position" content="{{ forloop.index }}" />
+    </li>
+    {% endif %}
+    {% endfor %}
+  </ol>
+</nav>

_includes/card.html

@@ -32,7 +32,7 @@
               {% 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" style="font-size: 120px;" alt="{{ include.title }}"></span>
+              <span class="{{ include.font }} panel-item panel-font" alt="{{ include.title }}"></span>
               {% endif %}
               {{include.description}}
             </p>

_includes/cardv2.html

@@ -61,33 +61,43 @@
       {% endif %}
     </p>
     <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
-      <div class="flex-shrink-0 mr-2">
+      <div class="d-flex flex-shrink-0 mr-1">
         <a
           href="{{include.website}}"
-          class="btn btn-primary mt-1">
+          rel="noopener"
+          class="btn btn-primary mt-1 mr-1">
           <i class="fas fa-external-link-alt fa-fw"></i>
           Website
         </a>
         {% if include.forum %}
           <a
             href="{{include.forum}}"
-            class="btn btn-success mt-1">
+            rel="noopener"
+            class="btn btn-success mt-1 mr-1">
             <i class="fab fa-discourse fa-fw"></i>
             Forum
           </a>
         {% endif %}
         {% if include.tor %}
           <a
+            href="{{include.tor}}"
+            rel="noopener"
+            class="hover-text-decoration-none mt-1 mr-1"
             data-toggle="tooltip"
             data-placement="bottom"
-            data-original-title="Requires specific software to access: torproject.org"
-            href="{{include.tor}}">
-            <img
-              class="mt-2"
-              alt="Tor"
-              src="/assets/img/layout/tor.png"
-              width="35"
-              height="35">
+            data-original-title="Requires specific software to access: torproject.org">
+            <span class="ptio-tor btn-tor btn-icon"></span>
+          </a>
+        {% endif %}
+        {% if include.i2p %}
+          <a
+            href="{{include.i2p}}"
+            rel="noopener"
+            class="hover-text-decoration-none mt-1 mr-1"
+            data-toggle="tooltip"
+            data-placement="bottom"
+            data-original-title="Requires specific software to access: geti2p.net">
+            <span class="ptio-i2p-garlic btn-secondary btn-icon"></span>
           </a>
         {% endif %}
       </div>
@@ -95,7 +105,7 @@
       <div class="mt-2">
           {% if include.windows %}
             {% if include.windows != "" %}
-              <a href="{{ include.windows }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.windows }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -105,7 +115,7 @@
 
           {% if include.mac %}
             {% if include.mac != "" %}
-              <a href="{{ include.mac }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.mac }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -115,7 +125,7 @@
 
           {% if include.linux %}
             {% if include.linux != "" %}
-              <a href="{{ include.linux }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.linux }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -125,7 +135,7 @@
 
           {% if include.freebsd %}
             {% if include.freebsd != "" %}
-              <a href="{{ include.freebsd }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.freebsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -135,7 +145,7 @@
 
           {% if include.openbsd %}
             {% if include.openbsd != "" %}
-              <a href="{{ include.openbsd }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.openbsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-openbsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -145,7 +155,7 @@
 
           {% if include.netbsd %}
             {% if include.netbsd != "" %}
-              <a href="{{ include.netbsd }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.netbsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-netbsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -155,7 +165,7 @@
 
           {% if include.firefox %}
             {% if include.firefox != "" %}
-              <a href="{{ include.firefox }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.firefox }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -165,7 +175,7 @@
 
           {% if include.chrome %}
             {% if include.chrome != "" %}
-              <a href="{{ include.chrome }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.chrome }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -175,7 +185,7 @@
 
           {% if include.safari %}
             {% if include.safari != "" %}
-              <a href="{{ include.safari }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.safari }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -185,7 +195,7 @@
 
           {% if include.opera %}
             {% if include.opera != "" %}
-              <a href="{{ include.opera }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.opera }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -195,7 +205,7 @@
 
           {% if include.edge %}
             {% if include.edge != "" %}
-              <a href="{{ include.edge }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.edge }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -205,7 +215,7 @@
 
           {% if include.fdroid %}
             {% if include.fdroid != "" %}
-              <a href="{{ include.fdroid }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.fdroid }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-f-droid fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -215,7 +225,7 @@
 
           {% if include.googleplay %}
             {% if include.googleplay != "" %}
-              <a href="{{ include.googleplay }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.googleplay }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-google-play fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -225,7 +235,7 @@
 
           {% if include.android %}
             {% if include.android != "" %}
-              <a href="{{ include.android }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.android }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -235,7 +245,7 @@
 
           {% if include.ios %}
             {% if include.ios != "" %}
-              <a href="{{ include.ios }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.ios }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-ios fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -245,7 +255,7 @@
 
           {% if include.sailfish %}
             {% if include.sailfish != "" %}
-              <a href="{{ include.sailfish }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.sailfish }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -255,7 +265,7 @@
 
           {% if include.web %}
             {% if include.web != "" %}
-              <a href="{{ include.web }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.web }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -268,25 +278,25 @@
           {{include.icon3}}
 
           {% if include.github %}
-            <a href="{{include.github}}" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.github}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
               <i class="fab fa-github fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.gitlab %}
-            <a href="{{include.gitlab}}" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.gitlab}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
               <i class="fab fa-gitlab fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.git %}
-            <a href="{{include.git}}" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.git}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
               <i class="fab fa-git-square fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.source %}
-            <a href="{{include.source}}" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.source}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
               <i class="fas fa-code-branch fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}

_includes/footer.html

@@ -6,36 +6,36 @@
 
   <div class="row mb-4">
     <div class="col-12 col-md-6 d-flex justify-content-between">
-      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/" class="share-btn email" title="Email">
+      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body={{ site.production_url }}/" class="share-btn email" title="Email">
         <i class="fas fa-envelope pl-3"></i>
       </a>
 
-      <a href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io" class="share-btn facebook" title="Facebook">
+      <a href="https://www.facebook.com/sharer/sharer.php?u={{ site.production_url }}" class="share-btn facebook" title="Facebook">
         <i class="fab fa-facebook-f pl-3"></i>
       </a>
 
-      <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://www.privacytools.io/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
+      <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url={{ site.production_url }}/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
         <i class="fab fa-twitter pl-3"></i>
       </a>
 
-      <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn mastodon" title="Mastodon">
+      <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url={{ site.production_url }}" class="share-btn mastodon" title="Mastodon">
         <i class="fab fa-mastodon pl-3"></i>
       </a>
     </div>
     <div class="col-12 col-md-6 d-flex justify-content-between">
-      <a href="https://reddit.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
+      <a href="https://reddit.com/submit?url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
         <i class="fab fa-reddit-alien pl-3"></i>
       </a>
 
-      <a href="https://www.linkedin.com/shareArticle?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
+      <a href="https://www.linkedin.com/shareArticle?url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
         <i class="fab fa-linkedin-in pl-3"></i>
       </a>
 
-      <a href="https://mix.com/mixit?su=submit&url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
+      <a href="https://mix.com/mixit?su=submit&url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
         <i class="ptio-mix 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="Diaspora*">
+      <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url={{ site.production_url }}" class="share-btn diaspora" title="Diaspora*">
         <i class="fas fa-asterisk pl-3"></i>
       </a>
     </div>
@@ -44,7 +44,7 @@
   <h3>Copy URL and Description</h3>
 
   <p>
-  <input type="text" value="privacytools.io - encryption against global mass surveillance" onclick="this.focus();this.select()" class="form-control input-lg">
+  <input type="text" value="PrivacyTools - Encryption and tools to protect against global mass surveillance - {{ site.production_url }}" class="form-control input-lg onclick-select">
   <span class="help-block">For easy copy and paste. Share this text snippet.</span>
   </p>
 
@@ -56,13 +56,13 @@
     </div>
 
     <div class="col-sm-4 mb-3 d-flex justify-content-center">
-      <i class="far fa-envelope fa-2x"></i>
-      <a href="/contact/">Contact</a>
+      <i class="far fa-address-card fa-2x"></i>
+      <a href="/about/">About Us &amp; Contact</a>
     </div>
 
     <div class="col-sm-4 mb-3 d-flex justify-content-center">
-      <i class="fas fa-heart fa-2x text-danger"></i>
-      <a data-toggle="tooltip" data-placement="top" data-original-title="Please support this project by donating. We are ad free and not affiliated with any providers. Your donation will cover our cost for server and domain." href="/donate/">Donate</a>
+      <i class="fas fa-donate fa-2x"></i>
+      <a href="/donate/" data-toggle="tooltip" data-placement="top" data-original-title="Please support this project by donating. We are ad-free and not affiliated with any providers. Your donation will cover our costs for servers and domains.">Support Us!</a>
     </div>
   </div>
 
@@ -73,8 +73,8 @@
     </a>
     <p class="mt-2">
       <strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong>
-      <em>privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em>
-      <a href="/privacy-policy/">View our privacy policy</a>.
+      <em>PrivacyTools is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em>
+      <a href="/privacy/">View our privacy statement</a>.
     </p>
     <p class="text-left">
       Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong>

_includes/head.html

@@ -9,21 +9,47 @@
   <meta name="msapplication-TileImage" content="/assets/img/favicons/mstile-144x144.png">
   <meta name="msapplication-config" content="/assets/img/favicons/browserconfig.xml">
   <meta name="theme-color" content="#ffffff">
+  <link rel="canonical" href="{{ site.production_url }}{{ page.url | replace:'index.html',''}}">
 
   <!-- title -->
   {% if page.title %}
-  <title>{{ page.title }} | privacytools.io</title>
-  <meta property="og:title" content="{{ page.title }} | privacytools.io" />
+  <title>{{ page.title }} | {{ site.name }}</title>
+  <meta property="og:title" content="{{ page.title }} | {{ site.name }}" />
   {% else %}
   <title>{{ site.title }}</title>
   <meta property="og:title" content="{{ site.title }}" />
   {% endif %}
   <meta property="og:type" content="website" />
   <meta property="og:url" content="{{ page.permalink | prepend: site.url }}" />
-  <meta property="og:image" content="https://www.privacytools.io/assets/img/layout/ogimage.jpg" />
+  <meta property="og:image" content="{{ site.production_url }}/assets/img/layout/ogimage.jpg" />
   <meta property="og:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}"/>
   <meta property="og:locale" content="en_GB" />
-  <meta property="og:site_name" content="privacytools.io" />
+  <meta property="og:site_name" content="{{ site.name }}" />
+
+  {% if page.url == "/" or page.url == "/about/" %}
+  <script type="application/ld+json">
+  {
+    "@context": "https://schema.org",
+    "@type": "Organization",
+    "name": "{{ site.name }}",
+    "description": "{{ site.description }}",
+    "alternateName": [
+      "privacytools.io",
+      "Privacy Tools",
+      "privacytoolsIO"
+    ],
+    "url": "{{ site.production_url }}",
+    "logo": "{{ site.production_url }}/assets/img/layout/shield.png",
+    "sameAs": [
+      "https://blog.privacytools.io",
+      "https://twitter.com/privacytoolsIO",
+      "https://social.privacytools.io/@privacytools",
+      "https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg",
+      "https://github.com/privacytoolsIO"
+    ]
+  }
+  </script>
+  {% endif %}
 
   <!-- icons -->
   <link rel="apple-touch-icon" sizes="57x57" href="/assets/img/favicons/apple-touch-icon-57x57.png">
@@ -43,6 +69,6 @@
   <link rel="shortcut icon" href="/assets/img/favicons/favicon.ico">
 
   <!-- CSS stylesheets -->
-  <link href="/assets/css/style.css?v=7" rel="stylesheet">
+  <link href="/assets/css/style.css?v=9" rel="stylesheet">
   <link id="dark-css" href="/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)">
 </head>

_includes/nav.html

@@ -1,14 +1,14 @@
-<div class="fixed-top bg-dark">
-  <nav id="navbar">
-
+<nav class="fixed-top bg-dark">
+  <div id="navbar" class="d-flex flex-wrap justify-content-between align-items-center">
+    <div class="w-50">
+      <a id="nav-home-mobile" class="nav-anchor" href="/index.html">
+        <img src="/assets/img/layout/logo_smaller.png" width="150px" />
+      </a>
+    </div>
     <input type="checkbox" id="nav-toggle" checked />
     <label for="nav-toggle" id="nav-toggle-label" class="fas fa-bars fa-lg"></label>
-    <a id="nav-home-mobile" class="nav-anchor" href="/index.html">
-      <img src="/assets/img/layout/logo_smaller.png" width="148px" height="22px" />
-    </a>
-
-    <div class="menu">
 
+    <div class="menu w-100">
       <div id="nav-left" class="position-relative flex-col">
         <a class="nav-anchor" href="/index.html">
           <span id="nav-home" class="fas fa-home fa-fw"></span>
@@ -45,11 +45,11 @@
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a class="dropdown-item" href="/browsers/#addons"><span class="far fa-list-alt fa-fw"></span> Browser Add-ons</a>
-            <a class="dropdown-item" href="/browsers/#fingerprint"><span class="fas fa-fingerprint fa-fw"></span> Fingerprinting Info</a>
-            <a class="dropdown-item" href="/browsers/#about_config"><span class="fas fa-wrench fa-fw"></span> Firefox Tweaks</a>
             <a class="dropdown-item" href="/browsers/#browser"><span class="fas fa-check fa-fw"></span> Recommendation</a>
+            <a class="dropdown-item" href="/browsers/#fingerprint"><span class="fas fa-fingerprint fa-fw"></span> Fingerprinting Info</a>
             <a class="dropdown-item" href="/browsers/#webrtc"><span class="far fa-eye fa-fw"></span> WebRTC IP Leak</a>
+            <a class="dropdown-item" href="/browsers/#addons"><span class="far fa-list-alt fa-fw"></span> Browser Add-ons</a>
+            <a class="dropdown-item" href="/browsers/#about_config"><span class="fas fa-wrench fa-fw"></span> Firefox Tweaks</a>
           </span>
         </details>
 
@@ -87,12 +87,12 @@
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> Android Privacy Add-ons</a>
-            <a class="dropdown-item" href="/operating-systems/#win10"><span class="far fa-thumbs-down fa-fw"></span> Don't use Windows 10</a>
+            <a class="dropdown-item" href="/operating-systems/#os"><span class="fas fa-th-large fa-fw"></span> PC OS</a>
             <a class="dropdown-item" href="/operating-systems/#live_os"><span class="fas fa-compact-disc fa-fw"></span> Live CD OS</a>
             <a class="dropdown-item" href="/operating-systems/#mobile_os"><span class="fas fa-mobile-alt fa-fw"></span> Mobile OS</a>
-            <a class="dropdown-item" href="/operating-systems/#os"><span class="fas fa-th-large fa-fw"></span> PC OS</a>
+            <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> Android Privacy Add-ons</a>
             <a class="dropdown-item" href="/operating-systems/#firmware"><span class="fas fa-signal fa-fw"></span> Router Firmware</a>
+            <a class="dropdown-item" href="/operating-systems/#win10"><span class="far fa-thumbs-down fa-fw"></span> Don't use Windows 10</a>
           </span>
         </details>
 
@@ -101,54 +101,46 @@
 
       <!-- Language -->
       <div id="nav-right">
+
+        <a href="/services/" class="nav-anchor">
+          Services
+        </a>
+        <a href="https://blog.privacytools.io/" class="nav-anchor">
+          Blog
+        </a>
+        <a href="/sponsors/" class="nav-anchor">
+          Sponsors
+        </a>
+        <a href="/about/" class="nav-anchor">
+          About Us
+        </a>
+        <span id="nav-switch-theme" class="nav-anchor">
+          <span class="nav-theme-icon fas fa-fw" aria-hidden="true" title="Theme"></span>
+          <span class="sr-only">Toggle Theme</span>
+        </span>
+
         <details class="nav-details">
           <summary>
             <span class="nav-summary">
-              <span class="fas fa-language text-danger fa-fw"></span>
-              Language
+              <span class="fas fa-language text-danger fa-fw" aria-hidden="true" title="Language"></span>
+              <span class="sr-only">Language Selection</span>
               <span class="dropdown-toggle"></span>
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a href="https://privacytools.io/" class="dropdown-item">English</a>
-            <a href="https://privacytools.twngo.xyz/" class="dropdown-item">繁體中文</a>
-            <a href="https://victorhck.gitlab.io/privacytools-es/" class="dropdown-item">Español</a>
-            <a href="https://pl.privacytools.io/" class="dropdown-item">Polski</a>
-            <a href="https://www.privacidade.digital/" class="dropdown-item">Português</a>
-            <a href="https://privacytools.it-sec.rocks/" class="dropdown-item">Deutsch</a>
-            <a href="https://privacytools-it.github.io/" class="dropdown-item">Italiano</a>
-            <a href="https://privacytools.ru" class="dropdown-item">Русский</a>
-            <a href="https://privacytools.dreads-unlock.fr" class="dropdown-item">Français</a>
+            <a href="https://www.privacytools.io/" class="dropdown-item">English</a>
+            <a href="https://privacytools.twngo.xyz/" rel="nofollow noopener" class="dropdown-item">繁體中文</a>
+            <a href="https://victorhck.gitlab.io/privacytools-es/" rel="nofollow noopener" class="dropdown-item">Español</a>
+            <a href="https://pl.privacytools.io/" rel="nofollow noopener" class="dropdown-item">Polski</a>
+            <a href="https://www.privacidade.digital/" rel="nofollow noopener" class="dropdown-item">Português</a>
+            <a href="https://privacytools.it-sec.rocks/" rel="nofollow noopener" class="dropdown-item">Deutsch</a>
+            <a href="https://privacytools-it.github.io/" rel="nofollow noopener" class="dropdown-item">Italiano</a>
+            <a href="https://privacytools.ru" rel="nofollow noopener" class="dropdown-item">Русский</a>
+            <a href="https://privacytools.dreads-unlock.fr" rel="nofollow noopener" class="dropdown-item">Français</a>
           </span>
         </details>
 
-        <!-- Services -->
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              Services
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a class="dropdown-item" href="https://forum.privacytools.io/"><span class="fab fa-discourse fa-fw"></span> Discourse - Forum</a>
-            <a class="dropdown-item" href="https://git.privacytools.io/"><span class="fab fa-git fa-fw"></span> Gitea - Git-Repository Manager</a>
-            <a class="dropdown-item" href="https://social.privacytools.io/"><span class="fas fa-retweet fa-fw"></span> Mastodon - Social Network</a>
-            <a class="dropdown-item" href="https://chat.privacytools.io/"><span class="fas fa-comment fa-fw"></span> Matrix - Federated Chat</a>
-            <a class="dropdown-item" href="https://bin.privacytools.io/"><span class="fas fa-clipboard fa-fw"></span> PrivateBin - Encrypted Pastebin</a>
-            <a class="dropdown-item" href="https://search.privacytools.io/"><span class="fas fa-search fa-fw"></span> Searx - Privacy Friendly Search</a>
-            <a class="dropdown-item" href="https://write.privacytools.io/"><span class="fas fa-pen-alt fa-fw"></span> Write Freely - Federated Blog</a>
-          </span>
-        </details>
-
-        <a href="https://blog.privacytools.io/" class="nav-anchor">Blog </a>
-        <a href="/donate/" class="nav-anchor">
-          Donate <span class="fas fa-heart text-danger fa-fw"></span>
-        </a>
-        <a id="nav-switch-theme" class="nav-anchor" href="javascript:void(0)" onClick="changeColorScheme()">
-          Theme <span class="nav-theme-icon fas fa-fw"></span>
-        </a>
       </div>
     </div>
-  </nav>
-</div>
+  </div>
+</nav>

_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=4"></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/browser-addons.html

@@ -7,7 +7,7 @@
 {% include cardv2.html
 title="uBlock Origin: Block Ads and Trackers"
 image="/assets/img/addons/ublock-origin.png"
-description="<strong>uBlock Origin</strong> is an efficient <a href=https://github.com/gorhill/uBlock/wiki/Blocking-mode>wide-spectrum-blocker</a> that's easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source."
+description="<strong>uBlock Origin</strong> is an efficient <a href=https://github.com/gorhill/uBlock/wiki/Blocking-mode>wide-spectrum blocker</a> that's easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source."
 website="https://addons.mozilla.org/firefox/addon/ublock-origin/"
 forum="https://forum.privacytools.io/t/discussion-ublock-origin/266"
 github="https://github.com/gorhill/uBlock/"
@@ -43,7 +43,7 @@ opera="https://addons.opera.com/en/extensions/details/https-everywhere"
 {% include cardv2.html
 title="Decentraleyes: Block Content Delivery Networks"
 image="/assets/img/addons/decentraleyes.png"
-description="<strong>Decentraleyes</strong> emulates Content Delivery Networks locally by intercepting requests, finding the required resource and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required."
+description="<strong>Decentraleyes</strong> emulates Content Delivery Networks locally by intercepting requests, finding the required resource, and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required."
 website="https://decentraleyes.org/"
 forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
 gitlab="https://git.synz.io/Synzvato/decentraleyes"
@@ -55,7 +55,7 @@ opera="https://addons.opera.com/en/extensions/details/decentraleyes"
 {% include cardv2.html
 title="Terms of Service; Didn’t Read: Be Informed"
 image="/assets/img/addons/tosdr.png"
-description="<strong>Terms of Service; Didn’t Read</strong> “I have read and agree to the Terms” is the biggest lie on the web. This addon aims to fix that by grading websites based on their Terms of Service agreements and gives short summaries."
+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."
 website="https://tosdr.org/"
 forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270"
 github="https://github.com/tosdr/"

_includes/sections/browser-fingerprint.html

@@ -12,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>
 
@@ -27,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

@@ -6,7 +6,7 @@
 {% 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
+description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
 recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a href="#about_config"><i class="fas fa-link"></i> about:config</a> and get the <a href="#addons"><i class="fas fa-link"></i> privacy add-ons</a>.'
 website="https://firefox.com"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
@@ -22,7 +22,7 @@ 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>'
+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"
@@ -40,7 +40,7 @@ linux="https://www.torproject.org/download/"
 {% 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
+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"
@@ -79,7 +79,7 @@ android="https://www.bromite.org/#download-bromite"
 <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>
+   - 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>
@@ -95,7 +95,7 @@ android="https://www.bromite.org/#download-bromite"
 {% 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.'
+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"
@@ -106,7 +106,7 @@ 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.'
+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"
@@ -117,7 +117,7 @@ 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.'
+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"
@@ -130,6 +130,6 @@ ios="https://apps.apple.com/us/app/duckduckgo-privacy-browser/id663592361"
 <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.
+        - 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

@@ -115,6 +115,7 @@
 <h3>Related Information</h3>
 
 <ul>
+  <li><a href="https://blog.privacytools.io/firefox-privacy-an-introduction-to-safe/">Firefox Privacy: Tips and Tricks for Better Browsing</a> - A good starting guide for users looking to keep their data private and secure.</li>
   <li><a href="https://ffprofile.com/">ffprofile.com</a> - Helps you to create a Firefox profile with the defaults you like.</li>
   <li><a href="http://kb.mozillazine.org/Category:Security_and_privacy-related_preferences">mozillazine.org</a> - Security and privacy-related preferences. </li>
   <li><a href="https://addons.mozilla.org/firefox/addon/privacy-settings/">Privacy Settings</a> - A Firefox add-on to alter built-in privacy settings easily with a toolbar panel.</li>

_includes/sections/browser-webrtc.html

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

_includes/sections/calendar-contacts-sync.html

@@ -26,7 +26,7 @@
   include cardv2.html
   title="Email Providers"
   image="/assets/img/misc/email.png"
-  description='Many email providers also offer calendar and or contacts sync services. Refer to the <a href="/providers/email">Email Providers section</a> to choose an email provider and check if they also offer calendar and or contacts sync.'
+  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"
 %}
 
@@ -34,26 +34,30 @@
   include cardv2.html
   title="EteSync"
   image="/assets/img/provider/etesync.png"
-  description="<strong>EteSync</strong> is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free."
+  description="<strong>EteSync</strong> is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information (e.g. contacts and calendars). There are native clients for Android, iOS, and the web, and an adapter layer for most desktop clients. It costs $24 per year to use, or you can host the server yourself for free."
   website="https://www.etesync.com/"
   forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536"
   github="https://github.com/etesync"
   web="https://client.etesync.com/"
-  windows="https://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"
+  windows="https://www.etesync.com/install/dav/"
+  mac="https://www.etesync.com/install/dav/"
+  linux="https://www.etesync.com/install/dav/"
+  freebsd="https://www.etesync.com/install/dav/"
+  openbsd="https://www.etesync.com/install/dav/"
+  netbsd="https://www.etesync.com/install/dav/"
   fdroid="https://f-droid.org/packages/com.etesync.syncadapter/"
   googleplay="https://play.google.com/store/apps/details?id=com.etesync.syncadapter"
+  ios="https://www.etesync.com/install/ios/"
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
   <li>
-    <a href="https://fruux.com/">fruux</a> - a unified contacts/calendaring system that works across platforms and devices.
+    <a href="https://fruux.com/">fruux</a> - A unified contacts/calendaring system that works across platforms and devices.
   </li>
 
   <li>
-    <a href="../cloud">cloud backups</a> - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/">encrypting</a> them).
+    <a href="../cloud">cloud backups</a> - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/">encrypting</a> them).
   </li>
 </ul>

_includes/sections/cloud-storage.html

@@ -7,7 +7,7 @@
 {% 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"
@@ -22,22 +22,10 @@ fdroid="https://f-droid.org/packages/com.nextcloud.client/"
 googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
 %}
 
-{% include cardv2.html
-title="Least Authority S4 - For Experts"
-image="/assets/img/provider/S4.png"
-description="S4 (Simple Secure Storage Service) is Least Authority's verifiably secure off-site backup system for individuals and businesses. 100% client-side encryption and open source transparency. 250GB for $9.95/month or 5TB for $25.95/month. Servers are hosted with Amazon S3 in the US."
-website="https://leastauthority.com/"
-forum="https://forum.privacytools.io/t/discussion-least-authority-s4/288"
-github="https://github.com/LeastAuthority"
-windows="https://github.com/gridsync/gridsync#installation-and-running"
-mac="https://github.com/gridsync/gridsync#installation-and-running"
-linux="https://github.com/gridsync/gridsync#installation-and-running"
-%}
-
 
 <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. <span class="badge badge-warning" data-toggle="tooltip" title="Cryptomator's mobile apps are not open-source."><a href="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"><i class="fas fa-exclamation-triangle"></i></a></span></li>
   <li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li>
 </ul>

_includes/sections/dns.html

@@ -4,7 +4,7 @@
   include cardv2.html
   title="Njalla - Domain Registration"
   image="/assets/img/provider/Njalla.png"
-  description="Njalla only needs your email or XMPP address in order to register a domain name for you. Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service."
+  description="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"
@@ -98,16 +98,16 @@
         </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 class="flag-icon flag-icon-fi"></span>
+            Finland,
           </span>
           <span class="no-text-wrap">
             <span class="flag-icon flag-icon-de"></span>
-            Germany
+            Germany,
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-jp"></span>
+            Japan
           </span>
         </td>
         <td>
@@ -134,7 +134,7 @@
           </span>
           <span class="no-text-wrap">
             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>
+            <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>

_includes/sections/email-alternatives.html

@@ -4,7 +4,7 @@
 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"
@@ -16,7 +16,7 @@ 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"

_includes/sections/email-providers.html

@@ -255,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,7 +1,7 @@
 <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>
 
 {%
@@ -21,7 +21,7 @@
   include cardv2.html
   title="GNU Privacy Guard - Email Encryption"
   image="/assets/img/tools/GnuPG.png"
-  description="<strong>GnuPG</strong> is a GPL Licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German government."
+  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"
@@ -39,7 +39,7 @@
   include cardv2.html
   title="PeaZip - File Archive Encryption"
   image="/assets/img/tools/PeaZip.png"
-  description="<strong>PeaZip</strong> is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 180+ archive formats."
+  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"
@@ -53,8 +53,7 @@
 <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://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://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. <span class="badge badge-warning" data-toggle="tooltip" title="Cryptomator's mobile apps are not open-source."><a href="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"><i class="fas fa-exclamation-triangle"></i></a></span></li></li>
   <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>

_includes/sections/file-sharing.html

@@ -4,7 +4,7 @@
 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="https://send.firefox.com/"
@@ -16,7 +16,7 @@ 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="https://onionshare.org/#downloads"
@@ -30,7 +30,7 @@ openbsd="http://openports.se/net/onionshare"
 title="Magic Wormhole"
 image="/assets/img/tools/Magic-Wormhole.png"
 website="https://magic-wormhole.readthedocs.io"
-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."
+description="Magic Wormhole is a package that provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. Their motto: \"Get things from one computer to another, safely.\""
 forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756"
 github="https://github.com/warner/magic-wormhole"
 windows="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
@@ -45,5 +45,5 @@ netbsd="https://pypi.org/project/magic-wormhole/"
 
 <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>
+  <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/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,11 +1,15 @@
+<div class="alert alert-success" role="alert">
+  <strong>New!</strong> Financial <a href="https://opencollective.com/privacytoolsio" class="alert-link">contributions</a> to PrivacyTools are now tax deductible in the US! <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="alert-link">Learn more...</a>
+</div>
+
 <div class="jumbotron p-5">
-  <h1 class="display-4"><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">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. privacytools.io provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
+  <h1 class="display-4"><a href="{{ site.production_url }}" title="PrivacyTools"><img src="/assets/img/layout/logo.png" width="600" height="88" class="img-fluid" alt="PrivacyTools"></a></h1>
+  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. PrivacyTools provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
 </div>
 
 <form method="POST" action="https://search.privacytools.io/" id="search_form" role="search">
 <div class="input-group col-12 col-md-8 offset-md-2">
-<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try search.privacytools.io, a Privacy-Respecting Search Engine" autocomplete="off" value="">
+<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try PrivacyTools Search, a Privacy-Respecting Search Engine" autocomplete="off" value="">
 <span class="input-group-btn">
 <button type="submit" class="btn btn-primary input-lg"><span class="hide_if_nojs"><i class="fas fa-search"></i> </span><span class="hidden active_if_nojs">start search</span></button>
 </span>

_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

@@ -22,24 +22,6 @@ 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."
-labels="warning:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text>Warning</a>:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.|success:VoIP"
-website="https://wire.com/"
-forum="https://forum.privacytools.io/t/discussion-wire/750"
-github="https://github.com/wireapp/"
-windows="https://wire.com/en/download"
-mac="https://wire.com/en/download"
-linux="https://wire.com/en/download"
-googleplay="https://play.google.com/store/apps/details?id=com.wire"
-android="https://wire.com/en/download"
-ios="https://itunes.apple.com/app/wire/id930944768?mt=8"
-web="https://app.wire.com"
-%}
-
 <h3>Complete Comparison</h3>
 <ul>
 	<li><a href="https://securechatguide.org/effguide.html">securechatguide.org</a> - Guide to Choosing a Messenger.</li>
@@ -51,20 +33,21 @@ web="https://app.wire.com"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.
-  <li><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>
 
 
@@ -76,8 +59,6 @@ web="https://app.wire.com"
   <li>Independent security audits</li>
   <ul>
     <li><a href="https://eprint.iacr.org/2016/1013.pdf">A Formal Security Analysis of the Signal Messaging Protocol (2019)</a> by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila</li>
-    <li><a href="https://wire.com/en/security/#audits">Independent security audits</a> on Wire's website</li>
     <li><a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a></li>
   </ul>
 </ul>
-

_includes/sections/key-disclosure-law.html

@@ -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

@@ -3,7 +3,7 @@
 {% include cardv2.html
 title="Tails"
 image="/assets/img/tools/Tails.png"
-description='Tails is a live operating system, that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and helps to: Use the Internet anonymously and circumvent censorship; Internet connections go through the Tor network; leave no trace on the computer; use state-of-the-art cryptographic tools to encrypt files, emails and instant messaging.'
+description='Tails is a live operating system that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.'
 badges="info:GNU/Linux"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://tails.boum.org/"

_includes/sections/mobile-operating-systems.html

@@ -8,7 +8,7 @@
 title="GrapheneOS"
 image="/assets/img/tools/GrapheneOS.png"
 image-dark="/assets/img/tools/GrapheneOS-dark.png"
-description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security and privacy focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
+description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
 badges="info:AOSP"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://grapheneos.org/"
@@ -39,6 +39,6 @@ github="https://github.com/ubports"
 
 <ul>
   <li><a href="https://www.replicant.us/">Replicant</a> <span class="badge badge-info">AOSP</span> - An open-source operating system based on Android, aiming to replace all proprietary components with free software.</li>
-  <li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
+  <li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free-software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
   <li><a href="https://microg.org/">MicroG</a> <span class="badge badge-info">Add-on Package</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at <a href="https://lineage.microg.org/">Lineage for microG</a>.</li>
 </ul>

_includes/sections/notebooks.html

@@ -1,13 +1,13 @@
 <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="https://joplinapp.org/#desktop-applications"
@@ -61,6 +61,6 @@ chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheih
 
 <ul>
   <li><a href="https://github.com/notable/notable">Notable</a> - The markdown-based note-taking app that doesn't suck.</li>
-  <li><a href="https://paperwork.cloud/">Paperwork</a> - 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

@@ -75,6 +75,7 @@ gitlab="https://salsa.debian.org/qa/debsources"
 <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>

_includes/sections/participate.html

@@ -2,7 +2,7 @@
   <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> Participate with suggestions and constructive criticism</h1>
 </div>
 
-<p>It's important for a website like privacytools.io to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a rel="me" href="https://social.privacytools.io/@privacytools">our own Mastodon instance</a> or on <a href="https://chat.privacytools.io">Matrix</a> at <code class="highlighter-rouge">#general:privacytools.io</code>.</p>
+<p>It's important for a website like PrivacyTools to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a rel="me" href="https://social.privacytools.io/@privacytools">our own Mastodon instance</a> or on <a href="https://chat.privacytools.io">Matrix</a> at <code class="highlighter-rouge">#general:privacytools.io</code>.</p>
 
 <div class="row">
 

_includes/sections/password-managers.html

@@ -8,7 +8,7 @@
   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"
@@ -53,7 +53,7 @@
   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/lesspass/lesspass"
@@ -71,7 +71,7 @@
 
 <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,7 +3,7 @@
 {% 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."
+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/productivity-tools.html

@@ -4,7 +4,7 @@
   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."
+  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"
@@ -16,7 +16,7 @@
   title="Etherpad"
   image="/assets/img/tools/Etherpad.png"
   image-dark="/assets/img/tools/Etherpad-dark.png"
-  description="<strong>Etherpad</strong> is a highly customizable open source online editor providing collaborative editing in real-time. <a href=https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad>Here are a list of sites that run Etherpad</a>."
+  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"
@@ -54,9 +54,9 @@
   <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
   <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
   <li><a href="https://disroot.org/">Disroot</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
-  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
-  <li><a href="https://framadate.org/">Framadate</a> - A free and open source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
-  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite.</li>
+  <li><a href="https://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>
 

_includes/sections/resources.html

@@ -33,15 +33,15 @@
   icon="fas fa-desktop"
   iconcolor="dark"
   page="/operating-systems/"
-  description="Find out how your operating system is comprimising your privacy, and what simple alternatives exist."
+  description="Find out how your operating system is compromising your privacy, and what simple alternatives exist."
   %}
 
   {% include card.html color="secondary"
-  title="privacytoolsIO Services"
+  title="PrivacyTools Services"
   icon="far fa-eye-slash"
   iconcolor="dark"
   page="/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!"
+  description="The PrivacyTools team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!"
   %}
 
   {% include card.html color="danger"

_includes/sections/router-firmware.html

@@ -33,5 +33,5 @@ git="https://gogs.librecmc.org/libreCMC/libreCMC"
 
 <ul>
   <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
-  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
+  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A Linux-based open-source firmware compatible with several models of routers and access points.</li>
 </ul>

_includes/sections/search-engines.html

@@ -1,31 +1,23 @@
 <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. There is a <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">list of public instances</a>, or you can try <a href="https://search.privacytools.io/">the PrivacyTools Search</a>'
 website="https://searx.me/"
 tor="http://ulrn6sryqaifefld.onion"
 forum="https://forum.privacytools.io/t/discussion-searx/283"
 github="https://github.com/asciimoo/searx"
 %}
 
-{% include cardv2.html
-title="StartPage - Netherlands"
-image="/assets/img/provider/StartPage.png"
-description="Google search results, with complete privacy protection. Behind StartPage is a European company that has been obsessive about privacy since 2006."
-website="https://www.startpage.com/"
-forum="https://forum.privacytools.io/t/discussion-startpage/284"
-%}
-
 {% include cardv2.html
 title="DuckDuckGo - USA"
 image="/assets/img/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 +27,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 +46,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

@@ -4,37 +4,59 @@
   <strong>If you are currently browsing <a href="https://en.wikipedia.org/wiki/Surface_Web">clearnet</a> and want to access the <a href="https://en.wikipedia.org/wiki/Dark_web">dark web</a>, this section is for you.</strong>
 </div>
 
-<div class="row mb-2">
+{% include cardv2.html
+title="Tor"
+image="/assets/img/tools/Tor-Project.png"
+description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool."
+website="https://www.torproject.org/"
+tor="http://expyuzz4wqqyqhjn.onion"
+forum="https://forum.privacytools.io/t/discussion-tor/1589"
+windows="https://www.torproject.org/download/"
+mac="https://www.torproject.org/download/"
+linux="https://www.torproject.org/download/"
+freebsd="https://www.freshports.org/security/tor"
+openbsd="http://openports.se/net/tor"
+netbsd="http://pkgsrc.se/net/tor"
+fdroid="https://support.torproject.org/tormobile/tormobile-7/"
+googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
+android="https://www.torproject.org/download/#android"
+git="https://gitweb.torproject.org/tor.git"
+%}
 
-  {% include card.html color="success"
-  title="Tor"
-  image="/assets/img/tools/Tor-Project.png"
-  url="https://www.torproject.org/"
-  tor="http://expyuzz4wqqyqhjn.onion"
-  footer='OS: Windows, macOS, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, Android (<a href="https://www.torproject.org/download/#android">Tor Browser</a>, <a href="https://guardianproject.info/apps/orbot/">Proxy other apps with Orbot</a>), <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a>'
-  description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool."
-  %}
+{% include cardv2.html
+title="I2P Anonymous Network"
+image="/assets/img/tools/I2P.png"
+image-dark="/assets/img/tools/I2P-dark.png"
+description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous Web surfing, chatting, blogging, and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open-source and is published under multiple licenses."
+website="https://geti2p.net/"
+forum="https://forum.privacytools.io/t/discussion-i2p/1590"
+i2p="http://i2p-projekt.i2p/"
+windows="https://geti2p.net/en/download#windows"
+mac="https://geti2p.net/en/download#mac"
+linux="https://geti2p.net/en/download#unix"
+freebsd="https://www.freshports.org/security/i2p/"
+openbsd="http://openports.se/net/i2pd"
+netbsd="http://pkgsrc.se/wip/i2pd"
+fdroid="https://f-droid.org/app/net.i2p.android.router"
+googleplay="https://play.google.com/store/apps/details?id=net.i2p.android"
+android="https://download.i2p2.de/android/current/"
+source="https://geti2p.net/en/get-involved/guides/new-developers#getting-the-i2p-code"
+%}
 
-  {% include card.html color="primary"
-  title="I2P Anonymous Network"
-  image="/assets/img/tools/I2P.png"
-  url="https://geti2p.net/"
-  footer="OS: Windows, macOS, Linux, Android, BSD / Solaris."
-  description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous
-  Web surfing, chatting, blogging and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open source and is published under multiple licenses."
-  %}
-
-  {% include card.html color="warning"
-  title="The Freenet Project"
-  image="/assets/img/tools/Freenet.png"
-  url="https://freenetproject.org/"
-  footer="OS: Windows, macOS, Linux."
-  description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and
-  has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech
-  on the Internet with strong anonymity protection."
-  %}
-
-</div>
+{% include cardv2.html
+title="The Freenet Project"
+image="/assets/img/tools/Freenet.png"
+description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech on the Internet with strong anonymity protection."
+website="https://freenetproject.org/"
+forum="https://forum.privacytools.io/t/discussion-freenet/1591"
+windows="https://freenetproject.org/pages/download.html#windows"
+mac="https://freenetproject.org/pages/download.html#os-x"
+linux="https://freenetproject.org/pages/download.html#gnulinux-posix"
+freebsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
+openbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
+netbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
+github="https://github.com/freenet/"
+%}
 
 <h3>Related Information</h3>
 
@@ -45,8 +67,8 @@
 <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. <span class="badge badge-danger" data-toggle="tooltip" title="Your IP address isn't hidden by default and won't be, unless you enforce Tor usage.">privacy warning <span class="far fa-question-circle"></span></span></li>
+  <li><a href="https://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> <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="">
@@ -54,5 +76,5 @@
         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>
+  <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

@@ -7,7 +7,7 @@
 {% include cardv2.html
 title="Nextcloud"
 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"
 windows="https://nextcloud.com/install/#install-clients"
@@ -28,7 +28,7 @@ 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."
+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"
@@ -38,5 +38,5 @@ 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,7 +7,7 @@
 {% 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"
@@ -51,7 +51,7 @@ 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>'
+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"
@@ -61,7 +61,7 @@ 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"
 gitlab="https://git.gnu.io/gnu/gnu-social/"
@@ -70,8 +70,8 @@ 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,7 +7,7 @@
 {% 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.'
+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"
@@ -40,6 +40,6 @@ web="https://raddle.me"
 
 <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

@@ -4,12 +4,30 @@
         <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="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="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."
+  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/"
@@ -39,12 +57,4 @@
   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"
-  web="https://keybase.io/"
 %}
-
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">Wire Pro</a> - Paid team communication with E2EE. <span class="badge badge-warning" data-toggle="tooltip" title="While the free edition of Wire is a recommended platform, we have not tested the Pro edition.">Untested <i class="far fa-question-circle"></i></span></li>
-</ul>

_includes/sections/voice-video-messenger.html

@@ -8,7 +8,7 @@
 title="Linphone"
 image="/assets/img/tools/Linphone.png"
 website="https://www.linphone.org/"
-description="Linphone is an open source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication."
+description="Linphone is an open-source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication."
 forum="https://forum.privacytools.io/t/discussion-linphone/751"
 github="https://github.com/BelledonneCommunications"
 windows="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
@@ -23,7 +23,7 @@ ios="https://itunes.apple.com/us/app/linphone/id360065638?mt=8"
 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="https://www.mumble.info/downloads"
@@ -36,7 +36,7 @@ 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>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
 </div>
 
-<img src="/assets/img/layout/Windows-10-Privacy.png" width="367" height="369" class="img-fluid float-right" alt="Windows 10 Privacy" 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="Windows 10 Privacy">
 
 <ol>
   <li><strong>Data syncing is by default enabled.</strong>
@@ -80,7 +80,7 @@
 <h3>Related Information</h3>
 
 <ul>
-  <li><a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement</a> - Microsoft collects, uses and discloses personal information as described here. This allows 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>

_includes/team.html

@@ -0,0 +1,51 @@
+<div class="col-12 col-sm-6 col-lg-4 col-xl-3">
+  <div class="card mb-3 mx-4 mx-sm-0" itemscope itemtype="http://schema.org/Person">
+    <img src="{{ site.baseurl }}/assets/img/team/{{ include.avatar }}" class="card-img-top" itemprop="image" alt="{% if include.nick %}{{ include.nick }}{% else %}{{ include.name }}{% endif %}">
+    <div class="card-body">
+
+      <h5 class="card-title mt-0" itemprop="name">
+      {% if include.nick %}
+        {{ include.nick }}</h5>
+      <meta itemprop="alternateName" content="{{ include.name }}" />
+      {% else %}
+        {{ include.name }}</h5>
+      {% endif %}
+
+      <meta itemprop="affiliation" content="PrivacyTools" />
+      <h6 class="card-subtitle mb-2 text-muted" itemprop="jobTitle">{{ include.role | default: "Contributor" }}</h6>
+      <p class="card-text" {% if include.bio %}itemprop="description"{% endif %}>{{ include.bio | default: "<i>Hmm, this user hasn't written a bio quite yet :(</i>" }}</p>
+      <div class="mx-n2">
+        {% if include.email %}
+        <a href="mailto:{{ include.email }}" aria-label="Email" class="mx-2 text-decoration-none" itemprop="email">
+          <i class="fas fa-envelope" aria-hidden="true" title="{{ include.email }}"></i>
+        </a>
+        {% endif %}
+        {% if include.website %}
+        <a href="{{ include.website }}" aria-label="Website" class="mx-2 text-decoration-none" itemprop="url">
+          <i class="fas fa-link" aria-hidden="true" title="Website"></i>
+        </a>
+        {% endif %}
+        {% if include.keys %}
+        <a href="{{ include.keys }}" aria-label="Keys" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fas fa-key" aria-hidden="true" title="Keys"></i>
+        </a>
+        {% endif %}
+        {% if include.mastodon %}
+        <a href="{{ include.mastodon }}" aria-label="Mastodon" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fab fa-mastodon" aria-hidden="true" title="Mastodon Profile"></i>
+        </a>
+        {% endif %}
+        {% if include.twitter %}
+        <a href="https://twitter.com/{{ include.twitter }}" aria-label="Twitter" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fab fa-twitter" aria-hidden="true" title="Twitter Profile"></i>
+        </a>
+        {% endif %}
+        {% if include.blog %}
+        <a href="https://blog.privacytools.io/author/{{ include.blog }}" aria-label="Blog" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fas fa-pen-nib" aria-hidden="true" title="PrivacyTools Blog Author"></i>
+        </a>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</div>

_layouts/page.html

@@ -2,6 +2,8 @@
 layout: default
 ---
 
+{% include breadcrumbs.html %}
+
 <div class="jumbotron p-5">
   <h1 class="display-4">{{ page.title }}</h1>
   {% if page.description and page.hidedesc != true %}<p class="lead">{{ page.description }}</p>{% endif %}

_sass/_vars.scss

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

_sass/ptio-font.scss

@@ -25,13 +25,15 @@
 
 [data-icon]:before,
 .ptio-f-droid:before,
+.ptio-i2p-garlic:before,
 .ptio-ios:before,
 .ptio-linux:before,
 .ptio-macos:before,
 .ptio-mix:before,
 .ptio-netbsd:before,
 .ptio-openbsd:before,
-.ptio-sailfish-os:before {
+.ptio-sailfish-os:before,
+.ptio-tor:before {
   display: inline-block;
   font-family: "ptio-font";
   font-style: normal;
@@ -47,6 +49,7 @@
 }
 
 .ptio-f-droid:before { content: "\f100"; }
+.ptio-i2p-garlic:before { content: "\f10c"; }
 .ptio-ios:before { content: "\f101"; }
 .ptio-linux:before { content: "\f102"; }
 .ptio-macos:before { content: "\f103"; }
@@ -54,3 +57,4 @@
 .ptio-netbsd:before { content: "\f104"; }
 .ptio-openbsd:before { content: "\f105"; }
 .ptio-sailfish-os:before { content: "\f106"; }
+.ptio-tor:before { content: "\f10b"; }

assets/css/dark.scss

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

assets/css/style.scss

@@ -127,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;
@@ -199,6 +203,39 @@ footer {
 }
 
 
+.btn-icon {
+  font-size: 1.5rem;
+  padding: 0.5rem;
+  border-radius: 0.25rem;
+  display: flex;
+  height: 2.4rem;
+  color: #ddd;
+}
+
+.btn-tor {
+  background: $tor;
+}
+.btn-tor:hover {
+  background: darken($tor, 5%);
+}
+
+
+
+/*
+ * Bootstrap 4.2+ features
+ */
+
+.text-decoration-none {
+  text-decoration: none !important;
+}
+
+.mx-n2 {
+  margin-left: -0.5rem;
+  margin-right: -0.5rem;
+}
+
+
+
 /*
  * Navbar
  */
@@ -291,6 +328,7 @@ input#nav-toggle,
   /* We will make it visible with JavaScript
    * as it does not work without it */
   display: none;
+  cursor: pointer;
 }
 
 /*
@@ -318,8 +356,7 @@ input#nav-toggle,
   input#nav-toggle + label {
     display: block;
     cursor: pointer;
-    margin-top: 0.25rem;
-    float: right;
+    margin-bottom: 0;
   }
   .nav-dropdown {
     display: block;

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");
@@ -30,6 +34,7 @@ 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
@@ -96,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

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

@@ -1,11 +1,11 @@
 <?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)
+2019-11-6: 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
+Created by FontForge 20190801 at Wed Nov  6 20:45:23 2019
  By Dawid Potocki
 
 </metadata>
@@ -19,10 +19,10 @@ Created by FontForge 20190801 at Sun Sep 22 19:49:38 2019
     panose-1="2 0 5 3 0 0 0 0 0 0"
     ascent="448"
     descent="-64"
-    bbox="-0.00195312 -64.0039 512.014 448"
+    bbox="-0.00195312 -64.0049 512.014 448"
     underline-thickness="25.6"
     underline-position="-51.2"
-    unicode-range="U+0020-F107"
+    unicode-range="U+0020-F10C"
   />
     <missing-glyph />
     <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
@@ -38,6 +38,19 @@ c-18.7656 0 -33.8721 15.1074 -33.8721 33.873v225.816c0 18.7656 15.1064 33.873 33
 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="i2p-garlic" unicode="&#xf10c;" 
+d="M385.84 18.6582l-0.000976562 -0.00488281c-10.4199 -5.89355 -73.4902 -33.2764 -44.791 -6.45703c3.48438 3.22852 6.81641 6.71289 9.97656 10.4541c51.6914 61.166 32.2188 140.886 4.47559 206.979c-3.36523 8.01172 -26.1191 61.8398 -29.502 70.9287
+c-13.9043 37.2402 -18.3809 64.8633 -16.6553 65.7344c8.88184 4.49219 19.2695 -45.4238 58.7305 -103.231c31.3477 -45.9014 75.2158 -77.5205 72.0557 -147.1c0 -47.5068 -20.7559 -78.376 -54.2891 -97.3037zM233.802 -24.5605
+c-1.60645 -1.00781 -3.29688 -2.01562 -5.02246 -3.02344c-15.2559 -8.78125 -28.835 -13.8203 -30.3564 -11.1895c-1.50293 2.61328 9.63477 11.8721 24.8896 20.6875c11.958 6.90137 15.0322 4.27148 32.0303 4.40723c14.2979 0.120117 20.5166 3.00684 33.3633 -4.40723
+c15.2559 -8.79688 26.3926 -18.0732 24.8896 -20.6875c-1.52051 -2.61426 -15.1016 2.3916 -30.3564 11.2061c-2.08398 1.19629 -4.09961 2.42578 -6.0127 3.62207c12.7266 -15.1699 20.4824 -28.3242 17.8184 -30.7158c-2.81934 -2.51074 -16.332 7.89258 -30.9209 23.6426
+c-0.921875 -18.8936 -3.96289 -33.0205 -7.44824 -32.9863c-3.62109 0.0351562 -6.49121 15.4092 -6.90137 35.5488c-15.4766 -17.168 -30.2695 -28.8525 -33.2598 -26.2051c-2.64746 2.375 4.86914 15.1865 17.2881 30.1006h-0.000976562zM227.635 436.466
+c4.16797 19.2012 14.9131 13.0342 14.0244 -8.33594c-1.70801 -41.2725 -4.56152 -74.8574 -8.14844 -103.01c12.0088 38.1455 23.3691 73.4902 28.8525 102.258c5.79102 30.4238 21.3369 5.1416 22.1914 -24.1895c13.3242 -88.4365 34.3018 -138.394 51.2139 -178.671
+c14.8965 -35.4805 26.5635 -66.1436 26.5635 -106.46v2.78418h0.015625c0 -45.9189 -15.5117 -78.2227 -37.8389 -98.9609c-9.75391 -9.07031 -20.8574 -15.9893 -32.5254 -20.8574c-15.375 -6.44043 -25.7607 -10.2324 -39.957 0.0146484
+c-3.41602 2.49414 -6.76465 5.51758 -9.95898 9.13965c-36.7441 29.9121 -49.6592 72.6523 -49.6426 120.57c-0.273438 -4.71484 -0.410156 -9.61719 -0.410156 -14.7422c0 -18.9277 1.60547 -35.8398 4.47559 -50.7021c4.13379 -21.5068 10.4551 -39.0859 19.2871 -52
+c14.1953 -20.7383 13.7168 -19.082 -16.4854 -13.8369c-4.45801 0.768555 -8.64355 2.4082 -12.8125 3.79199c-30.9199 10.3008 -67.4092 25.8975 -94.1084 47.9004c8.2334 -12.334 18.4658 -23.335 30.0996 -33.1572c16.5869 -13.9746 17.3389 -18.126 -12.8809 -6.9873
+c-60.0625 22.1055 -101.113 62.1309 -90.6758 135.181c7.96094 55.793 48.1221 78.001 85.4658 112.815c82.5947 77.0947 39.666 23.5918 -3.10938 -31.4834c-13.1709 -16.9287 -22.0537 -35.3447 -26.8711 -56.9873c31.9102 46.7725 94.7236 99.2676 125.626 183.71
+c11.9238 22.2588 20.4492 49.2676 27.6055 82.2197zM406.985 251.055c42.6221 -31.501 78.4102 -58.9531 86.0801 -104.871c6.71387 -40.2646 -7.49902 -72.8242 -34.917 -97.0469c-12.2998 -10.8652 -35.3457 -35.6006 -9.70312 7.84082
+c9.30957 15.8008 12.4697 35.9932 12.4697 58.9873c0 58.4561 -28.084 90.6064 -59.9434 127.08c-15.2549 15.9902 -12.8125 21.9336 6.01367 8.01172v-0.00195312z" />
     <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
@@ -147,5 +160,30 @@ c8.31445 -22.0557 6.37891 -48.1729 -5.6709 -75.6553c-21.5723 -49.2031 -70.1602 -
 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" />
+    <glyph glyph-name="tor" unicode="&#xf10b;" 
+d="M280.216 409.741l-13.5029 -54.0127c19.1289 38.2588 50.0742 66.9531 85.5195 92.2715c-25.8809 -29.8193 -49.5117 -59.6387 -63.5771 -90.0215c24.1934 34.3203 56.8262 52.8877 93.3975 65.8281c-48.9492 -43.3223 -87.7715 -90.584 -117.028 -137.282
+l-23.6309 10.127c3.93848 37.6963 18.0049 75.9561 38.8223 113.09zM262.212 288.774l16.3154 -8.43945c-1.6875 -10.6895 0.563477 -34.3203 11.2529 -39.9463c47.2617 -29.2568 91.1465 -60.7646 108.589 -92.835c61.8896 -111.964 -43.3232 -216.051 -135.032 -205.924
+c49.5117 36.5713 64.1396 111.964 45.5732 194.671c-7.31445 32.0703 -19.1299 61.3271 -39.9473 94.5225c-9.00195 15.1914 -5.62598 35.4463 -6.75098 57.9512zM244.207 235.324c-3.37598 -17.4414 -7.31445 -48.9482 -22.5049 -60.7637
+c-6.18945 -4.50098 -12.9404 -9.00293 -19.6924 -13.5039c-27.5693 -18.5664 -54.5752 -36.0078 -66.9531 -80.4561c-2.81348 -9.56445 -0.5625 -19.6924 1.6875 -29.2568c6.75195 -27.5693 25.8809 -56.8262 41.0723 -74.2676c0 -0.5625 2.81348 -2.81348 2.81348 -3.37598
+c12.3779 -14.6289 16.3164 -19.1299 63.5771 -29.8193l-1.125 -5.06445c-28.6943 7.31445 -51.7627 14.6289 -66.9531 31.5078c0 0.5625 -2.81348 2.81348 -2.81348 2.81348c-15.7539 18.0039 -35.4463 48.3867 -42.1973 77.0801
+c-2.81348 11.2529 -5.06445 20.2549 -1.68848 32.0703c12.9404 46.1357 41.0723 64.7031 69.2041 83.833c6.18945 3.93848 14.0654 7.87695 20.2549 12.9404c12.9404 8.43945 19.1299 34.8828 25.3184 56.2627zM256.585 162.183
+c2.25098 -18.0049 2.25098 -33.7588 7.31445 -42.1982c3.93848 -7.31348 10.6904 -17.4414 14.6279 -27.5684c7.87695 -18.5674 11.8154 -38.8223 12.3779 -48.3867c0.563477 -16.3164 -1.6875 -41.6348 -7.31348 -61.8896
+c-6.75195 -21.9424 -19.6924 -38.8213 -29.8203 -40.5098v-1.6875c-13.5029 2.25 -34.8828 10.6895 -46.1357 18.5664c-27.0059 18.5674 -40.5098 41.6348 -42.7598 75.9561c-1.68848 27.0059 14.6279 54.5752 46.6982 71.4541
+c21.9434 11.8154 28.6943 29.2568 35.4463 50.6367c-5.06348 -24.7559 -10.6904 -39.3838 -33.1953 -52.8877c-27.0068 -15.1904 -46.1357 -46.1357 -44.4482 -66.9531c2.25098 -25.3184 19.6924 -54.5752 39.9473 -72.0166
+c10.127 -9.00195 27.5684 -14.6289 42.7598 -17.4424c14.6289 9.00293 23.0684 25.3193 27.0068 43.8857c5.06348 22.5059 5.62598 43.8857 5.62598 55.1387c0 10.127 -4.50098 26.4434 -8.43945 41.0713c-2.81348 11.2529 -13.5029 22.5059 -16.3164 30.9453
+c-5.06348 14.0654 -2.81348 24.1934 -3.37598 43.8857zM253.209 85.1016c2.81348 -12.3779 9.00293 -29.8193 12.3779 -46.6982c2.81348 -13.5039 3.37598 -26.4443 2.25098 -36.5713c-1.125 -11.8154 -1.68848 -21.3799 -3.37598 -31.5078
+c-1.6875 -8.43945 -6.18848 -16.3164 -13.5029 -24.7559v-0.5625c-3.93848 0.5625 -11.8154 6.18848 -18.0049 15.1914c-3.93848 5.62598 -6.75098 13.5029 -9.56445 20.8174c-2.81348 6.75098 -5.62598 14.6279 -5.62598 21.3799c0 16.3164 1.6875 36.5713 13.5029 50.0742
+c10.6904 12.3779 14.0654 14.0654 18.5674 28.6943c-3.37598 -16.3164 -5.62695 -17.4414 -15.7539 -32.0703c-12.9404 -18.0039 -13.5039 -36.0088 -11.8154 -47.2607c1.125 -7.31445 3.93848 -14.0664 6.18848 -19.6924
+c2.81348 -7.31445 6.18945 -14.0654 10.6904 -20.2549c3.93848 -4.50098 6.18848 -7.31445 11.8154 -10.127c6.18848 11.8145 10.127 35.4453 10.6895 48.3857c0.563477 11.2529 1.12598 24.1934 -0.5625 37.1338c-2.25 17.4424 -7.31445 34.3213 -7.87695 47.8242z
+M255.46 251.078c0.5625 -23.0674 5.06348 -57.9512 9.00195 -65.8281c1.6875 -5.06348 16.8789 -29.2568 27.5693 -54.5752c7.31445 -16.3164 9.56445 -32.0703 10.127 -36.5713c5.62695 -47.2607 1.125 -66.9531 -11.2529 -109.15
+c-7.31348 -25.3193 -27.5684 -45.0107 -36.0078 -45.5732l2.8125 5.06348c14.6289 9.00195 27.5693 32.0703 31.5078 50.6367c7.31445 34.3203 12.9404 70.8916 8.43945 92.2715c-1.125 5.06445 -2.81348 21.9434 -9.56445 39.9473
+c-9.56543 26.4443 -23.6309 47.8242 -25.3184 52.8877c-5.62695 14.6289 -6.75195 51.1992 -7.31445 70.8916zM262.212 287.087l5.62598 -2.81348c-2.81348 -6.18848 -1.125 -37.6963 3.37598 -49.5117c5.62598 -15.7539 21.9424 -33.7578 32.0693 -59.0762
+c7.31445 -16.8789 14.6289 -57.3887 15.1914 -61.8896c5.62695 -47.2617 2.81348 -91.709 -11.2529 -129.406c-9.00195 -23.6299 -31.5068 -44.4473 -39.9463 -45.0098l-15.7539 3.93848c21.9424 8.43945 43.3223 35.4453 47.8242 54.0127
+c11.8145 52.3242 16.3154 119.841 -0.563477 171.603c-9.00195 27.0068 -30.3818 50.6377 -34.3203 66.9541c-3.37598 15.1904 -3.37598 30.9443 -2.25 51.1992zM374.738 187.501c30.9443 -28.1318 48.3867 -67.5166 48.3867 -108.589s-18.5674 -81.0186 -50.6377 -107.463
+c-29.8193 -24.7559 -71.4541 -35.4453 -111.401 -35.4453c-24.7559 0 -47.2607 1.125 -71.4541 9.00195c-55.7012 18.5664 -96.7734 65.8281 -100.148 122.654c-3.37598 43.8848 6.75098 77.6436 41.0723 113.089c17.4414 18.5674 53.4502 39.9473 78.2061 56.8262
+c12.3779 7.87695 25.3184 31.5078 0.5625 75.9551l5.06348 3.93848l73.7051 -30.3818c-10.1279 -32.6328 19.1289 -55.7012 28.6943 -60.7646c21.3799 -11.8154 41.6348 -24.1934 57.9512 -38.8213zM364.048 -20.1113c29.2568 24.1934 45.0107 61.3271 45.0107 99.0234
+c0 37.6973 -14.6279 73.7051 -43.3223 99.0234c-16.3164 14.6289 -42.7607 32.6328 -59.6396 42.1982c-16.8789 9.56445 -37.6963 36.0078 -30.9443 61.3271l-55.1387 24.1924c2.81348 -3.9375 9.56543 -20.8174 11.2529 -25.8809
+c3.37598 -14.0654 1.6875 -27.5693 -1.125 -33.7578c-15.1914 -28.1318 -42.1982 -36.0088 -61.3271 -51.7627c-34.3203 -28.1309 -71.4541 -50.0742 -67.5166 -127.154c2.25098 -37.6973 31.5078 -84.3955 75.9561 -105.775
+c25.3184 -12.3779 54.0127 -16.8789 83.2695 -18.5674c26.4443 -1.125 75.9561 14.6289 103.524 37.1338z" />
   </font>
 </defs></svg>

font/README.md

@@ -10,6 +10,7 @@ This font contains icons we need, which Font Awesome does not have.
 | 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 |
+| I2P         | `ptio-i2p-garlic`     | https://github.com/FortAwesome/Font-Awesome/issues/15772 |
 
 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.

font/svg/i2p-garlic.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="96pc" height="96pc" version="1.1" viewBox="0 0 406.4 406.4" xmlns="http://www.w3.org/2000/svg"><path d="m306.26 340.79c26.617-15.024 43.092-39.526 43.092-77.235 2.5085-55.228-32.312-80.326-57.194-116.76-31.322-45.885-39.567-85.506-46.617-81.94-1.3695 0.69153 2.1831 22.617 13.22 52.177 2.6848 7.2136 20.746 49.94 23.417 56.299 22.021 52.462 37.478 115.74-3.5526 164.29-2.5085 2.9695-5.1526 5.7357-7.9188 8.2984-22.78 21.288 27.282-0.44747 35.553-5.1255zm-120.68 34.305c-1.2746 0.80004-2.617 1.6-3.9865 2.4-12.109 6.9696-22.888 10.97-24.095 8.8815-1.1932-2.0746 7.6476-9.4238 19.756-16.421 9.4916-5.478 11.932-3.3899 25.424-3.4984 11.349-0.0949 16.285-2.3865 26.482 3.4984 12.109 6.9831 20.949 14.346 19.756 16.421-1.2068 2.0746-11.987-1.8983-24.095-8.895-1.6543-0.94917-3.2543-1.9255-4.7729-2.8746 10.102 12.041 16.258 22.482 14.143 24.38-2.2373 1.9932-12.963-6.2645-24.543-18.766-0.73221 14.997-3.1458 26.21-5.9119 26.183-2.8746-0.028-5.1526-12.231-5.478-28.217-12.285 13.627-24.027 22.902-26.4 20.8-2.1017-1.8848 3.8644-12.054 13.722-23.892zm-4.895-365.94c3.3085-15.241 11.837-10.346 11.132 6.617-1.356 32.76-3.6204 59.418-6.4679 81.764 9.5323-30.278 18.549-58.333 22.902-81.167 4.5967-24.149 16.936-4.0814 17.614 19.2 10.576 70.197 27.227 109.85 40.651 141.82 11.824 28.163 21.085 52.502 21.085 84.503v-2.2102h0.0121c0 36.448-12.312 62.089-30.034 78.55-7.7424 7.2001-16.556 12.692-25.817 16.556-12.204 5.1119-20.448 8.1221-31.716-0.012-2.7119-1.9797-5.3696-4.3797-7.9052-7.2543-29.166-23.743-39.417-57.668-39.404-95.703-0.21696 3.7424-0.32542 7.634-0.32542 11.702 0 15.024 1.2746 28.448 3.5526 40.245 3.2814 17.071 8.2984 31.024 15.309 41.275 11.268 16.461 10.888 15.146-13.085 10.983-3.539-0.61019-6.8611-1.9119-10.17-3.0102-24.543-8.1764-53.506-20.556-74.699-38.021 6.5357 9.7899 14.658 18.522 23.892 26.319 13.166 11.092 13.763 14.387-10.224 5.5458-47.675-17.546-80.259-49.316-71.974-107.3 6.3187-44.285 38.197-61.913 67.838-89.547 65.56-61.194 31.485-18.726-2.4678 24.99-10.454 13.437-17.505 28.055-21.329 45.234 25.329-37.126 75.187-78.794 99.716-145.82 9.4645-17.668 16.231-39.106 21.912-65.262zm142.36 147.17c33.831 25.004 62.238 46.794 68.326 83.242 5.3289 31.96-5.9526 57.804-27.716 77.031-9.7628 8.6238-28.055 28.258-7.7018-6.2238 7.3899-12.542 9.8984-28.57 9.8984-46.821 0-46.4-22.292-71.919-47.58-100.87-12.109-12.692-10.17-17.41 4.773-6.3594z" fill-rule="evenodd" stroke-width="13.559"/></svg>

font/svg/tor.svg

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="96pc" height="96pc" enable-background="new 0 0 150.5 91.1" version="1.1" viewBox="0 0 1536 1536" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(0,1444.9)">
+	
+	<g transform="matrix(16.879 0 0 16.879 -592.38 -1444.9)"><g id="layer3_20_" transform="translate(-92 -64)">
+			<g id="layer5_20_">
+				<g id="path2554_21_">
+					<path d="m176.9 70.8-2.4 9.6c3.4-6.8 8.9-11.9 15.2-16.4-4.6 5.3-8.8 10.6-11.3 16 4.3-6.1 10.1-9.4 16.6-11.7-8.7 7.7-15.6 16.1-20.8 24.4l-4.2-1.8c0.7-6.7 3.2-13.5 6.9-20.1z" fill="#010101"/>
+				</g>
+				<g id="path2536_21_">
+					<path d="m173.7 92.3 2.9 1.5c-0.3 1.9 0.1 6.1 2 7.1 8.4 5.2 16.2 10.8 19.3 16.5 11 19.9-7.7 38.4-24 36.6 8.8-6.5 11.4-19.9 8.1-34.6-1.3-5.7-3.4-10.9-7.1-16.8-1.6-2.7-1-6.3-1.2-10.3z" fill="#010101"/>
+				</g>
+			</g>
+			<g id="layer4_20_">
+				<g id="path2540_21_">
+					<path d="m170.5 101.8c-0.6 3.1-1.3 8.7-4 10.8-1.1 0.8-2.3 1.6-3.5 2.4-4.9 3.3-9.7 6.4-11.9 14.3-0.5 1.7-0.1 3.5 0.3 5.2 1.2 4.9 4.6 10.1 7.3 13.2 0 0.1 0.5 0.5 0.5 0.6 2.2 2.6 2.9 3.4 11.3 5.3l-0.2 0.9c-5.1-1.3-9.2-2.6-11.9-5.6 0-0.1-0.5-0.5-0.5-0.5-2.8-3.2-6.3-8.6-7.5-13.7-0.5-2-0.9-3.6-0.3-5.7 2.3-8.2 7.3-11.5 12.3-14.9 1.1-0.7 2.5-1.4 3.6-2.3 2.3-1.5 3.4-6.2 4.5-10z" fill="#010101"/>
+				</g>
+				<g id="path2542_21_">
+					<path d="m172.7 114.8c0.1 3.5-0.3 5.3 0.6 7.8 0.5 1.5 2.4 3.5 2.9 5.5 0.7 2.6 1.5 5.5 1.5 7.3 0 2-0.1 5.8-1 9.8-0.7 3.3-2.2 6.2-4.8 7.8-2.7-0.5-5.8-1.5-7.6-3.1-3.6-3.1-6.7-8.3-7.1-12.8-0.3-3.7 3.1-9.2 7.9-11.9 4-2.4 5-5 5.9-9.4-1.2 3.8-2.4 6.9-6.3 9-5.7 3-8.6 7.9-8.3 12.7 0.4 6.1 2.8 10.2 7.6 13.5 2 1.4 5.8 2.9 8.2 3.3v-0.3c1.8-0.3 4.1-3.3 5.3-7.2 1-3.6 1.4-8.1 1.3-11-0.1-1.7-0.8-5.3-2.2-8.6-0.7-1.8-1.9-3.6-2.6-4.9-0.9-1.5-0.9-4.3-1.3-7.5z" fill="#010101"/>
+				</g>
+				<g id="path2544_21_">
+					<path d="m172.1 128.5c0.1 2.4 1 5.4 1.4 8.5 0.3 2.3 0.2 4.6 0.1 6.6-0.1 2.3-0.8 6.5-1.9 8.6-1-0.5-1.4-1-2.1-1.8-0.8-1.1-1.4-2.3-1.9-3.6-0.4-1-0.9-2.2-1.1-3.5-0.3-2-0.2-5.2 2.1-8.4 1.8-2.6 2.2-2.8 2.8-5.7-0.8 2.6-1.4 2.9-3.3 5.1-2.1 2.4-2.4 6-2.4 8.9 0 1.2 0.5 2.6 1 3.8 0.5 1.3 1 2.7 1.7 3.7 1.1 1.6 2.5 2.6 3.2 2.7v-0.1c1.3-1.5 2.1-2.9 2.4-4.4 0.3-1.8 0.4-3.5 0.6-5.6 0.2-1.8 0.1-4.1-0.4-6.5-0.6-3-1.7-6.1-2.2-8.3z" fill="#010101"/>
+				</g>
+				<g id="path2550_21_">
+					<path d="m172.5 99c0.1 3.5 0.3 10 1.3 12.6 0.3 0.9 2.8 4.7 4.5 9.4 1.2 3.2 1.5 6.2 1.7 7.1 0.8 3.8-0.2 10.3-1.5 16.4-0.7 3.3-3 7.4-5.6 9l-0.5 0.9c1.5-0.1 5.1-3.6 6.4-8.1 2.2-7.5 3-11 2-19.4-0.1-0.8-0.5-3.6-1.8-6.5-1.9-4.5-4.6-8.8-4.9-9.7-0.7-1.4-1.5-7.6-1.6-11.7z" fill="#010101"/>
+				</g>
+				<g id="path2552_21_">
+					<path d="m173.7 92.6c-0.2 3.6-0.2 6.4 0.4 9.1 0.7 2.9 4.5 7.1 6.1 11.9 3 9.2 2.2 21.2 0.1 30.5-0.8 3.3-4.6 8.1-8.5 9.6l2.8 0.7c1.5-0.1 5.5-3.8 7.1-8 2.5-6.7 3-14.6 2-23-0.1-0.8-1.4-8-2.7-11-1.8-4.5-4.7-7.7-5.7-10.5-0.8-2.1-1.1-7.7-0.6-8.8z" fill="#010101"/>
+				</g>
+			</g>
+		</g>
+		<path d="m101.7 46.3c-2.9-2.6-6.5-4.8-10.3-6.9-1.7-0.9-6.9-5-5.1-10.8l-13.1-5.4-0.9 0.7c4.4 7.9 2.1 12.1-0.1 13.5-4.4 3-10.8 6.8-13.9 10.1-6.1 6.3-7.9 12.3-7.3 20.1 0.6 10.1 7.9 18.5 17.8 21.8 4.3 1.4 8.3 1.6 12.7 1.6 7.1 0 14.5-1.9 19.8-6.3 5.7-4.7 9-11.8 9-19.1s-3.1-14.3-8.6-19.3zm-1.9 36.9c-4.9 4-13.7 6.8-18.4 6.6-5.2-0.3-10.3-1.1-14.8-3.3-7.9-3.8-13.1-12.1-13.5-18.8-0.7-13.7 5.9-17.6 12-22.6 3.4-2.8 8.2-4.2 10.9-9.2 0.5-1.1 0.8-3.5 0.2-6-0.3-0.9-1.5-3.9-2-4.6l9.8 4.3c-1.2 4.5 2.5 9.2 5.5 10.9s7.7 4.9 10.6 7.5c5.1 4.5 7.7 10.9 7.7 17.6s-2.8 13.3-8 17.6z" fill="#010101"/>
+	</g>
+</g>
+</svg>

index.html

@@ -5,6 +5,11 @@ layout: default
 <script src="/assets/js/redirects.js"></script>
 {% include sections/header.html %}
 {% include sections/resources.html %}
+<h1 id="sponsors" class="anchor"><a href="#sponsors"><i class="fas fa-link anchor-icon"></i></a> Sponsors</h1>
+
+<div class="alert alert-success" role="alert">
+  <strong>New!</strong> Showcase your brand as a sponsor of PrivacyTools here and support our mission of creating a world free of mass surveillance! <a href="/sponsors/" class="alert-link">Learn more...</a>
+</div>
 {% include sections/quotes.html %}
 {% include sections/privacy-resources.html %}
 {% include sections/participate.html %}

nginx/010-headers.conf

@@ -1,9 +1,9 @@
 add_header X-Frame-Options DENY always;
 add_header X-XSS-Protection "1; mode=block" always;
 add_header X-Content-Type-Options nosniff always;
-add_header Content-Security-Policy "default-src 'none'; script-src 'self' 'unsafe-inline' https://stats.privacytools.io; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://*.privacytools.io; object-src 'none'; frame-src https://stats.privacytools.io; font-src 'self'; manifest-src 'self';" always;
+add_header Content-Security-Policy "default-src 'none'; script-src 'self' https://stats.privacytools.io; style-src 'self'; img-src 'self' data: https://*.privacytools.io; object-src 'none'; frame-src https://stats.privacytools.io; font-src 'self'; base-uri 'none'; form-action 'self' https://search.privacytools.io; frame-ancestors 'none'; manifest-src 'self';" always;
 add_header Strict-Transport-Security "max-age=31557600; includeSubDomains; preload";
 add_header 'Access-Control-Allow-Origin' '*';
 add_header Alt-Svc 'h2="privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion:443"; ma=86400; persist=1';
-add_header Expect-CT 'max-age=0; report-uri="https://34f7a2cb34f91bc092b2e15f4e4bda78.report-uri.com/r/d/ct/reportOnly"';
+add_header Expect-CT 'max-age=0';
 add_header Referrer-Policy "strict-origin";

nginx/020-redirects.conf

@@ -1,6 +1,15 @@
 location = /old/ {
 	return 301 /classic/;
 }
+location = /privacy-policy/ {
+	return 301 /privacy/;
+}
+location = /contact/ {
+	return 301 /about/;
+}
+location = /webrtc.html {
+	return 301 /browsers/;
+}
 location = /software/im/ {
 	return 301 /software/real-time-communication/;
 }

pages/about.html

@@ -0,0 +1,147 @@
+---
+layout: page
+permalink: /about/
+title: "About PrivacyTools"
+description: "About the PrivacyTools organization, and contributors to the PrivacyTools website, communities, and services."
+hidedesc: true
+---
+
+<div class="row">
+  <div class="col">
+    <p><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
+    <p>At <strong>PrivacyTools</strong>, we provide services, tools, and knowledge to protect your privacy against global mass surveillance, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. This website serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
+    <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytoolsIO/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytoolsIO/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytoolsIO/privacytools.io/commits/master">commit log</a> dating back to our original founding date in 2015. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
+    <p>Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community <a href="https://opencollective.com/privacytoolsio">donors</a> and <a href="/sponsors/">sponsors</a>, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at <a href="https://opencollective.com/privacytoolsio">opencollective.com/privacytoolsio</a>.</p>
+    <p>We take the operation of our various <a href="/services/">services</a> very seriously, and require all participants to adhere to our <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md">Code of Conduct</a>. For any questions or to report abuse, please see our CoC’s <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md#enforcement">Enforcement section</a>.</p>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col">
+    <h2>Core Contributors</h2>
+  </div>
+</div>
+
+<div class="row">
+
+{% include team.html
+avatar="burung.jpg"
+name="Burung Hantu"
+role="Founder"
+bio="I founded PrivacyTools in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs."
+email="dude@privacytools.io"
+keys="https://keybase.io/privacytools"
+mastodon="https://social.privacytools.io/@BurungHantu"
+twitter="privacytoolsIO"
+%}
+
+{% include team.html
+avatar="jonah.png"
+name="Jonah Aragon"
+nick="Jonah"
+role="Administrator"
+bio="I run the website and services for PrivacyTools. My goal is to spread the word about data privacy as widely as possible."
+email="jonah@privacytools.io"
+website="https://www.jonaharagon.com"
+keys="https://keybase.io/jonaharagon"
+mastodon="https://social.privacytools.io/@jonah"
+twitter="JonahAragon"
+blog="jonah"
+%}
+
+{% include team.html
+avatar="blacklight447.png"
+name="blacklight447"
+bio="I research new privacy recommendations and moderate our communities. My expertise is endpoint security and networking."
+role="Community Manager"
+email="blacklight447@privacytools.io"
+mastodon="https://social.privacytools.io/@blacklight447"
+%}
+
+{% include team.html
+avatar="danarel.jpg"
+name="Dan Arel"
+role="ThinkPrivacy Editor"
+bio="I'm an author, columnist, and privacy advocate whose work has appeared in Time, Huff Post, OpenSource, and more."
+website="https://danarel.com"
+keys="https://keybase.io/dan_arel"
+twitter="danarel"
+mastodon="https://mastodon.technology/@danarel"
+blog="danarel"
+%}
+
+{% include team.html
+avatar="dawid.png"
+name="Dawid Potocki"
+role="Developer"
+bio="I'm a student interested in software development. I help improve PrivacyTools and promote using free libre software."
+website="https://dawidpotocki.com"
+email="dawidpotocki@privacytools.io"
+keys="https://dawidpotocki.com/accounts/#pgp"
+mastodon="https://social.privacytools.io/@dawidpotocki"
+%}
+
+{% include team.html
+avatar="dngray.png"
+name="dngray"
+nick="Daniel Gray"
+bio="I liaise with and research privacy-focused services to refine our recommendations. My background is infosec and network security."
+email="dngray@privacytools.io"
+keys="https://keybase.io/dngray"
+mastodon="https://social.privacytools.io/@dngray"
+%}
+
+{% include team.html
+avatar="mikaela.png"
+name="Mikaela Suomalainen"
+nick="Mikaela"
+bio="I am interested in instant messengers. I review privacy tools, and participate in our forum, Matrix room, and issue tracker."
+website="https://mikaela.info/"
+keys="https://gitea.blesmrt.net/mikaela/shell-things/src/branch/master/.mikaela/keys"
+%}
+
+{% include team.html
+avatar="nitrohorse.jpg"
+name="Andreas Basurto"
+nick="nitrohorse"
+role="Developer"
+bio="I'm a privacy advocate and software developer. I write web extensions, help research, and make updates to the site."
+website="https://nitrohorse.com/"
+keys="https://keybase.io/513"
+mastodon="https://nitro.horse/@andreas"
+blog="nitrohorse"
+%}
+
+{% include team.html
+avatar="trai_dep.jpg"
+name="trai_dep"
+role="Subreddit Mod"
+bio="I'm the moderator at r/Privacy and r/privacytoolsIO. Day to day, I am also – <i>irony alert</i> – an (ethical) digital marketer."
+email="trai_dep@privacytools.io"
+website="https://www.reddit.com/user/trai_dep"
+%}
+
+</div>
+<div class="row mt-4 mb-4">
+  <div class="col">
+    <div class="card">
+      <div class="card-body">
+        <p class="card-text">Of course, we couldn't do any of this without our very generous <a href="https://opencollective.com/privacytoolsio/">financial contributors</a>, <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">website contributors</a>, and the countless community members that help share new ideas and spread the word! Thank you.</p>
+        <a href="/#participate" class="btn btn-primary"><i class="fas fa-hands-helping"></i> Get involved!</a>
+        <a href="/donate/" class="btn btn-outline-danger"><i class="fas fa-heart"></i> Donate</a>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col">
+    <h2>Contact Us</h2>
+    <p>It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out in one of the following ways.</p>
+    <p><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum</a></p>
+    <p><a href="https://github.com/privacytoolsIO/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
+    <p><a href="https://www.reddit.com/r/privacytoolsIO/"><i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit</a></p>
+    <p>For complete transparency, software and providers will only be considered for this website after discussions take place on our GitHub issue tracker. We of course don't make any changes in secret.</p>
+    <p>Join our Matrix room at <code>#general:privacytools.io</code> or join the <a href="https://keybase.io/team/privacytools_io">privacytools_io Keybase team</a> to chat with us and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://riot.privacytools.io">Riot</a>.</p>
+  </div>
+</div>

pages/contact.md

@@ -1,26 +0,0 @@
----
-layout: page
-permalink: /contact/
-title: "Contact Us"
-description: "Contact the privacytoolsIO team if you have any suggestions or are experiencing any issues."
----
-
-## Suggestions?
-
-It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out.
-
-[<i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum](https://forum.privacytools.io/)
-
-[<i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub](https://github.com/privacytoolsIO/privacytools.io/issues)
-
-[<i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit](https://www.reddit.com/r/privacytoolsIO/)
-
-For complete transparency, software and providers will only be considered for this website after discussions take place on any of the above platforms.
-
-## Chat with the Team
-
-Join our Matrix room at `#general:privacytools.io` or [privacytools_io Keybase team](https://keybase.io/team/privacytools_io) to chat with [us](https://github.com/orgs/privacytoolsIO/people) and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/).
-
-## Code of Conduct
-
-We take the operation of our various [services](/services/) very seriously, and adhere to our [Code of Conduct](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md). For any questions or to report abuse, please see our CoC's [Enforcement](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md#enforcement) section.

pages/donate.html

@@ -7,16 +7,22 @@ permalink: /donate/
   <div class="row">
     <div class="mx-auto text-center">
       <div class="mt-4 mb-4">
-        <a href="https://www.privacytools.io/"><img src="/assets/img/layout/logo.png" class="img-fluid" alt="privacytools.io"></a>
+        <a href="{{ site.production_url }}"><img src="/assets/img/layout/logo.png" class="img-fluid" alt="PrivacyTools"></a>
       </div>
-      <h1>Please Donate</h1>
-      <p>Our website is free of advertisements and not affiliated with any listed providers.<br>Your donation will cover our costs for servers, domains, coffee, beer, and pizza.</p>
 
-      <p>
-      	<a class="btn btn-warning mb-1" href="https://liberapay.com/privacytools.io/donate"><i class="fas fa-donate fa-lg fa-fw"></i> Liberapay</a>
-      	<a class="btn btn-danger mb-1" href="https://www.patreon.com/privacytools"><i class="fab fa-patreon fa-lg fa-fw"></i> Patreon</a>
-      	<a class="btn btn-primary mb-1" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5G9CBU8P6F4K2"><i class="fab fa-paypal fa-lg fa-fw"></i> PayPal</a>
-      </p>
+      <div class="card border-success mt-5 mb-5">
+        <div class="card-header text-success"><i class="fas fa-donate fa-fw"></i> Donate via OpenCollective</div>
+        <div class="card-body text-success">
+          <p class="card-text">If you are able, please consider contributing to our development and outreach programs. <strong>Contributions via OpenCollective to PrivacyTools are tax deductible for US taxpayers.</strong> These funds are transparently and primarily used to cover server costs.</p>
+          <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success">Contribute</a>
+          <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="btn btn-outline-success">More Info</a>
+        </div>
+      </div>
+
+      <h1>Please Donate</h1>
+
+      <p>Our website is free of advertisements and not affiliated with any listed providers.<br>Your donation will cover our costs for servers, domains, coffee, beer, and pizza.</p>
+      <p>You may also contribute via the cryptocurrencies below, however we will not be able to provide a receipt for your contribution.<br>Your contribution will be considered an anonymous, unrestricted contribution and paid to our Fiscal Host at OpenCollective when we convert to currency.</p>
 
     </div>
   </div>
@@ -26,49 +32,49 @@ permalink: /donate/
       <div class="form-group row">
         <label for="BTC" class="col-sm-4 col-form-label"><strong>Bitcoin (BTC)</strong> <a href="/assets/img/qr/BTC.png"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
-          <input id="BTC" type="text" value="1C3MVvvJwfEiS5KQmZzJkiVq7obYi2zRqb" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="BTC" type="text" value="1C3MVvvJwfEiS5KQmZzJkiVq7obYi2zRqb" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="BCH" class="col-sm-4 col-form-label"><strong>Bitcoin Cash (BCH)</strong> <a href="/assets/img/qr/BCH.png"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
-          <input id="BCH" type="text" value="bitcoincash:qzs5eh484cc7gq2frw4y0ygdg33uv6ucrq48ewgqqf" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="BCH" type="text" value="bitcoincash:qzs5eh484cc7gq2frw4y0ygdg33uv6ucrq48ewgqqf" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="ETH" class="col-sm-4 col-form-label"><strong>Ethereum (ETH)</strong> <a href="/assets/img/qr/ETH.png"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
-          <input id="ETH" type="text" value="0x1DdD9c188aaf9198b664CeBce9a9cD03E75FdD49" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="ETH" type="text" value="0x1DdD9c188aaf9198b664CeBce9a9cD03E75FdD49" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="ZEC" class="col-sm-4 col-form-label"><strong>Zcash (ZEC)</strong> <a href="/assets/img/qr/ZEC.png"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
-          <input id="ZEC" type="text" value="t1Sv6rSRchWUXkWNz7PkeYixTs9M2aAs4wX" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="ZEC" type="text" value="t1Sv6rSRchWUXkWNz7PkeYixTs9M2aAs4wX" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="LTC" class="col-sm-4 col-form-label"><strong>Litecoin (LTC)</strong> <a href="/assets/img/qr/LTC.png"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
-          <input id="LTC" type="text" value="LSccXrCDm7zu4Gc6PiiW6sBaKjADfFGQSQ" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="LTC" type="text" value="LSccXrCDm7zu4Gc6PiiW6sBaKjADfFGQSQ" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="XLM" class="col-sm-4 col-form-label"><strong>Stellar (XLM)</strong> <a href="/assets/img/qr/XLM.png"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
-          <input id="XLM" type="text" value="GA3GFFRS2PEZHFYOKYO5FSK5GAMW44AOGI4RY5ISXOWMD3PWAARFVAA4" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XLM" type="text" value="GA3GFFRS2PEZHFYOKYO5FSK5GAMW44AOGI4RY5ISXOWMD3PWAARFVAA4" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="XMR" class="col-sm-4 col-form-label"><strong>Monero (XMR)</strong> <a href="/assets/img/qr/XMR.png"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
-          <input id="XMR" type="text" value="45yJ8LkShLt2f9gCqbBQUcDw7um9XxD2vZ8h2Rt3GoLq9kMrznB3UAHBS1chJk9KjugpBbbJFGtdAeXE5j99wuGxDcbYUri" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XMR" type="text" value="45yJ8LkShLt2f9gCqbBQUcDw7um9XxD2vZ8h2Rt3GoLq9kMrznB3UAHBS1chJk9KjugpBbbJFGtdAeXE5j99wuGxDcbYUri" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
@@ -90,208 +96,208 @@ permalink: /donate/
       <div class="form-group row">
         <label for="BNB" class="col-sm-4 col-form-label"><strong>Binance Coin (BNB)</strong></label>
         <div class="col-sm-8">
-          <input id="BNB" type="text" value="bnb17zlv4xnkjsujks80cclx46uhm9h8txms82htwj" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="BNB" type="text" value="bnb17zlv4xnkjsujks80cclx46uhm9h8txms82htwj" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="EOS" class="col-sm-4 col-form-label"><strong>EOS</strong></label>
         <div class="col-sm-8">
-          <input id="EOS" type="text" value="privacytools" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="EOS" type="text" value="privacytools" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="BAT" class="col-sm-4 col-form-label"><strong>Brave (BAT)</strong></label>
         <div class="col-sm-8">
-          <input id="BAT" type="text" value="0x13DA8c6176a9bd171B8285067Ae38420B39eC11E" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="BAT" type="text" value="0x13DA8c6176a9bd171B8285067Ae38420B39eC11E" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="XRP" class="col-sm-4 col-form-label"><strong>Ripple (XRP)</strong></label>
         <div class="col-sm-8">
-          <input id="XRP" type="text" value="r3EPSFMZNoHPKKhWUBfobtxck5UVR2T8mF" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XRP" type="text" value="r3EPSFMZNoHPKKhWUBfobtxck5UVR2T8mF" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="DOGE" class="col-sm-4 col-form-label"><strong>Dogecoin (DOGE)</strong></label>
         <div class="col-sm-8">
-          <input id="DOGE" type="text" value="DHHPUaDq562BzET6QxhudJepXNDoG7yP12" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="DOGE" type="text" value="DHHPUaDq562BzET6QxhudJepXNDoG7yP12" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="ETC" class="col-sm-4 col-form-label"><strong>Ethereum Classic (ETC)</strong></label>
         <div class="col-sm-8">
-          <input id="ETC" type="text" value="0x6807739f23B74AE07F8902aBDA03cF854678dc7e" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="ETC" type="text" value="0x6807739f23B74AE07F8902aBDA03cF854678dc7e" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="BSV" class="col-sm-4 col-form-label"><strong>Bitcoin SV (BSV)</strong></label>
         <div class="col-sm-8">
-          <input id="BSV" type="text" value="1GamahbRfa4EBDBSN3ufEhJaE8xnH7kLim" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="BSV" type="text" value="1GamahbRfa4EBDBSN3ufEhJaE8xnH7kLim" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="DASH" class="col-sm-4 col-form-label"><strong>Dash (DASH)</strong></label>
         <div class="col-sm-8">
-          <input id="DASH" type="text" value="Xb62GojDghypwwwZj96kAiPwktjrxWMqf9" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="DASH" type="text" value="Xb62GojDghypwwwZj96kAiPwktjrxWMqf9" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="ADA" class="col-sm-4 col-form-label"><strong>Cardano (ADA)</strong></label>
         <div class="col-sm-8">
-          <input id="ADA" type="text" value="DdzFFzCqrht9wMYGwijaPDVocdpoJHXSE6MMr6L44QtxTBfSoBycXMtnrbTKzpqcRG88LZcUvJd3zXWADfgxX8K3errkhn9oB9ZuwBYe" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="ADA" type="text" value="DdzFFzCqrht9wMYGwijaPDVocdpoJHXSE6MMr6L44QtxTBfSoBycXMtnrbTKzpqcRG88LZcUvJd3zXWADfgxX8K3errkhn9oB9ZuwBYe" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="CLO" class="col-sm-4 col-form-label"><strong>Callisto (CLO)</strong></label>
         <div class="col-sm-8">
-          <input id="CLO" type="text" value="0xfAE4cd989afADc4ad2Cef6d33f3C50fd1F216846" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="CLO" type="text" value="0xfAE4cd989afADc4ad2Cef6d33f3C50fd1F216846" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="DCR" class="col-sm-4 col-form-label"><strong>Decred (DCR)</strong></label>
         <div class="col-sm-8">
-          <input id="DCR" type="text" value="DsbNyFxiKssCA4Sa2yEa4wiWrLD1EFnivFG" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="DCR" type="text" value="DsbNyFxiKssCA4Sa2yEa4wiWrLD1EFnivFG" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="DGB" class="col-sm-4 col-form-label"><strong>DigiByte (DGB)</strong></label>
         <div class="col-sm-8">
-          <input id="DGB" type="text" value="DGsMoXne1VrSd7YuA6EaKh9ca7HUCnxi7Y" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="DGB" type="text" value="DGsMoXne1VrSd7YuA6EaKh9ca7HUCnxi7Y" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="EXP" class="col-sm-4 col-form-label"><strong>Expanse (EXP)</strong></label>
         <div class="col-sm-8">
-          <input id="EXP" type="text" value="0x131b777EcdD546dfecCCC4f72642Ee4570c5B9f9" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="EXP" type="text" value="0x131b777EcdD546dfecCCC4f72642Ee4570c5B9f9" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="GRS" class="col-sm-4 col-form-label"><strong>Groestlcoin (GRS)</strong></label>
         <div class="col-sm-8">
-          <input id="GRS" type="text" value="Ffjva2xhmoUmt1Xmc1LR3tHHJVuQfTDAPz" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="GRS" type="text" value="Ffjva2xhmoUmt1Xmc1LR3tHHJVuQfTDAPz" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="KIN" class="col-sm-4 col-form-label"><strong>Kin (KIN)</strong></label>
         <div class="col-sm-8">
-          <input id="KIN" type="text" value="GBQT5R43PLKWLUOPFKDZFIXCIOG3QXU3KIJ432UQQALWSZIBW2QR43B2" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="KIN" type="text" value="GBQT5R43PLKWLUOPFKDZFIXCIOG3QXU3KIJ432UQQALWSZIBW2QR43B2" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="KMD" class="col-sm-4 col-form-label"><strong>Komodo (KMD)</strong></label>
         <div class="col-sm-8">
-          <input id="KMD" type="text" value="RDMncz9ddWUY1PQ6D9PDqkeJBLEwYvwSHC" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="KMD" type="text" value="RDMncz9ddWUY1PQ6D9PDqkeJBLEwYvwSHC" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="LSK" class="col-sm-4 col-form-label"><strong>Lisk (LSK)</strong></label>
         <div class="col-sm-8">
-          <input id="LSK" type="text" value="15983493180249602776L" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="LSK" type="text" value="15983493180249602776L" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="NGL" class="col-sm-4 col-form-label"><strong>Gulden (NGL)</strong></label>
         <div class="col-sm-8">
-          <input id="NGL" type="text" value="GRCpgMzWfFk1GveSrYP7FpH7BYwpt2hLQz" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="NGL" type="text" value="GRCpgMzWfFk1GveSrYP7FpH7BYwpt2hLQz" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="QTUM" class="col-sm-4 col-form-label"><strong>Qtum (QTUM)</strong></label>
         <div class="col-sm-8">
-          <input id="QTUM" type="text" value="QYwvS7gongbRhyG2khg2wh1LymxVGRA8Rs" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="QTUM" type="text" value="QYwvS7gongbRhyG2khg2wh1LymxVGRA8Rs" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="RDD" class="col-sm-4 col-form-label"><strong>Reddcoin (RDD)</strong></label>
         <div class="col-sm-8">
-          <input id="RDD" type="text" value="RmoLdW9DVXkxHjoFZyiDu1xzVtvckRf2Mn" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="RDD" type="text" value="RmoLdW9DVXkxHjoFZyiDu1xzVtvckRf2Mn" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="TRX" class="col-sm-4 col-form-label"><strong>Tron (TRX)</strong></label>
         <div class="col-sm-8">
-          <input id="TRX" type="text" value="TVjrf7S4C2ATcejmL4Z1BnH8us4QC24Gdq" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="TRX" type="text" value="TVjrf7S4C2ATcejmL4Z1BnH8us4QC24Gdq" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="UBQ" class="col-sm-4 col-form-label"><strong>Ubiq (UBQ)</strong></label>
         <div class="col-sm-8">
-          <input id="UBQ" type="text" value="0x2Aa4EfF8C9f8877fC733FA54d459B68840303707" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="UBQ" type="text" value="0x2Aa4EfF8C9f8877fC733FA54d459B68840303707" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="VTC" class="col-sm-4 col-form-label"><strong>Vertcoin (VTC)</strong></label>
         <div class="col-sm-8">
-          <input id="VTC" type="text" value="VgCf1Fwks8yaKMcDTzu5wkQTc5QLVMCwPd" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="VTC" type="text" value="VgCf1Fwks8yaKMcDTzu5wkQTc5QLVMCwPd" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="WAVES" class="col-sm-4 col-form-label"><strong>Waves (WAVES)</strong></label>
         <div class="col-sm-8">
-          <input id="WAVES" type="text" value="3PES6AF194L56BuhRwrLF41eAsGzcGDARCi" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="WAVES" type="text" value="3PES6AF194L56BuhRwrLF41eAsGzcGDARCi" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="XEM" class="col-sm-4 col-form-label"><strong>NEM (XEM)</strong></label>
         <div class="col-sm-8">
-          <input id="XEM" type="text" value="NC7KTVGV7MH2EJMDM4YHAJ2AECQEBE2AXJSFACG6" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XEM" type="text" value="NC7KTVGV7MH2EJMDM4YHAJ2AECQEBE2AXJSFACG6" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="XTZ" class="col-sm-4 col-form-label"><strong>Tezos (XTZ)</strong></label>
         <div class="col-sm-8">
-          <input id="XTZ" type="text" value="tz1SUiszXUx8njTueLdnwqahYRM4QTEQ2wT3" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XTZ" type="text" value="tz1SUiszXUx8njTueLdnwqahYRM4QTEQ2wT3" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="XVG" class="col-sm-4 col-form-label"><strong>Verge (XVG)</strong></label>
         <div class="col-sm-8">
-          <input id="XVG" type="text" value="D5vWPfcSbwdc55amx4Z2kVvXuHa6kiaGUH" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XVG" type="text" value="D5vWPfcSbwdc55amx4Z2kVvXuHa6kiaGUH" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="XZC" class="col-sm-4 col-form-label"><strong>ZCoin (XZC)</strong></label>
         <div class="col-sm-8">
-          <input id="XZC" type="text" value="a2sHJ3A2mo1yggmkhj4Ki6nqAT5ZnVE42n" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XZC" type="text" value="a2sHJ3A2mo1yggmkhj4Ki6nqAT5ZnVE42n" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
         <label for="ZEN" class="col-sm-4 col-form-label"><strong>Horizen (ZEN)</strong></label>
         <div class="col-sm-8">
-          <input id="ZEN" type="text" value="znSwHaaYhPr2Uu6MTi5T7QCW3qP5UWmWDuY" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="ZEN" type="text" value="znSwHaaYhPr2Uu6MTi5T7QCW3qP5UWmWDuY" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
     <div class="text-center">
-      <p>The <a href="/contact/">privacytools.io team</a> does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies.</p>
+      <p>The <a href="/contact/">PrivacyTools team</a> does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies.</p>
       <h3>Thanks for your support. You are awesome!</h3>
       <p>
       <span class="far fa-smile-beam fa-3x"></span>

pages/privacy-policy.html

@@ -1,85 +0,0 @@
----
-layout: page
-permalink: /privacy-policy/
-title: "Privacy Policy"
-description: "This Privacy Policy explains what information privacytoolsIO and its related entities collect about its users, what we do with that information, and how we handle the content you place in our products and services."
----
-
-  <h2>Scope of Privacy Policy</h2>
-
-  <p>This Privacy Policy applies to the information that we obtain through your use of privacytoolsIO's services via a Device
-    or when you otherwise interact with privacytoolsIO's official web services.</p>
-  <p>privacytoolsIO services include our:</p>
-  <ul>
-    <li>Websites (privacytools.io and subdomains *.privacytools.io)</li>
-  </ul>
-  <p>but does not include:</p>
-  <ul>
-    <li>Products or services for which a separate privacy policy is provided.</li>
-    <li>Third Party Products. These are third party products or services that you may discover on our website or other official services we offer.
-      privacytoolsIO cannot guarantee your privacy outside of websites under our control. You should always review the policies of third party products
-      and services to make sure you are comfortable with the ways in which they collect and use your information.</li>
-  </ul>
-
-  <h2>Website Visitors</h2>
-  <p>Like most website operators, privacytoolsIO collects non-personally-identifying information of the sort that web browsers and servers typically make available,
-  such as the browser type, language preference, referring site, and the date and time of each visitor request. privacytoolsIO's purpose in collecting
-  non-personally identifying information is to better understand how its visitors use its website and related services.
-  From time to time, privacytoolsIO may release non-personally-identifying information in the aggregate, e.g.,
-  by publishing a report on trends in the usage of its website.</p>
-
-  <p>privacytoolsIO collects anonymized IP addresses in this form: 192.xxx.xxx.xxx for self-hosted Matomo statistics software.
-    privacytoolsIO does not use such information to identify its visitors, however, and does not disclose such information,
-    other than under the same circumstances that it uses and discloses personally-identifying information, as described below.</p>
-
-  <h2>Opting Out of Website Tracking</h2>
-
-  <p>privacytoolsIO uses a self-hosted Matomo install to track visitor data. You can opt out entirely using the form below. This form may not function correctly with
-  an ad blocker enabled.</p>
-
-  <iframe
-        style="border: 1; height: 120px; width: 100%;"
-        src="https://stats.privacytools.io/index.php?module=CoreAdminHome&action=optOut&language=en&backgroundColor=&fontColor=212529&fontSize=1rem&fontFamily=-apple-system%2CBlinkMacSystemFont%2C%22Segoe%20UI%22%2CRoboto%2C%22Helvetica%20Neue%22%2CArial%2Csans-serif%2C%22Apple%20Color%20Emoji%22%2C%22Segoe%20UI%20Emoji%22%2C%22Segoe%20UI%20Symbol%22%2C%22Noto%20Color%20Emoji%22"
-        ></iframe>
-
-  <p>privacytoolsIO respects your Do Not Track setting in your browser. Users with Do Not Track enabled will not be tracked by any of our platforms.
-  You are also free to block stats.privacytools.io using whatever method you prefer with no detrimental effects on your experience using our services.</p>
-
-  <h2>Gathering of Personally-Identifying Information</h2>
-
-  <p>Certain visitors to privacytoolsIO's websites choose to interact with privacytoolsIO in ways that require privacytoolsIO to gather personally-identifying information.
-    The amount and type of information that privacytoolsIO gathers depends on the nature of the interaction. For example, we ask visitors who use our <a href="https://social.privacytools.io/">Mastodon service</a>
-    to provide a username and email address. In each case, privacytoolsIO collects such information only as in necessary or appropriate to fulfill the purpose of the
-    visitor’s interaction with privacytoolsIO. privacytoolsIO does not disclose personally-identifying information other than as described below. And visitors can always
-    refuse to supply personally-identifying information, with the caveat that it may prevent them from engaging in certain website-related activities.</p>
-
-  <h2>Protection of Personally-Identifying Information</h2>
-
-  <p>privacytoolsIO will never rent, sell, nor give away potentially personally-identifying and personally-identifying information to any third parties.</p>
-
-  <p>If you are a registered user of a privacytoolsIO service such as Mastodon or PeerTube, privacytoolsIO may occasionally send you an email to tell you about new features,
-    solicit your feedback, or just keep you up to date with what’s going on with the service and the privacytoolsIO organization.
-    We expect to keep this type of email to a minimum.</p>
-
-  <p>privacytoolsIO takes all measures reasonably necessary to protect against the unauthorized access, use, alteration, or destruction of potentially personally-identifying and personally-identifying information.</p>
-
-  <h2>Aggregated Statistics</h2>
-
-  <p>privacytoolsIO may collect statistics about the behavior of visitors to its websites, and may reveal generalized statistics related to a variety of our services.</p>
-
-  <h2>Cookies</h2>
-
-  <p>A cookie is a string of information that a website stores on a visitor’s computer, and that the visitor’s browser provides to the website each time the visitor returns.
-    privacytoolsIO uses cookies to help privacytoolsIO track visitor statistics, a visitor's usage of the privacytoolsIO website or services, and their services preferences.
-    privacytoolsIO visitors who do not wish to have cookies placed on their computers should set their browsers to refuse cookies before using privacytoolsIO's websites,
-    with the drawback that certain features of privacytoolsIO's websites may not function properly without the aid of cookies.</p>
-
-  <h2>Privacy Policy Changes</h2>
-
-  <p>Although most changes are likely to be minor, privacytoolsIO may change its Privacy Policy from time to time, and at privacytoolsIO's sole discretion.
-    privacytoolsIO encourages visitors to frequently check this page for any changes to its Privacy Policy. Your continued use of this site
-     after any change in this Privacy Policy will constitute your acceptance of such change.</p>
-
-  <h2>Contact Us</h2>
-
-  <p>If you have any questions or concerns about this privacy policy or the data we collect, you are free to <a href="https://github.com/privacytoolsIO/privacytools.io/issues">open an issue on our issue tracker at GitHub</a>.</p>

pages/privacy.md

@@ -0,0 +1,123 @@
+---
+layout: page
+permalink: /privacy/
+title: "Privacy Q&A"
+description: "This Privacy Statement explains what information PrivacyTools and its related entities collect about its users, what we do with that information, and how we handle the content you place in our products and services."
+---
+
+## Who is PrivacyTools?
+
+PrivacyTools is an unincorporated community developing this website and a number of privacy-friendly services. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacytoolsIO/people). In order to operate these services, PrivacyTools receives hosting and administration services from Aragon Ventures LLC.
+
+## How does PrivacyTools collect data about me?
+
+We collect data:
+
+* When you browse a website, forum, or other PrivacyTools service.
+* When you create an account on a PrivacyTools service.
+* When you post, send private messages, or otherwise participate on a PrivacyTools service.
+
+This data will be collected regardless of browser, device, or app used to access our services. We do not buy or otherwise receive data from data brokers.
+
+## What data do you collect and why?
+
+### We collect data about visits to our websites.
+
+When you visit a PrivacyTools website or service, regardless of whether you have an account or not, the website may use cookies, server logs, and other methods to collect the following data:
+
+* What pages you visit,
+* What actions you take on our website,
+* What browser, operating system, and device you use,
+* Search terms you use,
+* Your anonymized IP address: We anonymize the last 3 bytes of your IP, e.g. 192.xxx.xxx.xxx.
+
+We use this data to:
+
+* Optimize websites and services, so that they are quick and easy to use,
+* Diagnose and debug technical errors,
+* Defend websites and services from abuse and technical attacks,
+* Compile statistics on the popularity of a website, page, post, topic, etc., and
+* Compile statistics on the kinds of software and computers visitors use.
+
+This data is processed under our [Legitimate Interest](https://ico.org.uk/for-organisations/guide-to-data-protection/guide-to-the-general-data-protection-regulation-gdpr/legitimate-interests/when-can-we-rely-on-legitimate-interests/) to provide our services to you in a an efficient and secure manner and to ensure the legal compliance and proper administration of our business.
+
+Raw data such as pages visited, anonymized visitor IPs, and visitor actions will be retained for 60 days. In special circumstances—such as extended investigations regarding a technical attack—we may preserve logged data for longer periods for analysis. We store aggregate statistics about use of the websites and services we host indefinitely, but those statistics do not include data identifiable to you personally.
+
+You can opt out of some website tracking we do with Matomo using the form below. Our Matomo instance is blocked by most ad-blockers, so users blocking the domain `stats.privacytools.io` will not need to separately opt-out with the form below. Our Matomo instance also respects the Do Not Track (DNT) setting in your browser, so users with DNT enabled will not need to complete this form. Limited data may still be collected via server-side logs after opting out here, but this data cannot be used to identify you.
+
+<iframe style="border: 1; height: 120px; width: 100%;" src="https://stats.privacytools.io/index.php?module=CoreAdminHome&action=optOut&language=en&backgroundColor=ffffff&fontColor=212529&fontSize=1rem&fontFamily=-apple-system%2CBlinkMacSystemFont%2C%22Segoe%20UI%22%2CRoboto%2C%22Helvetica%20Neue%22%2CArial%2Csans-serif%2C%22Apple%20Color%20Emoji%22%2C%22Segoe%20UI%20Emoji%22%2C%22Segoe%20UI%20Symbol%22%2C%22Noto%20Color%20Emoji%22"></iframe>
+
+### We collect account data.
+
+On some websites and services we provide, many features may require an account. For example, on forum.privacytools.io an account is required to post and reply to topics.
+
+To sign up for most accounts, we will collect a name, username, email, and password. In the event a website requires more information than just that data, that will be clearly marked and noted in a separate privacy statement, per-site.
+
+We use your account data to identify you on the website, and to create pages specific to you, such as your profile page. We will also use your account data to publish a public profile for you on our services.
+
+We use your email to:
+
+* Notify you about posts and other activity on the websites or services.
+* Reset your password and help keep your account secure.
+* Contact you in special circumstances related to your account.
+* Contact you about legal requests, such as DMCA takedown requests.
+
+On some websites and services you may provide additional information for your account, such as a short biography, avatar, your location, or your birthday. We make that information available to everyone who can access the website or service in question. This information is not required to use any of our services, and can be erased at any time.
+
+We will store your account data as long as your account remains open. After closing an account, we may retain some or all of your account data in the form of backups or archives for up to 90 days.
+
+## Who is my data shared with?
+
+When you use services provided by PrivacyTools your data is shared with Aragon Ventures LLC, in order to facilitate their hosting obligations. Aragon Ventures LLC may collect and use your data as described in their privacy statement at [https://aragon.ventures/privacy](https://aragon.ventures/privacy/).
+
+Your account data, posts, and other activities on PrivacyTools services is shared with others as mentioned in the section about account data.
+
+## Where is my data stored?
+
+Your data is stored on servers provided by Aragon Ventures LLC, a company incorporated in Minnesota, United States. The primary datacenter for PrivacyTools is located in France. Some websites, services, or backups may reside in datacenters in multiple jurisdictions, including the United States and the European Union.
+
+## Is PrivacyTools GDPR compliant?
+
+We respect privacy rights under [Regulation (EU) 2016/679](https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=uriserv:OJ.L_.2016.119.01.0001.01.ENG), the European Union’s General Data Protection Regulation (GDPR). Information that GDPR requires us to give can be found throughout this document.
+
+## What are my data protection rights?
+
+We would like to make sure you are fully aware of all of your data protection rights. Every user is entitled to the following:
+
+* **The right to access** – You have the right to request access to your personal data, or copies of your personal data from us. We may charge you a small fee for providing a copy of your data.
+* **The right to rectification** – You have the right to request that we correct any information you believe is inaccurate or incomplete.
+* **The right to erasure** – You have the right to request that we erase your personal data, under certain conditions.
+* **The right to restrict processing** – You have the right to request that we restrict the processing of your personal data, under certain conditions.
+* **The right to object to processing** – You have the right to object to our processing of your personal data, under certain conditions.
+* **The right to data portability** – You have the right to request that we transfer the data that we have collected to another organization, or directly to you, under certain conditions.
+
+## How can I contact the PrivacyTools team about privacy?
+
+The PrivacyTools team generally does not have access to personal data outside of limited access granted via some moderation panels. Inquiries regarding your personal information should be sent directly to the data controller for these services, Aragon Ventures LLC:
+
+```
+Jonah Aragon
+Services Administrator, Aragon Ventures LLC
+privacy@aragon.ventures
+```
+
+or write to:
+
+```
+Aragon Ventures LLC
+PO Box 201
+Anoka, MN 55303
+United States
+```
+
+For all other inquiries, you can contact the team via methods described on our [contact page]({{ site.production_url }}/contact/).
+
+For complaints under GDPR more generally, European Union users may lodge complaints with their local data protection supervisory authorities.
+
+## How can I find out about changes to this document?
+
+This version of our privacy statement took effect October 9th, 2019.
+
+We will post any new versions of this statement at [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/). We may change how we announce changes in future versions of this document. In the meantime we may update our contact information at any time without announcing a change. Please refer to [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/) for the latest contact information at any time.
+
+A full [revision history](https://github.com/privacytoolsIO/privacytools.io/commits/master/pages/privacy.md) for this page can be found on GitHub.

pages/providers/vpn.html

@@ -47,20 +47,20 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your
 
     <div class="col-12">
       <h3><span class="badge badge-info">Technology</span></h3>
-      <p>We require all our recommended VPN providers to provide OpenVPN configuration files to be used in any client. <strong>If</strong> a VPN provides their own custom client, we require a kill-switch to block network data leaks when disconnected.</p>
+      <p>We require all our recommended VPN providers to provide OpenVPN configuration files to be used in any client. <strong>If</strong> a VPN provides their own custom client, we require a killswitch to block network data leaks when disconnected.</p>
     </div>
     <div class="col-md-6">
       <p><strong>Minimum to Qualify:</strong></p>
       <ul>
         <li>OpenVPN support.</li>
-        <li>Kill switch built in to clients.</li>
+        <li>Killswitch built in to clients.</li>
       </ul>
     </div>
     <div class="col-md-6">
       <p><strong>Best Case:</strong></p>
       <ul>
-        <li>OpenVPN and Wireguard support.</li>
-        <li>Kill-switch with highly configurable options (enable/disable on certain networks, on boot, etc.)</li>
+        <li>OpenVPN and WireGuard support.</li>
+        <li>Killswitch with highly configurable options (enable/disable on certain networks, on boot, etc.)</li>
         <li>Easy-to-use mobile clients, especially open-source.</li>
       </ul>
     </div>
@@ -86,7 +86,7 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your
 
     <div class="col-12">
       <h3><span class="badge badge-info">Security</span></h3>
-      <p>A VPN is pointless if it can't even provide adequate security. We require all our recommended providers to abide by current security standards for their OpenVPN connections. Ideally, they would use more future-proof encryption schemes by default. We also require an independent third-party to audit the provider's security. Ideally in a very comprehensive manner and on a repeated (yearly) basis.</p>
+      <p>A VPN is pointless if it can't even provide adequate security. We require all our recommended providers to abide by current security standards for their OpenVPN connections. Ideally, they would use more future-proof encryption schemes by default. We also require an independent third-party to audit the provider's security, ideally in a very comprehensive manner and on a repeated (yearly) basis.</p>
     </div>
     <div class="col-md-6">
       <p><strong>Minimum to Qualify:</strong></p>
@@ -102,7 +102,7 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your
         <li>Strongest Encryption: RSA-4096.</li>
         <li>Perfect Forward Secrecy (PFS).</li>
         <li>Comprehensive published security audits from a reputable third-party firm.</li>
-        <li>Bug-bounty programs and/or a coordinated vulnerability-disclosure process</li>
+        <li>Bug-bounty programs and/or a coordinated vulnerability-disclosure process.</li>
       </ul>
     </div>
 
@@ -145,7 +145,7 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your
       <p>In most cases, most of your traffic is already encrypted! Over 98% of the top 3000 websites offer <strong>HTTPS</strong>, meaning your non-DNS traffic is safe regardless of using a VPN. It is incredibly rare for applications that handle personal data to not support HTTPS in 2019, especially with services like Let's Encrypt offering free HTTPS certificates to any website operator.</p>
       <p>Even if a site you visit doesn't support HTTPS, a VPN will not protect you, because a VPN cannot magically encrypt the traffic between the VPN's servers and the website's servers. Installing an extension like <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> and making sure every site you visit uses HTTPS is far more helpful than using a VPN.</p>
       <h4>Should I use encrypted DNS with a VPN?</h4>
-      <p>The answer to this question is also the not very helpful: <strong>it depends</strong>. Your VPN provider may have their own DNS servers, but if they don't, the traffic between your VPN provider and the DNS server isn't encrypted. You need to trust the <a href="/providers/dns/#icanndns">encrypted DNS provider</a> in addition to the VPN provider and unless your client and target server support <a href="https://www.eff.org/deeplinks/2018/09/esni-privacy-protecting-upgrade-https">encrypted SNI</a>, the VPN provider can still see which domains you are visiting.</p>
+      <p>The answer to this question is also not very helpful: <strong>it depends</strong>. Your VPN provider may have their own DNS servers, but if they don't, the traffic between your VPN provider and the DNS server isn't encrypted. You need to trust the <a href="/providers/dns/#icanndns">encrypted DNS provider</a> in addition to the VPN provider and unless your client and target server support <a href="https://www.eff.org/deeplinks/2018/09/esni-privacy-protecting-upgrade-https">encrypted SNI</a>, the VPN provider can still see which domains you are visiting.</p>
       <p>However <strong>you shouldn't use encrypted DNS with Tor</strong>. This would direct all of your DNS requests through a single circuit, and would allow the encrypted DNS provider to deanonymize you.</p>
       <h3>What if I need anonymity?</h3>
       <p>VPNs cannot provide strong anonymity. Your VPN provider will still see your real IP address, and often has a money trail that can be linked directly back to you. You cannot rely on "no logging" policies to protect your data.</p>
@@ -159,9 +159,9 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your
       <p>A VPN may still be useful to you in a variety of scenarios, such as:</p>
       <ol>
         <li>Hiding your traffic from <strong>only</strong> your Internet Service Provider.</li>
-        <li>Hiding your downloads (such as Torrents) from your ISP and anti-piracy organizations.</li>
+        <li>Hiding your downloads (such as torrents) from your ISP and anti-piracy organizations.</li>
       </ol>
-      <p>For use-cases like these, or if you have another compelling reason, the VPN providers we listed above are who we think are the most trustworthy. However, using a VPN provider still means you're <em>trusting</em> the provider. In pretty much any other scenario you should be using a secure<strong>-by-design</strong> tool such as Tor.</p>
+      <p>For use cases like these, or if you have another compelling reason, the VPN providers we listed above are who we think are the most trustworthy. However, using a VPN provider still means you're <em>trusting</em> the provider. In pretty much any other scenario you should be using a secure<strong>-by-design</strong> tool such as Tor.</p>
     </div>
   </div>
   <div class="row">
@@ -170,7 +170,7 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your
         <ol>
           <li><a href="https://schub.io/blog/2019/04/08/very-precarious-narrative.html">VPN - a Very Precarious Narrative</a> by Dennis Schubert</li>
           <li><a href="https://gist.github.com/joepie91/5a9909939e6ce7d09e29">Don't use VPN services</a> by Sven Slootweg</li>
-          <li><a href="/software/networks/">Self-contained networks</a> on privacytools.io are able to replace a VPN that allows access to services on local area network</li>
+          <li><a href="/software/networks/">The self-contained networks</a> recommended by PrivacyTools are able to replace a VPN that allows access to services on local area network</li>
           <li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">Slicing Onions: Part 1 – Myth-busting Tor</a> by blacklight447</li>
           <li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-2-onion-recipes-vpn-not-required">Slicing Onions: Part 2 – Onion recipes; VPN not required</a> by blacklight447</li>
         </ol>

pages/services.html

@@ -1,8 +1,8 @@
 ---
 layout: page
 permalink: /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."
+title: "Services from PrivacyTools"
+description: "The PrivacyTools 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."
 ---
 
 <p>We currently have the following free-to-use services online now.</p>

pages/software.html

@@ -2,7 +2,7 @@
 layout: page
 permalink: /software/
 title: "Software"
-description: "Discover a variety of open source software built to protect your privacy and keep your digital data secure."
+description: "Discover a variety of open-source software built to protect your privacy and keep your digital data secure."
 ---
 
 <p>Click on whatever software you need to view our recommendations.</p>

pages/software/cal-card.html

@@ -2,7 +2,7 @@
 layout: page
 permalink: /software/calendar-contacts/
 title: "Calendar/Contacts Sync Tools"
-description: "Discover free, open source, and secure ways to sync your contacts and calendars across your devices."
+description: "Discover free, open-source, and secure ways to sync your contacts and calendars across your devices."
 ---
 
 {% include sections/calendar-contacts-sync.html %}