Remove padding in logo

Create logo from SVG: https://metager.org/img/metager-schloss.svg

.github/CODEOWNERS

@@ -1,9 +1,9 @@
 # Editorial Team
-*.md @privacytools/editorial
-/assets/ @privacytools/editorial
-/pages/ @privacytools/editorial
-/_includes/sections/ @privacytools/editorial
-/index.html @privacytools/editorial
+*.md @privacytoolsIO/editorial
+/assets/ @privacytoolsIO/editorial
+/pages/ @privacytoolsIO/editorial
+/_includes/sections/ @privacytoolsIO/editorial
+/index.html @privacytoolsIO/editorial
 /font/ @dawidpotocki
 
 # Administration Related Files

.github/CONTRIBUTING.md

@@ -25,7 +25,7 @@ Please read this document in full before contributing.
 - Be constructive.
 - Please feel free to *review changes* in the *files changed* tab of any
   pull request at any time.
-- See also our [Code of Conduct](https://github.com/privacytools/.github/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
 
@@ -96,8 +96,8 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details.
 ## Images
 
 - SVG file format is strongly preferred. PNG files can be used as a fallback if images are too complex or otherwise unsuitable as a vector format.
-- Provider logo dimensions are 384px x 128px ([example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg))
-- Tool logo dimensions are 120px x 120px ([SVG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/png/3rd-party/claws_mail.png))
+- Provider logo dimensions are 384px x 128px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg))
+- Tool logo dimensions are 120px x 120px ([SVG example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/png/3rd-party/claws_mail.png))
 
 ## Licensing
 
@@ -111,4 +111,4 @@ If you do not have a GitHub account, you may submit software recommendations or
 
 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/privacytools/privacytools.io/issues/1444).
+You can view an example of the created issues' format at [#1444](https://github.com/privacytoolsIO/privacytools.io/issues/1444).

.github/ISSUE_TEMPLATE/5_Website_Issues.md

@@ -9,7 +9,7 @@ labels: 🌐 website issue
 
 READ ME FIRST:
 This is NOT the place to request changes to the content of the website.
-This is NOT the place to report issues with our services. (That is https://github.com/privacytools/services/issues/new)
+This is NOT the place to report issues with our services. (That is https://github.com/privacytoolsIO/services/issues/new)
 This is ONLY for reporting bugs or technical issues with www.privacytools.io.
 
 -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,6 +1,6 @@
 contact_links:
   - name: Services issues
-    url: https://github.com/privacytools/services/issues/new/choose
+    url: https://github.com/privacytoolsIO/services/issues/new/choose
     about: Open any issues/bug reports/requests related to our services (Mastodon, Matrix, etc) here.
   - name: PrivacyTools Community
     url: https://forum.privacytools.io/

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- PLEASE READ OUR CODE OF CONDUCT (https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct) AND CONTRIBUTING GUIDELINES (https://github.com/privacytools/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
+<!-- PLEASE READ OUR CODE OF CONDUCT (https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct) AND CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
 
 ## Description
 
@@ -8,7 +8,7 @@ Resolves: #none <!-- A link to the (discussion) issue resolved by this pull requ
 
 - [ ] I understand that by not opening an issue about a software/service/similar addition/removal, this pull request will be closed without merging.
 
-- [ ] I have read and understand [the contributing guidelines](https://github.com/privacytools/privacytools.io/blob/master/.github/CONTRIBUTING.md).
+- [ ] I have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
 
 - [ ] The project is [Free Libre](https://en.wikipedia.org/wiki/Free_software) and/or [Open Source](https://en.wikipedia.org/wiki/Open-source_software) Software
 

.well-known/security.txt

@@ -2,4 +2,4 @@ Contact: admin@privacytools.io
 Encryption: https://www.jonaharagon.com/keys/
 Preferred-Languages: en
 Canonical: https://www.privacytools.io/.well-known/security.txt
-Policy: https://github.com/privacytools/privacytools.io/security/policy
+Policy: https://github.com/privacytoolsIO/privacytools.io/security/policy

README.md

@@ -10,7 +10,7 @@ _Encryption Against Global Mass Surveillance._
 
 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!** If you want to help make privacytools.io the best website it can be, join our Matrix discussion chat at [`#dev:privacytools.io`](https://matrix.to/#/#dev:privacytools.io), where we talk about open issues and PRs in this repo, and changes to the site. You may submit any website suggestions here on GitHub [Issues](https://github.com/privacytools/privacytools.io/issues). Please refer to the [contribution guidelines](.github/CONTRIBUTING.md) and consider stopping by our chat room before submitting. Thank you.
+**Talk to us!** If you want to help make privacytools.io the best website it can be, join our Matrix discussion chat at [`#dev:privacytools.io`](https://matrix.to/#/#dev:privacytools.io), where we talk about open issues and PRs in this repo, and changes to the site. You may submit any website suggestions here on GitHub [Issues](https://github.com/privacytoolsIO/privacytools.io/issues). Please refer to the [contribution guidelines](.github/CONTRIBUTING.md) and consider stopping by our chat room before submitting. Thank you.
 
 If you want to discuss privacy in general, a new tool, or just something else, feel free to join [our Discourse community](https://forum.privacytools.io/) or our general Matrix room at [`#general:privacytools.io`](https://matrix.to/#/#general:privacytools.io) and start a discussion! This is a community project and we're aiming to deliver the best information available. Thank you for participating.
 
@@ -29,6 +29,7 @@ If you want to discuss privacy in general, a new tool, or just something else, f
 # Support
 
 - [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/)
 - [Make suggestions on reddit.](https://www.reddit.com/r/privacytoolsIO/)
@@ -50,4 +51,4 @@ If you want to discuss privacy in general, a new tool, or just something else, f
 
 # License & Notices
 
-Please visit [https://www.privacytools.io/notices/](https://www.privacytools.io/notices/) for license information and other disclaimers. PrivacyTools is provided on an "as-is" basis, without warranty, and disclaiming liability for damages. By contributing to this repository you agree to license your work under the terms of the [license](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt) in this repository.
+Please visit [https://www.privacytools.io/notices/](https://www.privacytools.io/notices/) for license information and other disclaimers. PrivacyTools is provided on an "as-is" basis, without warranty, and disclaiming liability for damages. By contributing to this repository you agree to license your work under the terms of the [license](https://github.com/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt) in this repository.

_includes/badge.html

@@ -1,20 +0,0 @@
-{% if include.link %}
-<a
-  href="{{ link }}" class="badge badge-{{ include.color | default: "info" }}"
-  {% if include.tooltip %}
-  data-toggle="tooltip"
-  title="{{ include.tooltip }}"><i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{ include.text }}
-{% else %}><i class="{{ include.icon | default: "fas fa-external-link-alt"}}"></i> {{ include.text }}{% endif %}
-</a>
-{% else %}
-<span
-  class="badge badge-{{ include.color | default: "info" }}"
-  {% if include.tooltip %}
-    data-toggle="tooltip"
-    title="{{ include.tooltip }}"
-    > <i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{include.text}}
-  {% else %}
-    > {% if include.icon %}<i class="{{ include.icon }}"></i>{% endif %} {{include.text}}
-  {% endif %}
-</span>
-{% endif %}

_includes/cardv2.html

@@ -41,35 +41,23 @@
       {{ include.description }}
       {% if include.labels %}
       {% assign labels = include.labels | split:"|" %}
-      {% for label in labels %}
-        {% assign label_data = label | split:"::" %}
-          {% for label_attr in label_data %}
-            {% assign attr = label_attr | split:"==" %}
-            {% if attr[0] == "color" %}
-              {% assign color = attr[1] %}
-            {% elsif attr[0] == "link" %}
-              {% assign link = attr[1] %}
-            {% elsif attr[0] == "text" %}
-              {% assign text = attr[1] %}
-            {% elsif attr[0] == "icon" %}
-              {% assign icon = attr[1] %}
-            {% elsif attr[0] == "tooltip" %}
-              {% assign tooltip = attr[1] %}
+        {% for label in labels %}
+          {% assign label_data = label | split:":" %}
+          {% assign color = label_data[0] %}
+          {% assign text = label_data[1] %}
+          {% assign tooltip = label_data[2] | default: false %}
+          {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+          <span
+            class="badge badge-{{color}}"
+            {% if tooltip %}
+              data-toggle="tooltip"
+              title="{{ tooltip }}"
+              > {{text}} {{ help_icon }}
+            {% else %}
+              > {{text}}
             {% endif %}
-          {% endfor %}
-        {% include badge.html
-          link=link
-          color=color
-          text=text
-          icon=icon
-          tooltip=tooltip
-        %}
-        {% assign color = nil %}
-        {% assign link = nil %}
-        {% assign text = nil %}
-        {% assign icon = nil %}
-        {% assign tooltip = nil %}
-      {% endfor %}
+          </span>
+        {% endfor %}
       {% endif %}
     </p>
     <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">

_includes/footer.html

@@ -89,7 +89,7 @@
     <small>
       <a href="/privacy/">Privacy Statement</a> |
       <a href="/notices/">Notices &amp; Disclaimers</a> |
-      <a href="https://github.com/privacytools/brand">Brand Assets &amp; Guidelines</a> |
+      <a href="https://github.com/privacytoolsIO/brand">Brand Assets &amp; Guidelines</a> |
       <a href="https://status.privacytools.io">Status Page</a>
     </small>
 

_includes/head.html

@@ -41,7 +41,7 @@
       "https://twitter.com/privacytoolsIO",
       "https://social.privacytools.io/@privacytools",
       "https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg",
-      "https://github.com/privacytools"
+      "https://github.com/privacytoolsIO"
     ]
   }
   </script>

_includes/sections/browser-addons.html

@@ -12,7 +12,7 @@ website="https://addons.mozilla.org/firefox/addon/ublock-origin/"
 privacy-policy="https://github.com/gorhill/uBlock/wiki/Privacy-policy"
 forum="https://forum.privacytools.io/t/discussion-ublock-origin/266"
 github="https://github.com/gorhill/uBlock/"
-firefox="https://addons.mozilla.org/firefox/addon/ublock-origin/"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/"
 chrome="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm"
 opera="https://addons.opera.com/en/extensions/details/ublock/"
 edge="https://www.microsoft.com/en-us/p/ublock-origin/9nblggh444l4"
@@ -26,7 +26,7 @@ website="https://www.eff.org/https-everywhere"
 privacy-policy="https://www.eff.org/code/privacy/policy"
 forum="https://forum.privacytools.io/t/discussion-https-everywhere/268"
 github="https://github.com/EFForg/https-everywhere"
-firefox="https://addons.mozilla.org/firefox/addon/https-everywhere"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/https-everywhere"
 chrome="https://chrome.google.com/webstore/detail/https-everywhere/gcbommkclmclpchllfjekcdonpmejbdp"
 opera="https://addons.opera.com/en/extensions/details/https-everywhere"
 %}
@@ -39,22 +39,9 @@ website="https://decentraleyes.org/"
 privacy-policy="https://decentraleyes.org/privacy-policy/"
 forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
 gitlab="https://git.synz.io/Synzvato/decentraleyes"
-firefox="https://addons.mozilla.org/firefox/addon/decentraleyes"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/decentraleyes"
 chrome="https://chrome.google.com/webstore/detail/decentraleyes/ldpochfccmkkmhdbclfhpagapcfdljkj"
-opera="https://addons.opera.com/extensions/details/decentraleyes"
-%}
-
-{% include cardv2.html
-title="ClearURLs"
-image="/assets/img/svg/3rd-party/clearurls.svg"
-description="<strong>ClearURLs</strong> will automatically remove tracking elements from URLs to help protect your privacy when browse through the Internet."
-website="https://gitlab.com/KevinRoebert/ClearUrls"
-privacy-policy="https://gitlab.com/KevinRoebert/ClearUrls/-/blob/master/PRIVACY.md"
-forum="https://forum.privacytools.io/t/discussion-clearurls/3353"
-gitlab="https://gitlab.com/KevinRoebert/ClearUrls"
-firefox="https://addons.mozilla.org/firefox/addon/clearurls/"
-chrome="https://chrome.google.com/webstore/detail/clearurls/lckanjgmijmafbedllaakclkaicjfmnk"
-edge="https://microsoftedge.microsoft.com/addons/detail/mdkdmaickkfdekbjdoojfalpbkgaddei"
+opera="https://addons.opera.com/en/extensions/details/decentraleyes"
 %}
 
 <h2>Additional Functionality</h2>
@@ -68,12 +55,12 @@ title="Terms of Service; Didn’t Read: Be Informed"
 image="/assets/img/svg/3rd-party/terms_of_service_didnt_read.svg"
 description='<strong>Terms of Service; Didn’t Read</strong> is an addon that believes "I have read and agree to the Terms of Service" is the biggest lie on the web, and wants to fix it by grading websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analysis and ratings are published transparently by a community of reviewers.'
 website="https://tosdr.org/"
-privacy-policy="https://addons.mozilla.org/firefox/addon/terms-of-service-didnt-read/privacy/"
+privacy-policy="https://addons.mozilla.org/en-US/firefox/addon/terms-of-service-didnt-read/privacy/"
 forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270"
 github="https://github.com/tosdr/"
-firefox="https://addons.mozilla.org/firefox/addon/terms-of-service-didnt-read/"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/terms-of-service-didnt-read/"
 chrome="https://chrome.google.com/webstore/detail/terms-of-service-didn%E2%80%99t-r/hjdoplcnndgiblooccencgcggcoihigg"
-opera="https://addons.opera.com/extensions/details/terms-of-service-didnt-read"
+opera="https://addons.opera.com/en/extensions/details/terms-of-service-didnt-read"
 %}
 
 {% include cardv2.html
@@ -83,93 +70,36 @@ description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torpro
 website="https://snowflake.torproject.org"
 forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
 git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
-firefox="https://addons.mozilla.org/firefox/addon/torproject-snowflake"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake"
 chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
 %}
 
-<h2>Persistent storage management</h2>
-
-<h3>Desktop</h3>
-
-<div class="alert alert-warning" role="alert">
-  These add-ons are the preferred method for controlling persistent storage data that various websites and web-apps may create on your computer.
-</div>
-
-{% include cardv2.html
-title="Temporary Containers"
-image="/assets/img/svg/3rd-party/temporary_containers.svg"
-image-dark="/assets/img/svg/3rd-party/temporary_containers-dark.svg"
-description="<strong>Temporary Containers</strong> allow you to open tabs, websites, and links in automatically managed disposable containers. Containers isolate data websites store (cookies, storage, and more) from each other, enhancing your privacy and security while you browse: <a href=https://medium.com/@stoically/enhance-your-privacy-in-firefox-with-temporary-containers-33925cd6cd21>Enhance your privacy in Firefox with Temporary Containers.</a>"
-website="https://addons.mozilla.org/firefox/addon/temporary-containers/"
-privacy-policy="https://addons.mozilla.org/firefox/addon/temporary-containers/privacy/"
-forum="https://forum.privacytools.io/t/discussion-temporary-containers-multi-account-containers/3354"
-github="https://github.com/stoically/temporary-containers"
-firefox="https://addons.mozilla.org/firefox/addon/temporary-containers/"
-%}
-
-{% include cardv2.html
-title="Firefox Multi-Account Containers"
-image="/assets/img/svg/3rd-party/firefox_multi_account_containers.svg"
-description="<strong>Firefox Multi-Account Containers</strong> allow you to create containers for specific websites. These containers are isolated from eachother. This add-on can be used in conjunctiuon with Temporary Containers to allow persistent logins to websites you specify."
-website="https://support.mozilla.org/kb/containers"
-forum="https://forum.privacytools.io/t/discussion-temporary-containers-multi-account-containers/3354"
-github="https://github.com/mozilla/multi-account-containers"
-firefox="https://addons.mozilla.org/firefox/addon/multi-account-containers/"
-%}
-
-<h3>Android</h3>
-
-<div class="alert alert-warning" role="alert">
-  Unfortunately the Android version of Firefox <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1398097">doesn't support managing tabs as containers</a>. The recommended extensions below are a substitute, however as APIs do not exist for clearing <a href="https://en.wikipedia.org/wiki/Indexed_Database_API">IndexedDB</a>, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#Service_workers">Service Workers</a> cache, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#AppCache_(obsolete)">appCache</a>, or cache by host. As a result they are not as good as the above Temporary Container suggestions.
-</div>
-
-{% include cardv2.html
-title="ETag Stoppa"
-image="/assets/img/svg/3rd-party/etag_stoppa.svg"
-description="<strong>ETag Stoppa</strong> Prevents Firefox from storing entity tags by removing ETag response headers unconditionally and without exceptions."
-website="https://addons.mozilla.org/firefox/addon/etag-stoppa/"
-forum=""
-github="https://github.com/claustromaniac/etag-stoppa"
-firefox="https://addons.mozilla.org/firefox/addon/etag-stoppa/"
-%}
-
-{% include cardv2.html
-title="Cookie AutoDelete: Automatically Delete Cookies"
-image="/assets/img/png/3rd-party/cookie_autodelete.png"
-description="<strong>Cookie AutoDelete</strong> automatically removes cookies, lingering sessions, and other information that can be used to spy on you when they are no longer used by open browser tabs."
-website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/"
-forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267"
-github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete"
-firefox="https://addons.mozilla.org/firefox/addon/cookie-autodelete"
-chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
-%}
-
 <h2>For Advanced Users</h2>
 
 <div class="alert alert-warning" role="alert">
   These addons require quite a lot of interaction from the user, and some of them completely replace the add-ons we've recommended above. Some sites may not work properly without careful configuration.
 </div>
 
+{% include cardv2.html
+title="Cookie AutoDelete: Automatically Delete Cookies"
+image="/assets/img/png/3rd-party/cookie_autodelete.png"
+description="<strong>Cookie AutoDelete</strong> automatically removes cookies, lingering sessions, and other information that can be used to spy on you when they are no longer used by open browser tabs."
+website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/"
+forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267"
+github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete"
+chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
+%}
+
 {% include cardv2.html
 title="uMatrix: Stop Cross-Site Requests"
 image="/assets/img/png/3rd-party/umatrix.png"
-description="<strong>uMatrix</strong> gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics. uMatrix allows 1st party scripts in its default configuration. If you want the default functionality of NoScript consider <a href=https://github.com/gorhill/uMatrix/wiki/How-to-block-1st-party-scripts-everywhere-by-default>blocking 1st party scripts everywhere by default</a>."
+description="<strong>uMatrix</strong> gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics."
 website="https://addons.mozilla.org/firefox/addon/umatrix/"
 privacy-policy="https://github.com/gorhill/uMatrix/wiki/Privacy-policy"
 forum="https://forum.privacytools.io/t/discussion-umatrix/271"
 github="https://github.com/gorhill/uMatrix"
-firefox="https://addons.mozilla.org/firefox/addon/umatrix"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/umatrix"
 chrome="https://chrome.google.com/webstore/detail/umatrix/ogfcmafjalglgifnmanfmnieipoejdcf"
-opera="https://addons.opera.com/extensions/details/umatrix"
-%}
-
-{% include cardv2.html
-title="CanvasBlocker"
-image="/assets/img/svg/3rd-party/canvasblocker.svg"
-description="<strong>CanvasBlocker</strong> allows users to prevent websites from using some Javascript APIs to fingerprint them. Users can choose to block the APIs entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API."
-website="https://github.com/kkapsner/CanvasBlocker/"
-privacy-policy="https://addons.mozilla.org/firefox/addon/canvasblocker/privacy/"
-forum="https://forum.privacytools.io/t/discussion-canvasblocker/3352"
-github="https://github.com/kkapsner/CanvasBlocker/"
-firefox="https://addons.mozilla.org/firefox/addon/canvasblocker/"
+opera="https://addons.opera.com/en/extensions/details/umatrix"
 %}

_includes/sections/browser-fingerprint.html

@@ -4,17 +4,23 @@
   Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.
 </div>
 
-<p>When you visit a web page, your browser voluntarily sends information about its configuration, such as available fonts, browser type, and add-ons. If this combination of information is unique, it may be possible to identify and track you without using cookies. EFF created a Tool called <a href="https://panopticlick.eff.org/" target="_blank">Panopticlick</a> to test your browser to see how unique it is.</p>
+<p>When you visit a web page, your browser voluntarily sends information about its configuration, such as available fonts, browser type, and add-ons. If this combination of information is unique, it may be possible to identify and track you without using cookies. EFF created a Tool called <a href="https://panopticlick.eff.org/">Panopticlick</a> to test your browser to see how unique it is.</p>
 
 <p>
-<a class="btn btn-warning" target="_blank" href="https://panopticlick.eff.org/">
+<a class="btn btn-warning" href="https://panopticlick.eff.org/">
   Test your Browser now
 </a>
 </p>
 
 <p>You need to find what <strong>most browsers</strong> are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a <a href="https://addons.mozilla.org/firefox/addon/uaswitcher/">spoofed user-agent string</a> to match what the large userbase has. You need to have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even using the Tor Browser Bundle, will make your browser stick out from the masses.</p>
 
-<p>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> to regain control. 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>
+<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>
+
+
+<h3>Firefox Addon: CanvasBlocker</h3>
+<ul>
+	<li><a href="https://addons.mozilla.org/firefox/addon/canvasblocker/">addons.mozilla.org</a> - <strong>CanvasBlocker</strong> allows users to prevent websites from using some Javascript APIs to fingerprint them. Users can choose to block the APIs entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API.</li>
+</ul>
 
 <h3>Related Information</h3>
 

_includes/sections/cloud-storage.html

@@ -4,30 +4,11 @@
   <strong>If you are currently using Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should pick an alternative here.</strong>
 </div>
 
-{%
-  include cardv2.html
-  title="Keybase KBFS"
-  image="/assets/img/svg/3rd-party/keybase.svg"
-  description='Keybase provides 250GB of E2EE cloud storage for free. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase allows you to share files with any Keybase user, or social media user through the use of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>". They currently do not offer additional space above your quota.'
-  labels="color==warning::icon==fas fa-exclamation-triangle::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server."
-  website="https://book.keybase.io/docs/files"
-  privacy-policy="https://keybase.io/docs/privacypolicy"
-  forum="https://forum.privacytools.io/t/discussion-keybase/1224"
-  tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
-  github="https://github.com/keybase/client/tree/master/go/kbfs"
-  windows="https://keybase.io/docs/the_app/install_windows"
-  mac="https://keybase.io/docs/the_app/install_macos"
-  linux="https://keybase.io/docs/the_app/install_linux"
-  freebsd="https://www.freshports.org/security/keybase/"
-  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage"
-  ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770"
-%}
-
 {% include cardv2.html
   title="Nextcloud - Choose your hoster"
   image="/assets/img/svg/3rd-party/nextcloud.svg"
   description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
-  labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
+  labels="warning:<a href=//github.com/nextcloud/end_to_end_encryption/issues/111>Experimental E2EE</a>:Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
   website="https://nextcloud.com/"
   privacy-policy="https://nextcloud.com/privacy/"
   forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
@@ -47,6 +28,6 @@
 <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. {% include badge.html color="warning" tooltip="Cryptomator's mobile apps are not open-source." link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375" icon="fas fa-exclamation-triangle" %}</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

@@ -389,6 +389,41 @@
         </td>
       </tr>
 
+      <tr>
+        <td data-value="SecureDNS">
+          <a href="https://securedns.eu/">SecureDNS</a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-nl"></span>
+            The Netherlands
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://securedns.eu/#privacy">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>Hobby Project</td>
+        <td>No</td>
+        <td>DoH, DoT, DNSCrypt</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice
+          </span>
+        </td>
+        <td>?</td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.digitalocean.com/">DigitalOcean, Inc.</a>
+          </span>
+        </td>
+      </tr>
+
       <tr>
         <td data-value="Snopyta">
           <a href="https://snopyta.org/service/dns/index.html">Snopyta</a>

_includes/sections/file-sharing.html

@@ -3,7 +3,7 @@
 {% include cardv2.html
 title="Firefox Send"
 image="/assets/img/svg/3rd-party/firefox_send.svg"
-labels="color==warning::link==https://send.firefox.com/legal::text==Warning::tooltip==IP addresses are retained in logs for 90 days."
+labels="warning:<a href=//send.firefox.com/legal>Warning</a>: IP addresses are retained in logs for 90 days."
 description="Firefox Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether you would like to add a password for an extra layer of security."
 website="https://send.firefox.com/"
 privacy-policy="https://send.firefox.com/legal"

_includes/sections/header.html

@@ -1,5 +1,5 @@
 <div class="alert alert-success" role="alert">
-  <strong>New!</strong> Financial <a href="https://opencollective.com/privacytools" class="alert-link">contributions</a> to {{ site.name }} are now tax deductible in the US! <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="alert-link">Learn more...</a>
+  <strong>New!</strong> Financial <a href="https://opencollective.com/privacytoolsio" class="alert-link">contributions</a> to {{ site.name }} are now tax deductible in the US! <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="alert-link">Learn more...</a>
 </div>
 
 <div class="jumbotron p-5">

_includes/sections/instant-messenger.html

@@ -24,7 +24,7 @@
   title="Signal"
   image="/assets/img/svg/3rd-party/signal.svg"
   description='Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging, as well as voice and video calling. All communications are E2EE unless you choose to send as SMS. Its protocol has also been <a href="https://eprint.iacr.org/2016/1013.pdf">indepedently audited (PDF)</a>'
-  labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Requires phone number::tooltip==Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|text==VoIP"
+  labels="warning:<a>Requires phone number</a>:Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|success:VoIP"
   website="https://signal.org/"
   privacy-policy="https://signal.org/legal/"
   forum="https://forum.privacytools.io/t/discussion-signal/664"
@@ -42,7 +42,7 @@
   title="Keybase"
   image="/assets/img/svg/3rd-party/keybase.svg"
   description='Keybase provides a hosted team chat with E2EE. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase can help you prove you own social media accounts though the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
-  labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server."
+  labels="warning:<a href=//github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
   website="https://keybase.io/"
   privacy-policy="https://keybase.io/docs/privacypolicy"
   forum="https://forum.privacytools.io/t/discussion-keybase/1224"
@@ -94,8 +94,9 @@
   include cardv2.html
   title="Riot"
   image="/assets/img/svg/3rd-party/riotim.svg"
-  description='<a href="//about.riot.im">Riot.im</a> is the reference client for the <a href="//matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="//matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.'
-  labels="text==VoIP"
+  description='<a href="//about.riot.im">Riot.im</a> is the reference client for the <a href="//matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="//matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.<br />'
+  labels="warning:<a href=//github.com/vector-im/riot-web/issues/6779>Warning</a>:Riot offers optional E2EE for 1&#x3a;1 and group conversations that must be turned on by the user.
+  (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security &amp; Privacy → Encrypted).|success:VoIP"
   website="https://about.riot.im/"
   privacy-policy="https://riot.im/privacy"
   forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
@@ -166,7 +167,7 @@
   title="Jami"
   image="/assets/img/svg/3rd-party/jami.svg"
   description="Encrypted instant messaging and video calling software. All communications are E2EE using <a href=//jami.net/improving-performance-and-security-with-tls-1-3/>TLS 1.3</a> and never stored elsewhere than on user's devices, even when <a href=//jami.net/why-is-jami-truly-distributed/>TURN servers are used</a>."
-  labels="color==warning::link==https://git.jami.net/savoirfairelinux/ring-project/issues/765::text==Warning::tooltip==This software is partially centralized but can be self-hosted.|text==VoIP"
+  labels="warning:<a href=//git.jami.net/savoirfairelinux/ring-project/issues/765>Warning</a>:This software is partially centralized but can be self-hosted.|success:VoIP"
   website="https://jami.net/"
   privacy-policy="https://jami.net/privacy-policy/"
   forum="https://forum.privacytools.io/t/discussion-jami/2116"

_includes/sections/live-operating-systems.html

@@ -5,7 +5,7 @@ title="Tails"
 image="/assets/img/svg/3rd-party/tails.svg"
 description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.'
 badges="info:GNU/Linux"
-labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://tails.boum.org/"
 git="https://git-tails.immerda.ch/tails/"
 %}

_includes/sections/mobile-operating-systems.html

@@ -10,7 +10,7 @@ image="/assets/img/svg/3rd-party/grapheneos.svg"
 image-dark="/assets/img/svg/3rd-party/grapheneos-dark.svg"
 description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
 badges="info:AOSP"
-labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://grapheneos.org/"
 github="https://github.com/GrapheneOS/"
 %}
@@ -20,7 +20,7 @@ title="LineageOS"
 image="/assets/img/svg/3rd-party/lineageos.svg"
 description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.'
 badges="info:AOSP"
-labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.lineageos.org/"
 privacy-policy="https://www.lineageos.org/legal/"
 github="https://github.com/LineageOS"
@@ -31,7 +31,7 @@ title="Ubuntu Touch"
 image="/assets/img/svg/3rd-party/ubuntu.svg"
 description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are <a href=https://devices.ubuntu-touch.io/>supported.</a>"
 badges="info:GNU/Linux"
-labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://ubuntu-touch.io/"
 privacy-policy="https://ubports.com/privacy"
 github="https://github.com/ubports"

_includes/sections/operating-systems.html

@@ -9,7 +9,7 @@ title="Qubes OS"
 image="/assets/img/svg/3rd-party/qubes_os.svg"
 description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.'
 badges="info:Xen"
-labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.qubes-os.org/"
 privacy-policy="https://www.qubes-os.org/privacy/"
 github="https://github.com/QubesOS"
@@ -21,7 +21,7 @@ title="Fedora Workstation"
 image="/assets/img/svg/3rd-party/fedora.svg"
 description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.'
 badges="info:GNU/Linux"
-labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://getfedora.org/"
 privacy-policy="https://fedoraproject.org/wiki/Legal:PrivacyPolicy?rd=Legal/PrivacyPolicy"
 git="https://src.fedoraproject.org/"

_includes/sections/participate.html

@@ -27,10 +27,10 @@
   {% include card.html color="warning"
   title="Develop on GitHub"
   font="fab fa-github"
-  url="https://github.com/privacytools/privacytools.io"
+  url="https://github.com/privacytoolsIO/privacytools.io"
   website="GitHub"
   description="The complete website source code is available on GitHub. Join our developer team!"
-  extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytools/privacytools.io/graphs/contributors">Contributor List</a>'
+  extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">Contributor List</a>'
   %}
 
 </div>

_includes/sections/router-firmware.html

@@ -6,7 +6,7 @@ image="/assets/img/svg/3rd-party/openwrt.svg"
 image-dark="/assets/img/svg/3rd-party/openwrt-dark.svg"
 description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers."
 badges="info:Linux"
-labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://openwrt.org/"
 git="https://git.openwrt.org/"
 %}
@@ -17,7 +17,7 @@ image="/assets/img/svg/3rd-party/pfsense.svg"
 image-dark="/assets/img/svg/3rd-party/pfsense-dark.svg"
 description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
 badges="info:BSD"
-labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.pfsense.org/"
 privacy-policy="https://www.pfsense.org/privacy.html"
 github="https://github.com/pfsense/"

_includes/sections/search-engines.html

@@ -27,6 +27,16 @@ forum="https://forum.privacytools.io/t/discussion-duckduckgo/285"
 github="https://github.com/duckduckgo"
 %}
 
+{% include cardv2.html
+title="StartPage"
+image="/assets/img/svg/3rd-party/startpage.svg"
+description='StartPage is a search engine that provides Google search results with complete privacy protection. <span class="flag-icon flag-icon-nl"></span> Behind StartPage is a European company based in the Netherlands that has been obsessive about privacy since 2006.'
+labels="warning:<a href=//support.startpage.com/index.php?/Knowledgebase/Article/View/1277/0/startpage-ceo-robert-beens-discusses-the-investment-from-privacy-one--system1>Warning</a>:StartPage was recently acquired by an advertising company."
+website="https://www.startpage.com/"
+privacy-policy="https://www.startpage.com/en/privacy-policy/"
+forum="https://forum.privacytools.io/t/delisted-discussion-startpage/284"
+%}
+
 {%
 include cardv2.html
 title="Qwant"
@@ -38,20 +48,21 @@ forum="https://forum.privacytools.io/t/discussion-qwant/286"
 github="https://github.com/Qwant/"
 %}
 
-{% include cardv2.html
-title="Startpage.com"
-image="/assets/img/svg/3rd-party/startpage.svg"
-description='Startpage.com is a search engine that provides Google search results with complete privacy protection. <span class="flag-icon flag-icon-nl"></span> Startpage BV is a Netherlands-based company that has been dedicated to privacy-respecting search since 2006.'
-labels="color==warning::link==https://support.startpage.com/index.php?/Knowledgebase/Article/View/1277/0/startpage-ceo-robert-beens-discusses-the-investment-from-privacy-one--system1::text==Warning::tooltip==Startpage.com was recently acquired by United States-based System1."
-website="https://www.startpage.com/"
-privacy-policy="https://www.startpage.com/en/privacy-policy/"
-forum="https://forum.privacytools.io/t/delisted-discussion-startpage/284"
+{%
+include cardv2.html
+title="MetaGer"
+image="/assets/img/svg/3rd-party/metager.svg"
+description='MetaGer is a open-source, metasearch engine run as a non-profit since 1996 and based in <span class="flag-icon flag-icon-de"></span> Germany. They also offer a <a href="https://metager.org/about">proxy service</a> for anonymously viewing search results.'
+website="https://metager.org/"
+privacy-policy="https://metager.org/datenschutz"
+tor="http://b7cxf4dkdsko6ah2.onion/en"
+forum="https://forum.privacytools.io/t/discussion-metager/3308"
+github="https://gitlab.metager.de/open-source/MetaGer"
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://metager.org/">MetaGer</a> - An <a href="https://gitlab.metager.de/open-source/MetaGer">open-source</a>, metasearch engine run as a non-profit based in Germany. (<a href="https://metager.org/datenschutz">Privacy Policy</a>)</li>
   <li><a href="https://www.mojeek.com/">Mojeek</a> - An independent search engine based in the UK, and the <a href="https://blog.mojeek.com/2018/10/search-that-does-not-follow-you-around.html">first search engine to have a policy of not tracking its users.</a> (<a href="https://www.mojeek.com/about/privacy/">Privacy Policy</a>)</li>
   <li><a href="https://yacy.net/">YaCy</a> - An <a href="https://github.com/yacy/yacy_search_server">open-source</a>, peer-to-peer search engine powered by its users.</li>
 </ul>

_includes/sections/self-contained-networks.html

@@ -65,7 +65,7 @@ github="https://github.com/freenet/"
   <li><a href="https://retroshare.cc/">RetroShare</a> - An open source, cross-platform, friend-to-friend, secure, and decentralized communication platform.</li>
   <li><a href="https://i2pbote.xyz/">I2P-Bote</a> - End-to-end encrypted decentralized mail system within the I2P network.</li>
   <li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
-  <li><a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). <a href="https://github.com/privacytools/privacytools.io/pull/361#issuecomment-344414022">
+  <li><a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). <a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">
     <span class="badge badge-danger" data-toggle="tooltip" title="">
     <span class="fas fa-exclamation-triangle"></span>
         Important privacy warning

_includes/sections/selfhosted-cloud.html

@@ -8,7 +8,7 @@
   title="Nextcloud"
   image="/assets/img/svg/3rd-party/nextcloud.svg"
   description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
-  labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
+  labels="warning:<a href=//github.com/nextcloud/end_to_end_encryption/issues/111>Experimental E2EE</a>:Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
   website="https://nextcloud.com/"
   privacy-policy="https://nextcloud.com/privacy/"
   forum="https://forum.privacytools.io/t/discussion-nextcloud/287"

_includes/sections/teamchat.html

@@ -13,7 +13,8 @@
   title="Riot"
   image="/assets/img/svg/3rd-party/riotim.svg"
   description='<a href="//about.riot.im">Riot.im</a> is the reference client for the <a href="//matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="//matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.<br />'
-  labels="text==VoIP"
+  labels="warning:<a href=//github.com/vector-im/riot-web/issues/6779>Warning</a>:Riot offers optional E2EE for 1&#x3a;1 and group conversations that must be turned on by the user.
+  (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security &amp; Privacy → Encrypted).|success:VoIP"
   website="https://about.riot.im/"
   privacy-policy="https://riot.im/privacy"
   forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
@@ -32,7 +33,7 @@
   title="Rocket.chat"
   image="/assets/img/svg/3rd-party/rocketchat.svg"
   description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
-  labels="color==warning::link==https://rocket.chat/docs/user-guides/end-to-end-encryption/::text==Experimental E2EE::tooltip==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.|text==VoIP"
+  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.|success:VoIP"
   website="https://rocket.chat/"
   privacy-policy="https://rocket.chat/privacy"
   forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
@@ -50,7 +51,7 @@
   title="Keybase"
   image="/assets/img/svg/3rd-party/keybase.svg"
   description='Keybase provides a hosted team chat with E2EE. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase can help you prove you own social media accounts through the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
-  labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server."
+  labels="warning:<a href=github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
   website="https://keybase.io/"
   privacy-policy="https://keybase.io/docs/privacypolicy"
   forum="https://forum.privacytools.io/t/discussion-keybase/1224"

_includes/sections/voice-video-messenger.html

@@ -37,17 +37,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/">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>
-    <span class="badge badge-warning">
-      <a href="https://jitsi.org/security">Multiparty meetings are not E2EE</a>
-    </span>
-    See also <a href="https://github.com/jitsi/jitsi-meet/wiki/Jitsi-Meet-Instances">list of public Jitsi Meet instances</a>.
-  </li>
+  <li><a href="https://jitsi.org/jitsi-meet/">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> <a href="https://github.com/jitsi/jitsi-meet/blob/master/README.md#security"<span class="badge badge-warning" >Jitsi Meet streams are decrypted on the server.</span></a> See also <a href="https://github.com/jitsi/jitsi-meet/wiki/Jitsi-Meet-Instances">list of public Jitsi Meet instances</a>.</li>
 </ul>
 
 <h3>Related Information</h3>

_includes/sections/vpn.html

@@ -41,7 +41,7 @@
     <h5><span class="badge badge-success">Remote Port Forwarding</span></h5>
     <p>Remote <a href="https://en.wikipedia.org/wiki/Port_forwarding">port forwarding</a> is allowed on Mullvad, see <a href="https://mullvad.net/help/port-forwarding-and-mullvad/">Port forwarding with Mullvad VPN</a>.</p>
     <h5><span class="badge badge-success">Mobile Clients</span></h5>
-    <p>Mullvad has published <a href ="https://apps.apple.com/app/mullvad-vpn/id1488466513">App Store</a> and <a href="https://play.google.com/store/apps/details?id=net.mullvad.mullvadvpn">Google Play</a> clients, both supporting an easy-to use interface as opposed to requiring users to manual configure their WireGuard connections.</p>
+    <p>Mullvad has published <a href ="https://apps.apple.com/app/mullvad-vpn/id1488466513">iOS</a> and <a href="https://play.google.com/store/apps/details?id=net.mullvad.mullvadvpn">Android</a> clients, both supporting an easy-to use interface as opposed to requiring users to manual configure their WireGuard connections.</p>
     <h5><span class="badge badge-info">Extra Functionality</span></h5>
     <p>The Mullvad VPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. The Mullvad website is also accessible via Tor at <a href="http://xcln5hkbriyklr6n.onion/">xcln5hkbriyklr6n.onion</a>.</p>
     </div>
@@ -68,7 +68,7 @@
     <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
     <p>ProtonVPN does technically accept Bitcoin payments; however, you either need to have an existing account, or contact their support team in advance to register with Bitcoin.</p>
     <h5><span class="badge badge-success">Mobile Clients</span></h5>
-    <p>In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for <a href="https://apps.apple.com/us/app/protonvpn-fast-secure-vpn/id1437005085">App Store</a> and <a href="https://play.google.com/store/apps/details?id=ch.protonvpn.android&hl=en_US">Google Play</a> allowing for easy connections to their servers. The mobile client on Android is also available in <a href="https://f-droid.org/en/packages/ch.protonvpn.android">F-Droid</a>, which ensures that it is compiled with <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">reproducable builds</a>.</p>
+    <p>In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for <a href="https://apps.apple.com/us/app/protonvpn-fast-secure-vpn/id1437005085">iOS</a> and <a href="https://play.google.com/store/apps/details?id=ch.protonvpn.android&hl=en_US">Android</a> allowing for easy connections to their servers.</p>
     <h5><span class="badge badge-warning">No Port Forwarding</span></h5>
     <p>ProtonVPN does not currently support remote port forwarding, which may impact some applications. Especially Peer-to-Peer applications like Torrent clients.</p>
     <h5><span class="badge badge-info">Extra Functionality</span></h5>
@@ -100,7 +100,7 @@
     <h5><span class="badge badge-success">Remote Port Forwarding</span></h5>
     <p>Remote <a href="https://en.wikipedia.org/wiki/Port_forwarding">port forwarding</a> is possible with a Pro plan. Port forwarding <a href="https://www.ivpn.net/knowledgebase/81/How-do-I-activate-port-forwarding.html">can be activated</a> via the client area. Port forwarding is only available on IVPN when <a href="https://www.ivpn.net/knowledgebase/116/Port-forwarding-is-not-working-why.html">using OpenVPN and is disabled on US servers</a>.</p>
     <h5><span class="badge badge-success">Mobile Clients</span></h5>
-    <p>In addition to providing standard OpenVPN configuration files, IVPN has mobile clients for <a href="https://apps.apple.com/us/app/ivpn-serious-privacy-protection/id1193122683">App Store</a> and <a href="https://play.google.com/store/apps/details?id=net.ivpn.client">Google Play</a> allowing for easy connections to their servers. The mobile client on Android is also available in <a href="https://f-droid.org/en/packages/net.ivpn.client">F-Droid</a>, which ensures that it is compiled with <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">reproducable builds</a>.</p>
+    <p>In addition to providing standard OpenVPN configuration files, IVPN has mobile clients for <a href="https://apps.apple.com/us/app/ivpn-serious-privacy-protection/id1193122683">iOS</a> and <a href="https://play.google.com/store/apps/details?id=net.ivpn.client">Android</a> allowing for easy connections to their servers.</p>
     <h5><span class="badge badge-info">Extra Functionality</span></h5>
     <p>The IVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. IVPN also provides "<a href="https://www.ivpn.net/antitracker">AntiTracker</a>" functionality, which blocks advertising networks and trackers from the network level.</p>
     </div>

assets/img/svg/3rd-party/clearurls.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="linearGradient4509" x1="-397.31" x2="-1652" y1="831.3" y2="-525.36" gradientTransform="matrix(.0508 0 0 .0508 55.984 -22.686)" gradientUnits="userSpaceOnUse"><stop stop-color="#f47721" offset="0"/><stop stop-color="#f47721" stop-opacity="0" offset="1"/></linearGradient><linearGradient id="linearGradient4517" x1="884.47" x2="-407.03" y1="1018.2" y2="-326.92" gradientTransform="matrix(.0508 0 0 .0508 -7.718 -29.976)" gradientUnits="userSpaceOnUse"><stop stop-color="#fca" offset="0"/><stop stop-color="#fca" stop-opacity="0" offset="1"/></linearGradient></defs><g transform="translate(-2.7214 16.933)"><path d="m14.363-12.7v-2.1167c0-1.0583 1.0583-2.1167 2.1167-2.1167h6.35c1.0583 0 2.1167 1.0583 2.1167 2.1167v2.1167h6.35c1.0583 0 2.1167 1.0583 2.1167 2.1167v4.2333h-2.1167l-1.3229 19.844c-0.26459 1.852-1.8521 3.4395-3.7042 3.4395h-13.176c-2.1167 0-3.7042-1.5875-3.7042-3.4395l-1.3758-19.844h-2.1167v-4.2333c0-1.3758 1.0583-2.1167 2.1167-2.1167z" fill="#fff" stroke-width="0"/><path d="m14.363-12.7v-2.1167c0-1.0583 1.0583-2.1167 2.1167-2.1167h6.35c1.0583 0 2.1167 1.0583 2.1167 2.1167v2.1167h6.35c1.0583 0 2.1167 1.0583 2.1167 2.1167v4.2333h-2.1167l-1.3229 19.844c-0.26459 1.852-1.8521 3.4395-3.7042 3.4395h-13.176c-2.1167 0-3.7042-1.5875-3.7042-3.4395l-1.3758-19.844h-2.1167v-4.2333c0-1.3758 1.0583-2.1167 2.1167-2.1167z" fill="url(#linearGradient4509)" stroke-width="0"/><path d="m18.614-2.6346h1.9911l0.10763 13.525h-2.1167zm-2.6638 13.631-2.1167 0.15882-0.79375-13.758h2.1167zm7.5671 0 1.9579 0.15882 0.79375-13.758h-2.1167z" fill="url(#linearGradient4517)" stroke-width=".52917"/></g></svg>

assets/img/svg/3rd-party/etag_stoppa.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><path d="m32.638 23.419-9.1858 9.2052-13.004 0.013762-9.2052-9.1858-0.013762-13.004 9.1858-9.2052 13.004-0.013762 9.2052 9.1858z" fill="#ad0006" stroke="#fff" stroke-linejoin="round" stroke-width="1.3229" style="paint-order:stroke fill markers"/><g fill="#fff" stroke-width=".40382" aria-label="ETAG"><path d="m2.3735 10.549h5.5368v2.5555h-2.2163v2.4214h2.0743v2.4293h-2.0743v2.8078h2.4371v2.5555h-5.7577z"/><path d="m15.561 10.549v2.5555h-1.9718v10.214h-3.3205v-10.214h-1.9639v-2.5555z"/><path d="m21.405 10.549 1.9008 12.769h-3.3994l-0.16563-2.2952h-1.191l-0.19718 2.2952h-3.4388l1.6879-12.769zm-1.7588 8.2106q-0.25239-2.169-0.50478-5.3554-0.50478 3.6597-0.63098 5.3554z"/><path d="m31.493 15.249h-3.3205v-1.1594q0-1.0963-0.09465-1.3724-0.09465-0.27605-0.44957-0.27605-0.3076 0-0.41802 0.23662-0.11042 0.23662-0.11042 1.2146v6.1284q0 0.85971 0.11042 1.1358 0.11042 0.26816 0.44168 0.26816 0.36281 0 0.48901-0.3076 0.13408-0.3076 0.13408-1.1989v-1.5143h-0.67041v-1.9403h3.8884v6.854h-2.0901l-0.3076-0.91492q-0.33915 0.59154-0.85971 0.89126-0.51267 0.29183-1.2146 0.29183-0.83604 0-1.5696-0.40225-0.72562-0.41014-1.1042-1.0096-0.37859-0.59943-0.47323-1.2541-0.09465-0.66253-0.09465-1.9797v-3.7937q0-1.8298 0.19718-2.658 0.19718-0.82816 1.1279-1.5143 0.93858-0.69408 2.4214-0.69408 1.4591 0 2.4214 0.59943t1.2541 1.4276q0.29183 0.82027 0.29183 2.3898z"/></g></svg>

assets/img/svg/3rd-party/firefox_multi_account_containers.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x2="500" y2="500" gradientUnits="userSpaceOnUse"><stop stop-color="#3186c7" offset="0"/><stop stop-color="#4c5eb0" offset="1"/></linearGradient></defs><g transform="scale(.067733)"><path d="m0 0h500v500h-500z" fill="url(#a)"/><path d="m393.32 106.68v-52.802c0-12.498-10.132-22.629-22.629-22.629-12.498 0-22.629 10.131-22.629 22.629v52.802h-52.802c-12.498 0-22.629 10.131-22.629 22.629 0 12.498 10.131 22.629 22.629 22.629h52.802v52.802c0 12.498 10.132 22.629 22.629 22.629 12.498 0 22.629-10.131 22.629-22.629v-52.802h52.802c12.498 0 22.629-10.131 22.629-22.629 0-12.498-10.132-22.629-22.629-22.629zm-362.07 194.89c0-15.982 12.868-28.938 28.938-28.938h138.24c15.982 0 28.938 12.868 28.938 28.938v138.24c0 15.982-12.868 28.938-28.938 28.938h-138.24c-15.982 0-28.938-12.868-28.938-28.938zm241.38 0c0-15.982 12.868-28.938 28.938-28.938h138.24c15.982 0 28.938 12.868 28.938 28.938v138.24c0 15.982-12.868 28.938-28.938 28.938h-138.24c-15.982 0-28.938-12.868-28.938-28.938zm-241.38-241.38c0-15.982 12.868-28.938 28.938-28.938h138.24c15.982 0 28.938 12.868 28.938 28.938v138.24c0 15.982-12.868 28.938-28.938 28.938h-138.24c-15.982 0-28.938-12.868-28.938-28.938z" fill="#ebf0f8" stroke-width="29.167"/></g></svg>

assets/img/svg/3rd-party/metager.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 154.08 154.08" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(2.0706 0 0 -1.9283 -580.48 155.41)" fill="#ff7f00"><g transform="scale(.1)" fill="#ff7f00"><path d="m2828 805.72v-230.32h69.31c27.25 0 40.87 14.426 40.87 42.879v78.789h345.86c101.01 0 151.51-53.668 151.51-157.63v-85.7h-497.37l0.01-52.015c0-28.313-13.75-42.871-40.87-42.871h-93.81v-140.79c0-140.79 70.4-211.19 212.72-211.19h281.59c165.27 0 249.45 85.699 249.45 255.57v287.7c0 169.87-84.18 255.57-249.45 255.57zm289.79-446.87h74.76c50.36 0 69.52-25.856 69.52-74.098v-112.79c0-38.305-19.21-58.168-56.76-58.168h-38.57c-32.53 0-48.95 19.25-48.95 57.465v187.59" fill="#ff7f00"/></g></g><path transform="scale(1.2037)" d="m40.838 107.03c-6.9444-1.0451-12.207-4.5717-14.826-9.9352-2.2717-4.6526-2.4234-5.674-2.5983-17.494l-0.1578-10.665 6.133-0.11812c4.6889-0.0903 6.3204-0.24222 6.9286-0.64517 1.4058-0.93127 1.8561-2.4675 1.8561-6.3323v-3.5705h55.234l-0.16528-7.3362c-0.14089-6.2534-0.27777-7.6833-0.92742-9.688-1.4943-4.611-4.4924-7.7251-8.8869-9.2307-2.2637-0.77555-2.6225-0.78889-23.953-0.89092l-21.655-0.10358v10.975l-2.0615 2.3093-9.6057 0.23156v-25.184l29.257 0.1095c29.004 0.10856 29.281 0.11631 32.085 0.8971 8.2152 2.2876 13.435 7.0907 16.12 14.833 1.5365 4.4312 1.7308 7.5964 1.7308 28.205 0 20.608-0.19422 23.774-1.7308 28.205-2.6688 7.6966-7.9372 12.535-16.14 14.822-2.7379 0.7634-3.3281 0.78469-23.668 0.85382-11.473 0.039-21.809-0.0719-22.968-0.24645zm30.302-11.888c1.626-0.94966 2.6581-2.6604 2.9332-4.8622 0.13024-1.0424 0.1753-5.1312 0.10013-9.0862-0.12069-6.3494-0.22242-7.377-0.86937-8.7818-1.5068-3.2719-3.023-3.8525-10.116-3.8736l-5.2149-0.01552v11.679c0 12.67 0.10743 13.49 1.9239 14.68 1.4701 0.96322 2.9663 1.2024 6.6482 1.0626 2.5674-0.09745 3.7385-0.30188 4.595-0.80208z" fill="none" stroke-width=".35355"/><path transform="scale(1.2037)" d="m40.118 106.9c-7.0731-1.3423-11.891-4.826-14.463-10.458-1.908-4.1777-2.0721-5.4125-2.2415-16.871l-0.15811-10.695 5.2495-0.0021c5.8624-0.0021 7.3847-0.28709 8.6345-1.6159 0.78642-0.83617 0.86749-1.2472 0.97644-4.9503l0.11881-4.0383h55.181l-0.17521-7.3363c-0.19784-8.2837-0.65239-10.439-2.9034-13.766-2.0795-3.0737-5.4366-5.0549-9.7372-5.7463-1.4032-0.22557-10.18-0.37048-22.539-0.37211l-20.241-0.0027v10.949l-2.0615 2.3093-9.6057 0.23156v-25.187l58.867 0.21925 3.1725 0.98754c4.5388 1.4128 7.0784 2.8698 9.9482 5.7071 3.707 3.6651 5.7283 7.9927 6.6932 14.33 0.73949 4.8571 0.73949 40.751 0 45.608-1.6453 10.806-7.3726 17.488-17.339 20.228-2.7492 0.75586-3.4179 0.77995-23.865 0.85957-16.296 0.0635-21.594-0.0239-23.511-0.38775zm31.111-11.83c2.7122-1.5351 3.1668-3.7341 2.9501-14.27-0.13124-6.3819-0.19406-6.9115-1.0141-8.5497-1.5949-3.1862-3.0405-3.7066-10.332-3.7192l-4.8614-0.0084 0.01994 11.579c0.01382 8.015 0.14984 11.95 0.44194 12.783 0.53299 1.5211 1.925 2.5631 3.8619 2.8907 2.3873 0.4038 7.7172-0.01694 8.9332-0.70516z" fill="none"/></svg>

assets/img/svg/3rd-party/temporary_containers-dark.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g fill="#fff"><path d="m10.059 2.6825-2.1795-2.5149-7.7122 6.371 2.1795 2.5149zm23.64 3.8561-7.7122-6.5386-2.1795 2.5149 7.7122 6.5386zm-16.766-2.8502c-8.3828 0-15.089 6.7063-15.089 15.089s6.7063 15.089 15.089 15.089c8.3828 0 15.089-6.7063 15.089-15.089s-6.7063-15.089-15.089-15.089zm0 26.825c-6.5386 0-11.736-5.1974-11.736-11.736s5.1974-11.736 11.736-11.736c6.5386 0 11.736 5.1974 11.736 11.736s-5.1974 11.736-11.736 11.736zm1.6766-18.442h-3.3531v5.0297h-5.0297v3.3531h5.0297v5.0297h3.3531v-5.0297h5.0297v-3.3531h-5.0297z" fill-rule="evenodd" stroke-width="1.6766"/><path d="m15.008 33.713c-5.0456-0.64895-9.4614-3.8378-11.644-8.4085-1.9677-4.1212-1.9644-8.9637 0.008894-13.053 0.73828-1.5298 1.5335-2.6803 2.6994-3.9055 5.0082-5.2627 13.194-6.1307 19.29-2.0454 5.0399 3.3779 7.524 9.4838 6.3115 15.513-1.0007 4.9758-4.5419 9.1656-9.2983 11.001-1.0333 0.39877-2.2173 0.70467-3.3513 0.86587-0.86505 0.12297-3.1655 0.14112-4.0163 0.03169zm4.2738-3.3964c5.8515-1.1902 9.8262-6.4603 9.3732-12.428-0.0844-1.1118-0.2386-1.888-0.57834-2.911-0.57626-1.7353-1.479-3.1814-2.8273-4.529-1.7714-1.7706-3.8506-2.8459-6.3175-3.2673-0.8001-0.13667-1.1484-0.15416-2.3726-0.11912-1.5785 0.04518-2.4375 0.19986-3.737 0.67295-5.6372 2.0523-8.7688 8.0784-7.2782 14.005 1.1622 4.6211 5.03 8.0479 9.8408 8.7187 0.8176 0.11402 3.034 0.03291 3.8969-0.14259z" stroke-width=".13229"/></g></svg>

assets/img/svg/3rd-party/temporary_containers.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="translate(3.698 25.515)"><path d="m6.3614-22.832-2.1795-2.5149-7.7122 6.371 2.1795 2.5149zm23.64 3.8561-7.7122-6.5386-2.1795 2.5149 7.7122 6.5386zm-16.766-2.8502c-8.3828 0-15.089 6.7063-15.089 15.089 0 8.3828 6.7063 15.089 15.089 15.089 8.3828 0 15.089-6.7063 15.089-15.089 0-8.3828-6.7063-15.089-15.089-15.089zm0 26.825c-6.5386 0-11.736-5.1974-11.736-11.736 0-6.5386 5.1974-11.736 11.736-11.736 6.5386 0 11.736 5.1974 11.736 11.736 0 6.5386-5.1974 11.736-11.736 11.736zm1.6766-18.442h-3.3531v5.0297h-5.0297v3.3531h5.0297v5.0297h3.3531v-5.0297h5.0297v-3.3531h-5.0297z" fill-rule="evenodd" stroke-width="1.6766"/><path d="m11.31 8.1983c-5.0456-0.64895-9.4614-3.8378-11.644-8.4085-1.9677-4.1212-1.9644-8.9637 0.008894-13.053 0.73828-1.5298 1.5335-2.6803 2.6994-3.9055 5.0082-5.2627 13.194-6.1307 19.29-2.0454 5.0399 3.3779 7.524 9.4838 6.3115 15.513-1.0007 4.9758-4.5419 9.1656-9.2983 11.001-1.0333 0.39877-2.2173 0.70467-3.3513 0.86587-0.86505 0.12297-3.1655 0.14112-4.0163 0.031695zm4.2738-3.3964c5.8515-1.1902 9.8262-6.4603 9.3732-12.428-0.0844-1.1118-0.2386-1.888-0.57834-2.911-0.57626-1.7353-1.479-3.1814-2.8273-4.529-1.7714-1.7706-3.8506-2.8459-6.3175-3.2673-0.8001-0.13667-1.1484-0.15416-2.3726-0.11912-1.5785 0.04518-2.4375 0.19986-3.737 0.67295-5.6372 2.0523-8.7688 8.0784-7.2782 14.005 1.1622 4.6211 5.03 8.0479 9.8408 8.7187 0.8176 0.11401 3.034 0.032915 3.8969-0.14259z" stroke-width=".13229"/></g></svg>

nginx/010-headers.conf

@@ -2,7 +2,6 @@ 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' 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 'Access-Control-Allow-Origin' '*';
 add_header Strict-Transport-Security "max-age=31557600; includeSubDomains; preload";
 add_header Alt-Svc 'h2="privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion:443"; ma=86400; persist=1';
 add_header Expect-CT 'max-age=86400, enforce';

pages/about.html

@@ -14,9 +14,9 @@ hidedesc: true
   <div class="col">
     <p itemprop="description"><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
     <p>At <strong itemprop="name">PrivacyTools</strong>, we provide services, tools, and knowledge to protect your <span itemprop="knowsAbout">privacy</span> against <span itemprop="knowsAbout">global mass surveillance</span>, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. <a itemprop="url" href="{{ site.production_url }}">This website</a> 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/privacytools/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytools/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytools/privacytools.io/commits/master">commit log</a> dating back to our original founding date in <span itemprop="foundingDate">2015</span>. 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/privacytools/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/privacytools">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/privacytools">opencollective.com/privacytools</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/privacytools/.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/privacytools/.github/blob/master/CODE_OF_CONDUCT.md#enforcement">Enforcement section</a>.</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 <span itemprop="foundingDate">2015</span>. 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>
 
@@ -67,7 +67,7 @@ role="Blogging & Education"
 bio="I'm an author, columnist, and privacy advocate whose work has appeared in Time, Huff Post, OpenSource, and more."
 website="https://danarel.com"
 email="mailto:dan@privacytools.io"
-keys="https://www.danarel.com/keys/"
+keys="https://keybase.io/dan_arel"
 twitter="danarel"
 mastodon="https://mastodon.technology/@danarel"
 blog="danarel"
@@ -103,8 +103,7 @@ 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/"
-email="mailto:nitrohorse@privacytools.io"
-keys="https://nitrohorse.com/keys"
+keys="https://keybase.io/513"
 mastodon="https://nitro.horse/@andreas"
 blog="nitrohorse"
 %}
@@ -123,7 +122,7 @@ website="https://www.reddit.com/user/trai_dep"
   <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/privacytools/">financial contributors</a>, <a href="https://github.com/privacytools/privacytools.io/graphs/contributors">website contributors</a>, and the countless community members that help share new ideas and spread the word! Thank you.</p>
+        <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>
@@ -152,14 +151,14 @@ emeritus=true
     <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/privacytools/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</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>
     <p>You can also email the team at <a itemprop="email" href="mailto:support@privacytools.io">support@privacytools.io</a> and find us on <a itemprop="sameAs" href="https://twitter.com/privacytoolsIO">Twitter</a> and <a itemprop="sameAs" href="https://social.privacytools.io/@privacytools">Mastodon</a>.</p>
     <link itemprop="sameAs" href="https://blog.privacytools.io">
     <link itemprop="sameAs" href="https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg">
-    <link itemprop="sameAs" href="https://github.com/privacytools">
+    <link itemprop="sameAs" href="https://github.com/privacytoolsIO">
   </div>
 </div>
 </div>

pages/about/librejs.html

@@ -5,15 +5,15 @@ permalink: /about/javascript/
 <table id="jslicense-labels1" border="1">
   <tr>
     <td><a href="/assets/js/main.js">main.js</a></td>
-    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
+    <td><a href="https://github.com/privacytoolsIO/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
   </tr>
   <tr>
     <td><a href="/assets/js/applytheme.js">applytheme.js</a>
-    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
+    <td><a href="https://github.com/privacytoolsIO/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
   </tr>
   <tr>
     <td><a href="/assets/js/redirects.js">redirects.js</a></td>
-    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
+    <td><a href="https://github.com/privacytoolsIO/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
   </tr>
   <tr>
     <td><a href="/assets/js/bootstrap.min.js">bootstrap.min.js</a></td>

pages/donate.html

@@ -16,7 +16,7 @@ permalink: /donate/
         <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 {{ site.name }} are tax deductible for US taxpayers.</strong> These funds are transparently and primarily used to cover server costs.</p>
-          <a href="https://opencollective.com/privacytools#section-contribute" class="btn btn-success">Contribute</a>
+          <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>

pages/notices.md

@@ -19,24 +19,24 @@ PrivacyTools additionally does not warrant that this website will be constantly
 <span class="badge badge-secondary mt-5">Section 2</span>
 # Licenses
 
-<span class="lead">Content copyright on this website is waived under the terms of [CC0 1.0 Universal](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt).</span>
+<span class="lead">Content copyright on this website is waived under the terms of [CC0 1.0 Universal](https://github.com/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt).</span>
 
-In certain jurisdictions, namely those in which the copyright waiver in the CC0-1.0 is judged for any reason to be legally invalid or ineffective under applicable law, content may be copyright &copy; PrivacyTools contributors, released under the [CC 1.0 Universal](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt) license.
+In certain jurisdictions, namely those in which the copyright waiver in the CC0-1.0 is judged for any reason to be legally invalid or ineffective under applicable law, content may be copyright &copy; PrivacyTools contributors, released under the [CC 1.0 Universal](https://github.com/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt) license.
 
-**Content** on this website is based on [github.com/privacytools/privacytools.io](https://github.com/privacytools/privacytools.io) and is made freely available under the CC-1.0.
+**Content** on this website is based on [github.com/privacytoolsIO/privacytools.io](https://github.com/privacytoolsIO/privacytools.io) and is made freely available under the CC-1.0.
 
 Code, including source files and code samples if any in the content, is released under CC-1.0, with the following exceptions:
 
 - Bootstrap code is under the MIT license. See: [github.com/twbs/bootstrap/blob/master/LICENSE](https://github.com/twbs/bootstrap/blob/master/LICENSE)
-- [jQuery](https://github.com/privacytools/privacytools.io/blob/master/assets/js/jquery-3.3.1.min.js) is under the MIT license. See: [jquery.org/license](https://jquery.org/license/)
-- [Popper.js](https://github.com/privacytools/privacytools.io/blob/master/assets/js/popper.min.js) is under the MIT license. See: [github.com/FezVrasta/popper.js/raw/master/LICENSE.md](https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md)
-- [Sortable](https://github.com/privacytools/privacytools.io/blob/master/assets/js/sortable.min.js) is under the MIT license. See: [github.com/HubSpot/sortable/raw/master/LICENSE](https://github.com/HubSpot/sortable/raw/master/LICENSE)
+- [jQuery](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/js/jquery-3.3.1.min.js) is under the MIT license. See: [jquery.org/license](https://jquery.org/license/)
+- [Popper.js](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/js/popper.min.js) is under the MIT license. See: [github.com/FezVrasta/popper.js/raw/master/LICENSE.md](https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md)
+- [Sortable](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/js/sortable.min.js) is under the MIT license. See: [github.com/HubSpot/sortable/raw/master/LICENSE](https://github.com/HubSpot/sortable/raw/master/LICENSE)
 - The Font Awesome icons are under CC-BY-4.0, Font Awesome fonts are under SIL OFL 1.1, and Font Awesome code is under the MIT License. See: [fontawesome.com/license/free](https://fontawesome.com/license/free)
-- The PrivacyTools fonts, icons, and code in `fonts` are under ISC license. See: [github.com/privacytools/privacytools.io/blob/master/font/LICENSE](https://github.com/privacytools/privacytools.io/blob/master/font/LICENSE).
+- The PrivacyTools fonts, icons, and code in `fonts` are under ISC license. See: [github.com/privacytoolsIO/privacytools.io/blob/master/font/LICENSE](https://github.com/privacytoolsIO/privacytools.io/blob/master/font/LICENSE).
 
 Portions of this notice itself were adopted from [opensource.guide](https://github.com/github/opensource.guide/blob/master/notices.md) on GitHub, released under [CC-BY-4.0](https://github.com/github/opensource.guide/blob/master/LICENSE).
 
-This means that you can use the code and content in this repository **except** for the PrivacyTools [branding](https://github.com/privacytools/brand) in your own projects. PrivacyTools's brand trademarks include the "PrivacyTools" wordmark and shield logo. More information on the use of PrivacyTools's branding can be found on our [branding guidelines page](https://github.com/privacytools/brand).
+This means that you can use the code and content in this repository **except** for the PrivacyTools [branding](https://github.com/privacytoolsIO/brand) in your own projects. PrivacyTools's brand trademarks include the "PrivacyTools" wordmark and shield logo. More information on the use of PrivacyTools's branding can be found on our [branding guidelines page](https://github.com/privacytoolsIO/brand).
 
 We believe that the logos and other images in `assets` from third-party providers are either in the public domain or **fair use**. In a nutshell, legal [fair use doctrine](https://en.wikipedia.org/wiki/Fair_use) allows the use of copyrighted image in order to identify the subject matter for purposes of public comment. However, these logos and other images may still be subject to trademark laws in one or more jurisdictions. Before using this content, please ensure that it is used to identify the entity or organization that owns the trademark and that you have the right to use it under the laws which apply in the circumstances of your intended use. *You are solely responsible for ensuring that you do not infringe someone else's trademark or copyright.*
 
@@ -55,4 +55,4 @@ You must not conduct any systematic or automated data collection activities on o
 - Data Mining
 - ‘Framing’ (IFrames)
 
-We take the security of our website, infrastructure, and services very seriously. Our [SECURITY.md](https://github.com/privacytools/.github/blob/master/SECURITY.md) document outlines responsible disclosure guidelines and other security-related information.
+We take the security of our website, infrastructure, and services very seriously. Our [SECURITY.md](https://github.com/privacytoolsIO/.github/blob/master/SECURITY.md) document outlines responsible disclosure guidelines and other security-related information.

pages/privacy.md

@@ -7,7 +7,7 @@ description: "This Privacy Statement explains what information PrivacyTools and
 
 ## Who is {{ site.name }}?
 
-{{ site.name }} 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/privacytools/people). In order to operate these services, {{ site.name }} receives hosting and administration services from Aragon Ventures LLC.
+{{ site.name }} 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, {{ site.name }} receives hosting and administration services from Aragon Ventures LLC.
 
 ## How does {{ site.name }} collect data about me?
 
@@ -120,4 +120,4 @@ 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/privacytools/privacytools.io/commits/master/pages/privacy.md) for this page can be found on GitHub.
+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/email.html

@@ -91,6 +91,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
         <li>No <a href="https://en.wikipedia.org/wiki/Opportunistic_TLS">TLS</a> errors/vulnerabilities when being profiled by tools such as <a href="https://www.hardenize.com">Hardenize</a>, <a href="https://testssl.sh">testssl.sh</a> or <a href="https://www.ssllabs.com/ssltest">Qualys SSL Labs</a>, this includes certificate related errors, poor or weak ciphers suites, weak DH parameters such as those that led to <a href="https://en.wikipedia.org/wiki/Logjam_(computer_security)">Logjam</a>.</li>
         <li>A valid <a href="https://tools.ietf.org/html/rfc8461">MTA-STS</a> and <a href="https://tools.ietf.org/html/rfc8460">TLS-RPT</a> policy.</li>
         <li>Valid <a href="https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">DANE</a> records.</li>
+        <li>Registration on the EFF's <a href="https://starttls-everywhere.org">STARTTLS-Everywhere</a> list.</li>
         <li>Valid <a href="https://en.wikipedia.org/wiki/Sender_Policy_Framework">SPF</a>, <a href="https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail">DKIM</a> and <a href="https://en.wikipedia.org/wiki/DMARC">DMARC</a>, with the policy <code>p</code> value set to either <code>none</code>, <code>quarantine</code> or <code>reject</code>.</li>
         <li>A server suite preference of TLS 1.2 or later and a plan for <a href="https://datatracker.ietf.org/doc/draft-ietf-tls-oldversions-deprecate/">Deprecating TLSv1.0 and TLSv1.1</a>.</li>
         <li><a href="https://en.wikipedia.org/wiki/SMTPS">SMTPS</a> submission, assuming SMTP is used.</li>
@@ -222,15 +223,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
          width="180rem" class="img-fluid float-left mr-3"
          alt="AnonAddy">
   </a>
-  <br>
   <p><strong><a href="https://anonaddy.com">AnonAddy</a></strong> lets users create aliases that forward to their email address. Can be self-hosted. <a href="https://github.com/anonaddy/anonaddy">Source code on GitHub</a>.</p>
-  <a href="https://simplelogin.io">
-    <img src="/assets/img/svg/3rd-party/simplelogin.svg"
-         width="180rem" class="img-fluid float-left mr-3"
-         alt="SimpleLogin">
-  </a>
-  <br>
-  <p><strong><a href="https://simplelogin.io">SimpleLogin</a></strong> allows you to easily create aliases for your email. Can be self-hosted. <a href="https://github.com/simple-login/app">Source code on GitHub</a>.</p>
 </div>
 
 <h1 id="selfhosting" class="anchor"><a href="#selfhosting"><i class="fas fa-link anchor-icon"></i></a> Self-hosting Email</h1>

pages/providers/vpn.html

@@ -214,57 +214,29 @@ breadcrumb: "VPN"
 
   <hr>
 
-  <div id="related-vpn-info" class="container">
+  <div class="container">
     <div class="row">
-      <div class="col-md-12">
+      <div class="col-md-6">
+
+        <h3>More VPN Providers</h3>
+        <ul>
+          <li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
+        </ul>
+      </div>
+
+      <div class="col-md-6">
 
         <h3>Related VPN information</h3>
 
         <ul>
-          <li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
           <li><a href="https://vikingvpn.com/blogs/off-topic/beware-of-vpn-marketing-and-affiliate-programs">Beware of False Reviews - VPN Marketing and Affiliate Programs</a></li>
           <li><a href="https://torrentfreak.com/proxy-sh-vpn-provider-monitored-traffic-to-catch-hacker-130930/">Proxy.sh VPN Provider Sniffed Server Traffic to Catch Hacker</a></li>
           <li><a href="https://proxy.sh/panel/knowledgebase.php?action=displayarticle&id=5">Ethical policy - All of the reasons why Proxy.sh might enable logging</a></li>
           <li><a href="https://www.ivpn.net/privacy">IVPN.net will collect your email and IP address after sign up</a><br />Read the <a data-toggle="tooltip" data-placement="top" data-original-title="The IP collected at signup is only used for a few seconds by our fraud module and then discarded, it is not stored. Storing them would significantly increase our own liability and certainly would not be in our interest. You're absolutely welcome to signup using Tor or a VPN.">Email statement</a> from IVPN.</li>
           <li><a href="https://medium.com/@blackVPN/no-logs-6d65d95a3016">blackVPN announced to delete connection logs after disconnection</a></li>
           <li><a href="https://gist.github.com/kennwhite/1f3bc4d889b02b35d8aa">Don't use LT2P IPSec, use other protocols.</a></li>
-          <li>
-            <a href="https://www.top10vpn.com/free-vpn-app-investigation/">Free VPN App Investigation</a>
-            <span class="badge badge-warning" data-toggle="tooltip" title="This site has affiliate based recommendations">
-              <a href="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews"/>Warning</a>
-            </span>
-          </li>
-          <li>
-            <a href="https://vpnpro.com/blog/hidden-vpn-owners-unveiled-97-vpns-23-companies/">Hidden VPN owners unveiled: 101 VPN products run by just 23 companies</a>
-            <span class="badge badge-warning" data-toggle="tooltip" title="This site has affiliate based recommendations">
-              <a href="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews"/>Warning</a>
-            </span>
-          </li>
-          <li>
-            <a href="https://vpnpro.com/blog/chinese-company-secretly-behind-popular-apps-seeking-dangerous-permissions/">This Chinese company is secretly behind 24 popular apps seeking dangerous permissions</a>
-            <span class="badge badge-warning" data-toggle="tooltip" title="This site has affiliate based recommendations">
-              <a href="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews"/>Warning</a>
-            </span>
-          </li>
         </ul>
 
       </div>
     </div>
   </div>
-
-  <hr>
-
-  <div class="container">
-    <div class="row">
-      <div class="col-lg-6 col-12">
-      <h3>Related Videos</h3>
-        <a href="https://invidio.us/watch?v=WVDQEoe6ZWY" target="_blank">
-          <img
-            src="/assets/img/png/layout/this-video-is-sponsored-by-vpn.png"
-            class="img-fluid float-left mr-3"
-            alt="This Video Is Sponsored By censored VPN">
-        </a>
-      </div>
-    </div>
-  </div>
-</div>

pages/services.html

@@ -13,6 +13,7 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen
     <li class="list-group-item"><a href="https://social.privacytools.io/"><i class="fas fa-retweet fa-lg fa-fw"></i> Mastodon - Tracker Free Social Networking at social.privacytools.io</a></li>
     <li class="list-group-item"><a href="https://chat.privacytools.io/"><i class="fas fa-comment fa-lg fa-fw"></i> Matrix - Federated private chat at chat.privacytools.io</a></li>
     <li class="list-group-item"><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Discourse - Forum at forum.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://git.privacytools.io/"><i class="fab fa-git fa-lg fa-fw"></i> Gitea - Git-Repository Manager at git.privacytools.io</a></li>
     <li class="list-group-item"><a href="https://write.privacytools.io/"><i class="fas fa-pen-alt fa-lg fa-fw"></i> Write Freely - Federated minimalist blog at write.privacytools.io</a></li>
     <li class="list-group-item"><a href="https://bin.privacytools.io/"><i class="fas fa-clipboard fa-lg fa-fw"></i> PrivateBin - Encrypted Pastebin at bin.privacytools.io</a></li>
   </ul>

pages/sponsors.html

@@ -16,7 +16,7 @@ permalink: /sponsors/
       <div class="mb-4">
         <p>The {{ site.name }} website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.<br><strong>Your donations here directly support hosting this website and compensating contributors to this project.</strong></p>
         <p>
-          <a href="https://opencollective.com/privacytools#section-contribute" class="btn btn-success">Become a Sponsor</a>
+          <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success">Become a Sponsor</a>
           <a href="/donate/" class="btn btn-outline-danger"><span class="fas fa-heart fa-fw"></span> Donate Directly</a>
         </p>
       </div>
@@ -36,15 +36,15 @@ permalink: /sponsors/
   <p>As a sponsor of {{ site.name }}, your company will be widely recognized in a variety of ways, some of which we've detailed below.</p>
   <h5>General Information</h5>
   <p>This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.</p>
-  <h5>🥉 Bronze Sponsorship - <a href="https://opencollective.com/privacytools/contribute/bronze-12311">Info</a></h5>
+  <h5>🥉 Bronze Sponsorship - <a href="https://opencollective.com/privacytoolsio/contribute/bronze-12311">Info</a></h5>
   <ul>
   <li>Your name and link along with a small logo or avatar on the sponsors page of this website.</li>
   </ul>
-  <h5>🥈 Silver Sponsorship - <a href="https://opencollective.com/privacytools/contribute/silver-12313">Info</a></h5>
+  <h5>🥈 Silver Sponsorship - <a href="https://opencollective.com/privacytoolsio/contribute/silver-12313">Info</a></h5>
   <ul>
   <li>Your medium-sized logo as a link at the top of our sponsors page.</li>
   </ul>
-  <h5>🥇 Gold Sponsorship - <a href="https://opencollective.com/privacytools/contribute/gold-12312">Info</a></h5>
+  <h5>🥇 Gold Sponsorship - <a href="https://opencollective.com/privacytoolsio/contribute/gold-12312">Info</a></h5>
   <ul>
   <li>Your medium-sized logo as a link on the {{ site.name }} homepage and at the very top of our sponsors page.</li>
   </ul>
@@ -55,6 +55,6 @@ permalink: /sponsors/
   <h5>More Information</h5>
   <p>If you are interested and have further questions, you are welcome to reach out to us directly at <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a>.</p>
   <div class="mt-5 text-center">
-    <a href="https://opencollective.com/privacytools#section-contribute" class="btn btn-success mb-5">Contribute to PrivacyTools</a>
+    <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success mb-5">Contribute to PrivacyTools</a>
   </div>
 </div>