Manual cleanup

This reverts commit 69125a052f.

.github/CODEOWNERS

@@ -1,3 +1,11 @@
+# Administration Related Files
+/.well-known/ @JonahAragon
+/404.html @JonahAragon
+/.github/ @JonahAragon @BurungHantu1605
+/LICENSE.txt @JonahAragon @BurungHantu1605
+/.travis.yml @Shifterovich
+/CNAME @JonahAragon
+
 # Editorial Team
 *.md @privacytoolsIO/editorial
 /assets/ @privacytoolsIO/editorial
@@ -5,13 +13,5 @@
 /_includes/sections/ @privacytoolsIO/editorial
 /index.html @privacytoolsIO/editorial
 
-# Administration Related Files
 /donate.html @JonahAragon @BurungHantu1605
 /assets/js/redirects.js @JonahAragon
-/.well-known/ @JonahAragon
-/404.html @JonahAragon
-/.github/ @JonahAragon @BurungHantu1605
-/LICENSE.txt @JonahAragon @BurungHantu1605
-/.travis.yml @JonahAragon @Shifterovich @nitrohorse
-/CNAME @JonahAragon
-/nginx/ @JonahAragon

.github/CONTRIBUTING.md

@@ -24,17 +24,9 @@ We're trying to keep it simple and promote the best tools, not all of them.
 There can be exceptions if no software is available that meet the criteria.
 
 Note: This criteria applies to all of privacytools.io
-### Providers
+### Proividers
 - Prioritize Products by privacy respecting nationality.
 
-### DNS
-
-- supports DoH or DoT (We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it).
-- supports DNSSEC (https://dnssec.vs.uni-due.de/ can test your current DNS provider).
-- doesn't log IP addresses during normal operation (If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs).
-- preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl`)
-
-
 ### VPN
 - Prioritize Products by privacy respecting nationality.
 - Cannot be based in USA or UK.

.github/ISSUE_TEMPLATE/6_Translation_Issues.md

@@ -1,21 +0,0 @@
----
-name: "🇦🇶 Translation Issue"
-about: Report any issue with a translated site.
-title: "🇦🇶 Translated Site Issue | "
-labels: 🌐 website issue, 🇦🇶 translations
----
-
-## Site Affected
-
-**Domain:**
-
-<!-- Add an x to the box below if true [x] -->
-- [ ] This site is listed as a translated version of the site in the privacytools.io navbar.
-
-## Description
-
-<!--
-## Screenshots
-
-Please add screenshots if applicable
--->

.github/ISSUE_TEMPLATE/7_DNS_provider.md

@@ -1,36 +0,0 @@
----
-name: "🗄️ encrypted DNS provider suggestion"
-about: Suggest a new encrypted DNS provider.
-title: "🗄️ DNS provider suggestion | "
-labels: 🌐 website issue, 🗄️ DNS
----
-
-<!-- Please feel free to overwrite these comments -->
-
-## Basic Information
-
-**Name:** 
-**Filtering:** <!-- What is being filtered? Is it opt-in with separate address or not? -->
-**Privacy policy:** <!-- Link, especially when there is logging -->
-**Protocols:** <!-- at least DoH or DoT? DNSCrypt? -->
-**Server/Location:** <!-- Where is the provider based? Where are their servers located? Anycast if there are multiple servers answering to the same address -->
-**Source:** <!-- link to the source code, preferred, but optional -->
-**Type:** <!-- Non-profit, commercial, hobby project? -->
-**Website:** 
-
-## Description
-
-<!-- Why should we list your suggestion? Anything else, that you wish us to know? -->
-
-
-### Required features:
-
-<!-- DoH and DoT are supported natively by platforms like Firefox and Android 9+ -->
-
-* [ ] supports DoH or DoT <!-- We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it.  -->
-* [ ] supports DNSSEC <!--  https://dnssec.vs.uni-due.de/ can test your current DNS provider. -->
-* [ ] doesn't log IP addresses during normal operation <!-- If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs. -->
-
-#### Desired features
-
-* [ ] supports QNAME minimization <!-- if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,16 +2,10 @@
 
 ## Description
 
-Resolves: #none <!-- The number of the issue that is resolved by this pull request. If there is none, feel free to delete this line 
+Resolves: #none <!-- The number of the issue that is resolved by this pull request. If there is none, feel free to delete this line -->
 
-#### Check List <!-- Please add an x in each box below, like so: [x] -->
+<!--
+## Screenshots
 
-- [ ] I have read and understand [CONTRIBUTING.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
-
-- [ ] I have listed the source code for this project in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md).
-
-- [ ] This project is [free/libre software](https://www.wikipedia.org/wiki/Free_software).
-
-- [ ] This project has an [associated discussion](https://github.com/privacytoolsIO/privacytools.io/issues).
-
-Code Repository (if applicable): 
+Please add screenshots if applicable
+-->

.gitignore

@@ -3,3 +3,98 @@ Gemfile
 Gemfile.lock
 .sass-cache/
 .DS_Store
+
+# Created by https://www.gitignore.io/api/node
+# Edit at https://www.gitignore.io/?templates=node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# End of https://www.gitignore.io/api/node

.jsbeautifyrc

@@ -0,0 +1,6 @@
+{
+	"html": {
+		"indent_with_tabs": true,
+		"indent_handlebars": true
+	}
+}

.lintstagedrc

@@ -0,0 +1,3 @@
+{
+	"*.html": "bin/html-beautify-check.sh"
+}

.nvmrc

@@ -0,0 +1 @@
+v12.7.0

.travis.yml

@@ -1,11 +1,19 @@
-language: ruby
-rvm:
-  - 2.4.1
+matrix:
+  include:
+  - language: ruby
+    rvm: 2.4.1
 
     # Assume bundler is being used, therefore
     # the `install` step will run `bundle install` by default.
-script: ./build.sh
+    script: ./bin/build.sh
 
     sudo: false # route your build to the container-based infrastructure for a faster build
 
     cache: bundler # caching bundler gem packages will speed up build
+
+  - language: node_js
+    node_js: v12.7.0
+    branches:
+      only:
+        - master
+    script: npm run format-test:html

README.md

@@ -1,4 +1,4 @@
-[![privacytools](./assets/img/layout/logo.png)](https://www.privacytools.io/)
+[![privacytools](https://privacytools.io/assets/img/layout/logo.png)](https://www.privacytools.io/)
 
 _Encryption Against Global Mass Surveillance._
 
@@ -15,9 +15,13 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri
 ## Building
 
 1. Install [Ruby](https://www.ruby-lang.org/en/documentation/installation/)
-1. Install [bundler](https://bundler.io/) by running `gem install bundler`.
-1. Run `bundle install` to install the required dependencies.
-1. Use `bundle exec jekyll build` to build the website. The output can be found in the `_site` directory.  Live preview is also possible by running `bundle exec jekyll serve`
+1. Run `gem install bundler` to install [bundler](https://bundler.io/).
+1. Run `bundle install` to install the required Ruby dependencies.
+1. Install [Node.js](https://nodejs.org/).
+1. Run `npm install` to install the required Node dependencies.
+1. Use `npm run build` to build the website. The output can be found in the `_site` directory.
+1. Use `npm run serve` for a live preview of the website.
+1. Use `npm run format:html` to format the HTML source code.
 
 # Support privacytools.io
 
@@ -31,7 +35,6 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri
 # Community Translations
 - [繁体中文 / Chinese](https://privacytools.twngo.xyz/) - [GitHub](https://github.com/twngo/privacytools-zh)
 - [Español / Spanish](https://victorhck.gitlab.io/privacytools-es/) - [GitLab](https://gitlab.com/victorhck/privacytools-es)
-- [Polski / Polish](https://pl.privacytools.io) - [Gitea](https://git.privacytools.io/pl-privacytoolsIO/pl.privacytools.io)
 - [Deutsch / German](https://privacytools.it-sec.rocks/) - [GitHub](https://github.com/Anon215/privacytools.it-sec.rocks)
 - [Français / French](https://privacytools.dreads-unlock.fr/) - [GitLab](https://gitlab.com/Booteille/privacytools)
 - [Italiano / Italian](https://privacytools-it.github.io/) - [GitHub](https://github.com/privacytools-it/privacytools-it.github.io)

_includes/card.html

@@ -17,8 +17,7 @@
 					{% assign text = label_data[1] %}
 					{% assign tooltip = label_data[2] | default: "" %}
 					{% 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
-                        }}
+					<span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon }}
 						{% else %}
 						>{{text}}
 						{% endif %}

_includes/cardv2.html

@@ -1,88 +1,48 @@
 <div class="card">
 	<div class="card-header text-white bg-secondary">
-    <h3 class="h5">
-      {% if include.badges %}
-      <span class="mr-2">{{include.title}}</span>
-      {% assign badges = include.badges | replace:", ", "," | split:"," %}
-          {% for badge in badges %}
-              {% assign badge_data = badge | split:":" %}
-              {% assign color = badge_data[0] %}
-              {% assign text = badge_data[1] %}
-              {% assign tooltip = badge_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 %}
-              </span>
-          {% endfor %}
-      {% else %}
-      {{include.title}}
-      {% endif %}
-    </h3>
+		<h3 class="h5">{{include.title}}</h3>
 	</div>
 	<div class="card-body">
 		<p class="card-text">
 			<img src="{{include.image}}" height="120" width="120" class="panel-pic" alt="{{include.title}}">
 			{{include.description}}
-      {% if include.labels %}
-      {% assign labels = include.labels | replace:", ", "," | split:"," %}
-          {% 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 %}
-              </span>
-          {% endfor %}
-      {% endif %}
 		</p>
-    <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
-      <div class="flex-shrink-0 mr-2">
-        <a href="{{include.website}}" class="btn btn-primary mt-1"><i class="fas fa-external-link-alt fa-fw"></i> Website</a>
+		<a href="{{include.website}}" class="btn btn-primary"><i class="fas fa-external-link-alt fa-fw"></i> Website</a>
 		{% if include.forum %}
-        <a href="{{include.forum}}" class="btn btn-success mt-1"><i class="fab fa-discourse fa-fw"></i> Forum</a>
+		<a href="{{include.forum}}" class="btn btn-success"><i class="fab fa-discourse fa-fw"></i> Forum</a>
 		{% endif %}
 		{% if include.tor %}
-        <a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: torproject.org" href="{{include.tor}}"><img class="mt-2" alt="Tor" src="/assets/img/layout/tor.png" width="35" height="35"></a>
+		<a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: torproject.org" href="{{include.tor}}"><img alt="Tor" src="/assets/img/layout/tor.png" width="35" height="35"></a>
 		{% endif %}
-      </div>
 
-      <div class="mt-2">
-          {% if include.windows %}{% if include.windows != "" %}<a href="{{ include.windows }}"><i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.mac %}{% if include.mac != "" %}<a href="{{ include.mac }}"><i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.linux %}{% if include.linux != "" %}<a href="{{ include.linux }}"><i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.bsd %}{% if include.bsd != "" %}<a href="{{ include.bsd }}"><i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+		<div class="float-right">
+			{% if include.windows %}<i class="fab fa-windows fa-2x fa-fw"></i>{% endif %}
+			{% if include.mac %}<i class="fab fa-apple fa-2x fa-fw"></i>{% endif %}
+			{% if include.linux %}<i class="fab fa-linux fa-2x fa-fw"></i>{% endif %}
+			{% if include.bsd %}<i class="fab fa-freebsd fa-2x fa-fw"></i>{% endif %}
 
-          {% if include.firefox %}{% if include.firefox != "" %}<a href="{{ include.firefox }}"><i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.chrome %}{% if include.chrome != "" %}<a href="{{ include.chrome }}"><i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.safari %}{% if include.safari != "" %}<a href="{{ include.safari }}"><i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.opera %}{% if include.opera != "" %}<a href="{{ include.opera }}"><i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.edge %}{% if include.edge != "" %}<a href="{{ include.edge }}"><i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+			{% if include.firefox %}<i class="fab fa-firefox fa-2x fa-fw"></i>{% endif %}
+			{% if include.chrome %}<i class="fab fa-chrome fa-2x fa-fw"></i>{% endif %}
+			{% if include.safari %}<i class="fab fa-safari fa-2x fa-fw"></i>{% endif %}
+			{% if include.opera %}<i class="fab fa-opera fa-2x fa-fw"></i>{% endif %}
+			{% if include.edge %}<i class="fab fa-edge fa-2x fa-fw"></i>{% endif %}
 
-          {% if include.android %}{% if include.android != "" %}<a href="{{ include.android }}"><i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.ios %}{% if include.ios != "" %}<a href="{{ include.ios }}"><i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.fire %}{% if include.fire != "" %}<a href="{{ include.fire }}"><i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+			{% if include.android %}<i class="fab fa-android fa-2x fa-fw"></i>{% endif %}
+			{% if include.ios %}<i class="fab fa-app-store-ios fa-2x fa-fw"></i>{% endif %}
+			{% if include.fire %}<i class="fas fa-fire fa-2x fa-fw"></i>{% endif %}
 
-          {% if include.web %}{% if include.web != "" %}<a href="{{ include.web }}"><i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+			{% if include.web %}<i class="fas fa-desktop fa-2x fa-fw"></i>{% endif %}
 
 			{{include.icon1}}
 			{{include.icon2}}
 			{{include.icon3}}
 
-          {% if include.github %}<a href="{{include.github}}"><i class="fab fa-github fa-2x fa-fw d-inline"></i></a>{% endif %}
-          {% if include.gitlab %}<a href="{{include.gitlab}}"><i class="fab fa-gitlab fa-2x fa-fw d-inline"></i></a>{% endif %}
-          {% if include.git %}<a href="{{include.git}}"><i class="fab fa-git-square fa-2x fa-fw d-inline"></i></a>{% endif %}
-          {% if include.source %}<a href="{{include.source}}"><i class="fas fa-code-branch fa-2x fa-fw d-inline"></i></a>{% endif %}
+			{% if include.github %}<a href="{{include.github}}"><i class="fab fa-github fa-2x fa-fw"></i></a>{% endif %}
+			{% if include.gitlab %}<a href="{{include.gitlab}}"><i class="fab fa-gitlab fa-2x fa-fw"></i></a>{% endif %}
+			{% if include.git %}<a href="{{include.git}}"><i class="fab fa-git-square fa-2x fa-fw"></i></a>{% endif %}
+			{% if include.source %}<a href="{{include.source}}"><i class="fas fa-code-branch fa-2x fa-fw"></i></a>{% endif %}
 
 		</div>
-    </div>
 
 	</div>
 </div>

_includes/footer.html

@@ -72,7 +72,7 @@
 
 	<div class="copyright-text">
 		<p><strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong> <em>privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em> <a href="/privacy-policy/">View our privacy policy</a>.</p>
-    <p class="text-left">Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong> (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</a>)</p>
+		<p>Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong> (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</a>)</p>
 	</div>
 
 </footer>

_includes/nav.html

@@ -19,10 +19,8 @@
 						<a class="dropdown-item" href="/providers/dns/"><i class="fa fa-tasks fa-fw"></i> DNS</a>
 						<a class="dropdown-item" href="/providers/email/"><i class="fas fa-mail-bulk fa-fw"></i> Email</a>
 						<a class="dropdown-item" href="/providers/hosting/"><i class="fas fa-database fa-fw"></i> Hosting</a>
-            <a class="dropdown-item" href="/providers/paste/"><i class="fas fa-paste fa-fw"></i> Pastebins</a>
 						<a class="dropdown-item" href="/providers/search-engines/"><i class="fab fa-searchengin fa-fw"></i> Search Engines</a>
 						<a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt fa-fw"></i> Social Networks</a>
-            <a class="dropdown-item" href="/providers/social-news-aggregator/"><i class="far fa-newspaper fa-fw"></i> Social News Aggregators</a>
 						<a class="dropdown-item" href="/providers/vpn/"><i class="far fa-eye-slash fa-fw"></i> VPN</a>
 					</div>
 				</li>
@@ -31,11 +29,11 @@
 						Browser
 					</a>
 					<div class="dropdown-menu" aria-labelledby="browserDropdown">
-            <a class="dropdown-item" href="/browsers/#browser"><i class="fas fa-check fa-fw"></i> Recommendations</a>
-            <a class="dropdown-item" href="/browsers/#fingerprint"><i class="fas fa-fingerprint fa-fw"></i> Fingerprinting Info</a>
-            <a class="dropdown-item" href="/browsers/#webrtc"><i class="far fa-eye fa-fw"></i> WebRTC IP Leak Test</a>
-            <a class="dropdown-item" href="/browsers/#addons"><i class="far fa-list-alt fa-fw"></i> Browser Add-ons</a>
-            <a class="dropdown-item" href="/browsers/#about_config"><i class="fas fa-wrench fa-fw"></i> Firefox Tweaks</a>
+						<a class="dropdown-item" href="/browsers/#fingerprint"><i class="fas fa-fingerprint fa-fw"></i> Fingerprint</a>
+						<a class="dropdown-item" href="/browsers/#addons"><i class="far fa-list-alt fa-fw"></i> Firefox Privacy Add-ons</a>
+						<a class="dropdown-item" href="/browsers/#about_config"><i class="fas fa-wrench fa-fw"></i> Privacy Related Tweaks</a>
+						<a class="dropdown-item" href="/browsers/#browser"><i class="fas fa-check fa-fw"></i> Recommendation</a>
+						<a class="dropdown-item" href="/browsers/#webrtc"><i class="far fa-eye fa-fw"></i> WebRTC IP Leak</a>
 					</div>
 				</li>
 				<li class="nav-item dropdown">
@@ -43,18 +41,18 @@
 						Software
 					</a>
 					<div class="dropdown-menu" aria-labelledby="softwareDropdown">
-            <a class="dropdown-item" href="/software/calendar-contacts/"><i class="fas fa-calendar fa-fw"></i> Calendar/Contacts Sync Tools</a>
 						<a class="dropdown-item" href="/software/notebooks/"><i class="far fa-sticky-note fa-fw"></i> Digital Notebook</a>
 						<a class="dropdown-item" href="/software/email/#messaging"><i class="fas fa-random fa-fw"></i> Email Alternatives</a>
 						<a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> Email Clients</a>
 						<a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> File Encryption</a>
 						<a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> File Sharing</a>
+						<a class="dropdown-item" href="/software/im/"><i class="fab fa-telegram-plane fa-fw"></i> Instant Messenger</a>
 						<a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> Password Manager</a>
 						<a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> Productivity Tools</a>
-            <a class="dropdown-item" href="/software/real-time-communication/"><i class="fas fa-comments fa-fw"></i> Real-Time Communication</a>
 						<a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</a>
 						<a class="dropdown-item" href="/software/networks/"><i class="fas fa-user-secret fa-fw"></i> Self-contained Networks</a>
 						<a class="dropdown-item" href="/software/cloud/"><i class="fas fa-hdd fa-fw"></i> Self-Hosted Cloud Server</a>
+						<a class="dropdown-item" href="/software/voip/"><i class="fas fa-phone fa-fw"></i> Video & Voice Messenger</a>
 					</div>
 				</li>
 				<li class="nav-item dropdown">
@@ -62,12 +60,12 @@
 						OS
 					</a>
 					<div class="dropdown-menu" aria-labelledby="osDropdown">
-            <a class="dropdown-item" href="/operating-systems/#os"><i class="fas fa-th-large fa-fw"></i> PC OS Recommendations</a>
-            <a class="dropdown-item" href="/operating-systems/#live_os"><i class="fas fa-compact-disc fa-fw"></i> Live CD Operating Systems</a>
-            <a class="dropdown-item" href="/operating-systems/#mobile_os"><i class="fas fa-mobile-alt fa-fw"></i> Mobile Operating Systems</a>
 						<a class="dropdown-item" href="/operating-systems/#aaddons"><i class="fas fa-th fa-fw"></i> Android Privacy Add-ons</a>
-            <a class="dropdown-item" href="/operating-systems/#firmware"><i class="fas fa-signal fa-fw"></i> Router Firmware</a>
 						<a class="dropdown-item" href="/operating-systems/#win10"><i class="far fa-thumbs-down fa-fw"></i> Don't use Windows 10</a>
+						<a class="dropdown-item" href="/operating-systems/#live_os"><i class="fas fa-compact-disc fa-fw"></i> Live CD OS</a>
+						<a class="dropdown-item" href="/operating-systems/#mobile_os"><i class="fas fa-mobile-alt fa-fw"></i> Mobile OS</a>
+						<a class="dropdown-item" href="/operating-systems/#os"><i class="fas fa-th-large fa-fw"></i> PC OS</a>
+						<a class="dropdown-item" href="/operating-systems/#firmware"><i class="fas fa-signal fa-fw"></i> Router Firmware</a>
 					</div>
 				</li>
 				<li class="nav-item">
@@ -82,7 +80,6 @@
 					<div class="dropdown-menu" aria-labelledby="servicesDropdown">
 						<a href="https://privacytools.twngo.xyz/" class="dropdown-item">繁體中文</a>
 						<a href="https://victorhck.gitlab.io/privacytools-es/" class="dropdown-item">Español</a>
-            <a href="https://pl.privacytools.io/" class="dropdown-item">Polski</a>
 						<a href="https://www.privacidade.digital/" class="dropdown-item">Português</a>
 						<a href="https://privacytools.it-sec.rocks/" class="dropdown-item">Deutsch</a>
 						<a href="https://privacytools-it.github.io/" class="dropdown-item">Italiano</a>

_includes/scripts.html

@@ -30,8 +30,14 @@
 		var u = "https://stats.privacytools.io/";
 		_paq.push(['setTrackerUrl', u + 'matomo.php']);
 		_paq.push(['setSiteId', '1']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+		var d = document,
+			g = d.createElement('script'),
+			s = d.getElementsByTagName('script')[0];
+		g.type = 'text/javascript';
+		g.async = true;
+		g.defer = true;
+		g.src = u + 'matomo.js';
+		s.parentNode.insertBefore(g, s);
 	})();
 </script>
 <noscript><img src="https://stats.privacytools.io/matomo.php?idsite=1&amp;rec=1" style="border:0" alt="" /></noscript>

_includes/sections/android-addons.html

@@ -7,7 +7,7 @@
 <div class="container-fluid">
 
 	<div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
+		<div class="col-lg-3 col-sm-12">
 			<img src="/assets/img/addons/Blokada.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Blokada">
 		</div>
 		<div class="col">
@@ -17,7 +17,7 @@
 	</div>
 
 	<div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
+		<div class="col-lg-3 col-sm-12">
 			<img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
 		</div>
 		<div class="col">
@@ -27,7 +27,7 @@
 	</div>
 
 	<div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
+		<div class="col-lg-3 col-sm-12">
 			<img src="/assets/img/addons/Orbot.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Orbot">
 		</div>
 		<div class="col">
@@ -37,3 +37,20 @@
 	</div>
 
 </div>
+
+<div class="alert alert-warning" role="alert">
+	<strong>The following add-ons require root access, which makes your device more vulnerable. Proceed with caution.</strong>
+</div>
+
+<div class="container-fluid">
+	<div class="row mb-2">
+		<div class="col-lg-3 col-sm-12">
+			<img src="/assets/img/addons/xprivacylua.png" class="img-fluid d-block mr-auto ml-auto align-middle" alt="XPrivacyLua">
+		</div>
+		<div class="col">
+			<h3>Manage your apps' permissions with <a href="https://lua.xprivacy.eu/">XPrivacyLua</a></h3>
+			<p>Revoking Android permissions from apps often let apps crash or malfunction. <strong>XPrivacyLua</strong> solves this by feeding apps fake data instead of real data.</p>
+			<p>Requirements: <a href="https://forum.xda-developers.com/apps/magisk/official-magisk-v7-universal-systemless-t3473445">Magisk (xda-developers)</a>, <a href="https://forum.xda-developers.com/xposed">Xposed Framework (xda-developers)</a></p>
+		</div>
+	</div>
+</div>

_includes/sections/browser-addons.html

@@ -1,7 +1,7 @@
-<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Recommended Browser Add-ons</h1>
+<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Excellent Firefox Privacy Add-ons</h1>
 
 <div class="alert alert-primary" role="alert">
-  <strong>Improve your privacy with these browser add-ons.</strong>
+	<strong>Improve your privacy with these excellent Firefox add-ons.</strong>
 </div>
 
 
@@ -88,7 +88,7 @@ image="/assets/img/addons/snowflake.png"
 description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead."
 website="https://snowflake.torproject.org"
 forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
-git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
+github="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
 firefox=""
 chrome=""
 %}

_includes/sections/browser-recommendation.html

@@ -1,4 +1,4 @@
-<h1 id="browser" class="anchor"><a href="#browser"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations</h1>
+<h1 id="browser" class="anchor"><a href="#browser"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendation</h1>
 
 {% include cardv2.html
 title="Mozilla Firefox"
@@ -8,6 +8,7 @@ recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a
 website="https://www.firefox.com/"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
 github="https://github.com/mozilla"
+windows=""
 mac=""
 linux=""
 android=""
@@ -16,12 +17,13 @@ bsd=""
 %}
 
 {% include cardv2.html
-title="Tor Browser - Provides Anonymity"
+title="Tor Browser - For Experts"
 image="/assets/img/tools/Tor-Browser.png"
-description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
+description='Tor Browser is your choice if you need an extra layer of anonymity. Its a modified version of Firefox, it comes with pre-installed privacy add-ons, encryption and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
 website="https://www.torproject.org/"
 forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
 git="https://trac.torproject.org/projects/tor"
+windows=""
 mac=""
 linux=""
 android=""
@@ -30,12 +32,13 @@ bsd=""
 %}
 
 {% include cardv2.html
-title="Brave Browser - Chromium Based"
+title="Brave Browser - Complete but Experimental"
 image="/assets/img/tools/Brave.png"
 description="The new open source browser Brave automatically blocks ads and trackers, making it faster and safer than your current browser. Brave is based on Chromium. <span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"Brave is a good choice if you want to use a Chromium-based browser. But at this point in Brave's development&comma; it's not as good as Firefox with privacy addons.\">experimental <i class=\"far fa-question-circle\"></i></span>"
 website="https://brave.com/"
 forum="https://forum.privacytools.io/t/discussion-brave-browser/280"
 github="https://github.com/brave"
+windows=""
 mac=""
 linux=""
 android=""

_includes/sections/browser-tweaks.html

@@ -118,24 +118,6 @@
 		</ul>
 	</dd>
 
-  <dt>network.trr.mode = 2</dt>
-  <dd>
-  Use Trusted Recursive Resolver (DNS-over-HTTPS) first and if it fails, use the system resolver <a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver">Source</a>
-  <ul>
-    <li>0 = disabled by default, may change in the future</li>
-    <li>1 = use the faster resolver</li>
-    <li>2 = use DoH first, fallback to system resolver</li>
-    <li>3 = only use DoH. This may require <code>network.trr.bootstrapAddress</code> or using an IP address in <code>network.trr.uri</code>.</li>
-    <li>5 = explicitly disable DoH</li>
-  </ul>
-  </dd>
-
-  <dt>network.trr.uri = CHANGEME</dt>
-  <dd>The address of your DNS-over-HTTPS provider, if you don't have one, <a href="/providers/dns/#icanndns">check our encrypted DNS recommendations</a>. It can also be changed in <em>Settings, Network Settings, Enable DNS over HTTPS, Use Provider, Custom</em>.</dd>
-
-  <dt>network.security.esni.enabled = true</dt>
-  <dd>Hide the address which you are requesting SSL certificate for if the server supports it. This <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1500289">requires DoH/TRR to be enabled</a> even <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1542754">on Android 9+ when Private DNS is enabled</a>.</dd>
-
 	<dt>webgl.disabled = true</dt>
 	<dd>WebGL is a potential security risk. <a href="https://security.stackexchange.com/questions/13799/is-webgl-a-security-concern">Source</a></dd>
 

_includes/sections/calendar-contacts-sync.html

@@ -40,6 +40,10 @@
 		<a href="https://fruux.com/">fruux</a> - a unified contacts/calendaring system that works across platforms and devices.
 	</li>
 
+	<li>
+		<a href="https://signal.org/blog/flock/">Flock</a> - a discontinued calendar and contacts sync service by Open Whisper Systems. Despite being shut down the <a href="https://github.com/signalapp/Flock">source code</a> is still available on GitHub.
+	</li>
+
 	<li>
 		<a href="../cloud">cloud backups</a> - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/#encrypt">encrypting</a> them).
 	</li>

_includes/sections/cloud-storage.html

@@ -11,6 +11,7 @@ description="Similar functionally to the widely used Dropbox, with the differenc
 website="https://nextcloud.com/"
 forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
 github="https://github.com/nextcloud"
+windows=""
 mac=""
 linux=""
 bsd=""
@@ -26,6 +27,7 @@ description="S4 (Simple Secure Storage Service) is Least Authority's verifiably
 website="https://leastauthority.com/"
 forum="https://forum.privacytools.io/t/discussion-least-authority-s4/288"
 github="https://github.com/LeastAuthority"
+windows=""
 mac=""
 linux=""
 bsd=""

_includes/sections/dns.html

@@ -27,275 +27,16 @@ forum="https://forum.privacytools.io/t/discussion-dnscrypt/340"
 github="https://github.com/jedisct1/dnscrypt-proxy"
 %}
 
-<h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> Encrypted ICANN DNS Providers</h1>
-
-<div class="alert alert-warning" role="alert">
-  <strong>Note: Using an encrypted DNS resolver will not make you anonymous, nor hide your internet traffic from your Internet Service Provider. But it will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here.</strong>
-</div>
-
-<div class="table-responsive">
-  <table class="table sortable-theme-bootstrap" data-sortable>
-    <thead>
-      <tr>
-        <th data-sorted="true" data-sorted-direction="descending">ICANN DNS Provider</th>
-        <th data-sortable="true">Server Locations</th>
-        <th data-sortable="false">Privacy Policy</th>
-        <th data-sortable="true">Type</th>
-        <th data-sortable="true">Logging</th>
-        <th data-sortable="true">Protocols</th>
-        <th data-sortable="true">DNSSEC</th>
-        <th data-sortable="true">QNAME Minimization</th>
-        <th data-sortable="true">Filtering</th>
-        <th data-sortable="true">Source Code</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td data-value="AdGuard">
-          <a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard</a>
-        </td>
-        <td>Anycast (based in <span class="flag-icon flag-icon-cy"></span> Cyprus)</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://adguard.com/en/privacy/dns.html" href="https://adguard.com/en/privacy/dns.html">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td>Commercial</td>
-        <td>No</td>
-        <td>DoH, DoT, DNSCrypt</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>Ads, trackers, malicious domains</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/AdguardTeam/AdGuardDNS/" href="https://github.com/AdguardTeam/AdGuardDNS/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-      </tr>
-
-      <tr>
-        <td data-value="BlahDNS">
-          <a href="https://blahdns.com/">BlahDNS</a>
-        </td>
-        <td><span class="flag-icon flag-icon-ch"></span> Switzerland, <span class="flag-icon flag-icon-jp"></span> Japan, <span class="flag-icon flag-icon-de"></span> Germany</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"No logs."'>
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td>Hobby Project</td>
-        <td>No</td>
-        <td>DoH, DoT, DNSCrypt</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>Ads, trackers, malicious domains <span class="badge badge-warning" data-toggle="tooltip" data-original-title="And some wildcard, IDN, and non-ASCII domains."><a href="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"><i class="fas fa-exclamation-triangle"></i></a></span></td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/ookangzheng/blahdns/" href="https://github.com/ookangzheng/blahdns/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-      </tr>
-
-      <tr>
-        <td data-value="Cloudflare">
-          <a href="https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1/">Cloudflare</a> <span class="badge badge-warning" data-toggle="tooltip" title="Cloudflare is one of the world's largest networks, and a problem considering anonymity and decentralization."><a href="https://codeberg.org/crimeflare/cloudflare-tor/"><i class="fas fa-exclamation-triangle"></i></a></span>
-        </td>
-        <td>Anycast (based in <span class="flag-icon flag-icon-us"></span> US)</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.cloudflare.com/privacypolicy/" href="https://www.cloudflare.com/privacypolicy/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td>Commercial</td>
-        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"We will collect limited DNS query data that is sent to the resolvers. This data does not contain user IP addresses or any other personally identifiable information, and the bulk of the data is only stored for 24 hours."' href="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/privacy-policy/">Some</a></td>
-        <td>DoH, DoT, DNSCrypt</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>No</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/cloudflare/dns" href="https://github.com/cloudflare/dns">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-      </tr>
-
-      <tr>
-        <td data-value="CZ.NIC">
-          <a href="https://www.nic.cz/odvr/">CZ.NIC</a>
-        </td>
-        <td><span class="flag-icon flag-icon-cz"></span> Czech Republic</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data."'>
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"CZ.NIC is an interest association of legal entities, founded in 1998 by leading providers of Internet services."' href="https://www.nic.cz/page/351/about-association/">Association</a></td>
-        <td>No</td>
-        <td>DoH, DoT</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td data-value="No">?</td>
-        <td>?</td>
-      </tr>
-
-      <tr>
-        <td data-value="dnswarden">
-          <a href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md">dnswarden</a>
-        </td>
-        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc" href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td>Hobby Project</td>
-        <td>No</td>
-        <td>DoH, DoT, DNSCrypt</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>Based on server choice</td>
-        <td>?</td>
-      </tr>
-
-      <tr>
-        <td data-value="Foundation for Applied Privacy">
-          <a href="https://appliedprivacy.net/services/dns/">Foundation for Applied Privacy</a>
-        </td>
-        <td><span class="flag-icon flag-icon-at"></span> Austria</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://appliedprivacy.net/privacy-policy" href="https://appliedprivacy.net/privacy-policy">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td>Non-Profit</td>
-        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"We do NOT log your IP address or DNS queries during normal operations. We do NOT share query data with third parties that are not directly involved with resolving the query (i.e. sending queries to authoritative nameservers for resolution)."' href="https://appliedprivacy.net/privacy-policy/">Some</a></td>
-        <td>DoH, DoT</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>No</td>
-        <td>?</td>
-      </tr>
-
-      <tr>
-        <td data-value="nextdns">
-          <a href="https://www.nextdns.io/">nextdns</a>
-        </td>
-        <td>Anycast (based in <span class="flag-icon flag-icon-us"></span> US)</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.nextdns.io/privacy" href="https://www.nextdns.io/privacy">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td>Commercial</td>
-        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"Some of the features require some sort of data retention. In that case, we give our users the choice to granularly or completely disable those features (and associated data retention), and we follow up immediately on that promise"' href="https://www.nextdns.io/privacy">Based on user choice</a></td>
-        <td>DoH, DoT, DNSCrypt</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>Based on user choice</td>
-        <td>?</td>
-      </tr>
-
-      <tr>
-        <td data-value="PowerDNS">
-          <a href="https://powerdns.org/">PowerDNS</a>
-        </td>
-        <td><span class="flag-icon flag-icon-nl"></span> The Netherlands</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://powerdns.org/doh/privacy.html" href="https://powerdns.org/doh/privacy.html">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td>Hobby Project</td>
-        <td>No</td>
-        <td>DoH</td>
-        <td>Yes</td>
-        <td>No</td>
-        <td>No</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/PowerDNS/pdns" href="https://github.com/PowerDNS/pdns">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-      </tr>
-
-      <tr>
-        <td data-value="Quad9">
-          <a href="https://quad9.net/">Quad9</a> <span class="badge badge-warning" data-toggle="tooltip" title="Founders include the Global Cyber Alliance, comprised of the City of London Police and Manhattan District Attorney's Office"><i class="fas fa-exclamation-triangle"></i></span>
-        </td>
-        <td>Anycast (based in <span class="flag-icon flag-icon-us"></span> US)</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://quad9.net/policy/" href="https://quad9.net/policy/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td>Non-Profit</td>
-        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"Our normal course of data management does not have any IP address information or other PII logged to disk or transmitted out of the location in which the query was received."' href="https://quad9.net/policy/">Some</a></td>
-        <td>DoH, DoT, DNSCrypt</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>Malicious domains</td>
-        <td>?</td>
-      </tr>
-
-      <tr>
-        <td data-value="SecureDNS">
-          <a href="https://securedns.eu/">SecureDNS</a>
-        </td>
-        <td><span class="flag-icon flag-icon-nl"></span> The Netherlands</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://securedns.eu/#privacy" href="https://securedns.eu/#privacy">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td>Hobby Project</td>
-        <td>No</td>
-        <td>DoH, DoT, DNSCrypt</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>Based on server choice</td>
-        <td>?</td>
-      </tr>
-
-      <tr>
-        <td data-value="UncensoredDNS">
-          <a href="https://blog.uncensoreddns.org/">UncensoredDNS</a>
-        </td>
-        <td>Anycast (based in <span class="flag-icon flag-icon-dk"></span> Denmark)</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service."'>
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td>Hobby Project</td>
-        <td>No</td>
-        <td data-value="doh">DoT</td> <!-- "hack" to group "DoT" values (when sorted) with "DoH" values -->
-        <td>Yes</td>
-        <td>No</td>
-        <td>No</td>
-        <td>?</td>
-      </tr>
-    </tbody>
-  </table>
-
-  <h4>Terms</h4>
+<h3>Worth Mentioning</h3>
 
 <ul>
-    <li>DNS-over-TLS (DoT) - A security protocol for encrypted DNS on a dedicated port 853.</li>
-    <li>DNS-over-HTTPS (DoH) - Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443.</li>
-    <li>DNSCrypt - An older yet robust method of encrypting DNS.</li>
-  </ul>
-
-  <h3>Worth Mentioning and Additional Information</h3>
-
+	<li><a href="https://gitlab.com/quidsup/notrack">NoTrack</a> - A network-wide DNS server which blocks Tracking sites. Currently works in Debian and Ubuntu.</li>
+	<li><a href="https://namecoin.info/">Namecoin</a> - A decentralized DNS open source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
+	<li><a href="https://pi-hole.net/">Pi-hole</a> - A network-wide DNS server for the Raspberry Pi. Blocks advertising and tracking domains for all devices on your network.</li>
+	<li id="icanndns">ICANN DNS resolvers with support for encrypted DNS</li>
 	<ul>
-    <li>Firefox comes with built-in DoH support with Cloudflare set as the default resolver, but can be configured to use any DoH resolver. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title='"Cloudflare has agreed to collect only a limited amount of data about the DNS requests that are sent to the Cloudflare Resolver for Firefox via the Firefox browser."'><a href="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/firefox/"><i class="fas fa-exclamation-triangle"></i></a></span> Currently Mozilla is <a href="https://blog.mozilla.org/futurereleases/2019/07/31/dns-over-https-doh-update-detecting-managed-networks-and-user-choice/">conducting studies</a> before enabling DoH by default for all US-based Firefox users.</li>
-    <li>Android 9 comes with a DoT client by <a href="https://support.google.com/android/answer/9089903">default</a>. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="...but with some caveats"><a href="https://www.quad9.net/private-dns-quad9-android9/"><i class="fas fa-exclamation-triangle"></i></a></span></li>
-    <li><a href="https://apps.apple.com/app/id1452162351">DNSCloak</a> - An <a href="https://github.com/s-s/dnscloak">open-source</a> DNSCrypt and DoH client for iOS by <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"A charitable non-profit host organization for international Free Software projects."' href="https://techcultivation.org/">the Center for the Cultivation of Technology gemeinnuetzige GmbH</a>.</li>
-      <li><a href="https://pi-hole.net/">Pi-hole</a> - A network-wide DNS server mainly for the Raspberry Pi. Blocks ads, tracking, and malicious domains for all devices on your network.</li>
-      <li><a href="https://gitlab.com/quidsup/notrack">NoTrack</a> - A network-wide DNS server like Pi-hole for blocking ads, tracking, and malicious domains.</li>
-    <li><a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby">Stubby</a> - An open-source application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.</li>
-    <li><a href="https://namecoin.info/">Namecoin</a> - A decentralized DNS open-source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
-    <li><a href="https://www.isc.org/blogs/qname-minimization-and-privacy/">QNAME Minimization and Your Privacy</a> by the Internet Systems Consortium (ISC)</li>
-    <li><a href="https://www.isc.org/dnssec/">DNSSEC and BIND 9</a> by the ISC</li>
+		<li><a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard DNS</a> - A commercial, anycast DNS resolver with ad-blocking and support for DNS over HTTPS (DoH), DNS over TLS (DoT), and DNSCrypt. <span class="badge badge-warning" data-toggle="tooltip" title="Uses Cloudflare, no DNSSEC, for-profit (in Cyprus)">Warnings <i class="far fa-question-circle"></i></a></span></li>
+		<li><a href="https://blahdns.com/">BlahDNS</a> - A small hobby ad-blocking DNS project with DoH, DoT, and DNSCrypt support. Servers located in Switzerland, Japan, and Germany. <span class="badge badge-warning" data-toggle="tooltip" title="'Use at your own risk.', uses Cloudflare">Warnings <i class="far fa-question-circle"></i></a></span></li>
+		<li><a href="https://powerdns.org/">PowerDNS</a> - A best effort DoH service. Servers located in the Netherlands.</li>
+		<li><a href="https://quad9.net/">Quad9 DNS</a> - A non-profit, anycast DNS provider founded by <a href="https://www-03.ibm.com/press/us/en/pressrelease/53388.wss">IBM</a>, <a href="https://www.pch.net/">PCH</a>, and <a href=https://www.globalcyberalliance.org/quad9/"">Global Cyber Alliance</a>. Provides malicious domain filtering and supports DoH, DoT, and DNSCrypt. <span class="badge badge-warning" data-toggle="tooltip" title="Founders of Global Cyber Alliance include: City of London Police & Manhattan District Attorney's Office">Warnings <i class="far fa-question-circle"></i></a></span></li>
 	</ul>
-</div>

_includes/sections/email-alternatives.html

@@ -8,6 +8,7 @@ meaning that you need-not inherently trust any entities like root certificate au
 website="https://bitmessage.org/"
 forum="https://forum.privacytools.io/t/discussion-bitmessage/661"
 github="https://github.com/Bitmessage/PyBitmessage"
+windows=""
 mac=""
 linux=""
 %}
@@ -19,6 +20,7 @@ description="Retroshare creates encrypted connections to your friends. Nobody ca
 website="https://retroshare.cc/"
 forum="https://forum.privacytools.io/t/discussion-retroshare/662"
 github="https://github.com/RetroShare/RetroShare"
+windows=""
 mac=""
 linux=""
 %}

_includes/sections/email-clients.html

@@ -7,6 +7,7 @@ description="Thunderbird is a free, open source, cross-platform email, newsgroup
 website="https://www.thunderbird.net/"
 forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
 source="https://hg.mozilla.org/comm-central/"
+windows=""
 mac=""
 linux=""
 bsd=""
@@ -19,6 +20,7 @@ description="Claws Mail is a free and open source, GTK-based email and news clie
 website="https://www.claws-mail.org/"
 forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
 git="https://git.claws-mail.org/"
+windows=""
 mac=""
 linux=""
 bsd=""

_includes/sections/email-providers.html

@@ -8,7 +8,7 @@
 	<table class="table sortable-theme-bootstrap" data-sortable>
 		<thead>
 			<tr>
-        <th data-sorted="true" data-sorted-direction="ascending">Email Provider</th>
+				<th data-sorted="true" data-sorted-direction="descending">Email Provider</th>
 				<th data-sortable="false">Website</th>
 				<th data-sortable="true">Since</th>
 				<th data-sortable="true">Jurisdiction</th>
@@ -23,104 +23,7 @@
 		<tbody>
 
 			<tr>
-        <td data-value="disroot">
-          <img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2015">2015</td>
-        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-        <td data-value="1000">1 GB</td>
-        <td data-value="0"><span class="label label-warning">Free</span></td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="kolabnow">
-          <img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2010">2010</td>
-        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-        <td data-value="2048">2 GB</td>
-        <td data-value="6000">$ 60</td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="mailbox">
-          <img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
-
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
-        <td data-value="2000">2 GB</td>
-        <td data-value="1444">12 €</td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="mailfence">
-          <img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2013">2013</td>
-        <td><span class="flag-icon flag-icon-be"></span> Belgium</td>
-        <td data-value="500">500 MB</td>
-        <td data-value="0"><span class="label label-warning">Free</span></td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="neomailbox">
-          <img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2003">2003</td>
-        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-        <td data-value="1000">1 GB</td>
-        <td data-value="4995">$ 49.95</td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="posteo">
-          <img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2009">2009</td>
-        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
-        <td data-value="2000">2 GB</td>
-        <td data-value="1444">12 €</td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="protonmail">
+				<td data-value="ProtonMail">
 					<img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70">
 				</td>
 				<td>
@@ -137,56 +40,23 @@
 			</tr>
 
 			<tr>
-        <td data-value="runbox">
-          <img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
-
+				<td data-value="disroot.org">
+					<img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
 				</td>
 				<td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="1999">1999</td>
-        <td><span class="flag-icon flag-icon-no"></span> Norway</td>
-        <td data-value="1000">1 GB</td>
-        <td data-value="1995">$ 19.95</td>
-        <td data-value="1"><span class="label label-primary">Accepted</span></td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="soverin">
-          <img alt="Soverin" src="/assets/img/provider/Soverin.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://soverin.net/" href="https://soverin.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
 				</td>
 				<td data-value="2015">2015</td>
 				<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-        <td data-value="25000">25 GB</td>
-        <td data-value="3489">29 €</td>
-        <td data-value="0"><span class="label label-success">No</span></td>
-        <td data-value="0"><span class="label label-success">No</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="startmail">
-          <img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-        <td data-value="10000">10 GB</td>
-        <td data-value="5995">$ 59.95</td>
-        <td data-value="0"><span class="label label-success">Accepted</span></td>
+				<td data-value="2000">2 GB</td>
+				<td data-value="1"><span class="label label-warning">Free</span></td>
+				<td data-value="1"><span class="label label-success">Accepted</span></td>
 				<td data-value="1"><span class="label label-success">Built-in</span></td>
 				<td data-value="1"><span class="label label-success">Yes</span></td>
 			</tr>
 
 			<tr>
-        <td data-value="tutanota">
+				<td data-value="Tutanota">
 					<img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70">
 				</td>
 				<td>
@@ -201,6 +71,120 @@
 				<td data-value="1"><span class="label label-success">Yes</span></td>
 			</tr>
 
+			<tr>
+				<td data-value="Mailfence">
+					<img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2013">2013</td>
+				<td><span class="flag-icon flag-icon-be"></span> Belgium</td>
+				<td data-value="500">500 MB</td>
+				<td data-value="0"><span class="label label-warning">Free</span></td>
+				<td data-value="1"><span class="label label-success">Accepted</span></td>
+				<td data-value="1"><span class="label label-success">Built-in</span></td>
+				<td data-value="1"><span class="label label-success">Yes</span></td>
+			</tr>
+
+			<tr>
+				<td data-value="mailbox.org">
+					<img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
+
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 " height="35"></a>
+				</td>
+				<td data-value="2014">2014</td>
+				<td><span class="flag-icon flag-icon-de"></span> Germany</td>
+				<td data-value="2000">2 GB</td>
+				<td data-value="13">12 €</td>
+				<td data-value="1"><span class="label label-success">Accepted</span></td>
+				<td data-value="1"><span class="label label-success">Built-in</span></td>
+				<td data-value="1"><span class="label label-success">Yes</span></td>
+			</tr>
+
+			<tr>
+				<td data-value="Posteo">
+					<img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2009">2009</td>
+				<td><span class="flag-icon flag-icon-de"></span> Germany</td>
+				<td data-value="2000">2 GB</td>
+				<td data-value="13">12 €</td>
+				<td data-value="0"><span class="label label-primary">No</span></td>
+				<td data-value="1"><span class="label label-success">Built-in</span></td>
+				<td data-value="0"><span class="label label-primary">No</span></td>
+			</tr>
+
+			<tr>
+				<td data-value="Runbox">
+					<img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
+
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="1999">1999</td>
+				<td><span class="flag-icon flag-icon-no"></span> Norway</td>
+				<td data-value="1000">1 GB</td>
+				<td data-value="20">$ 19.95</td>
+				<td data-value="1"><span class="label label-primary">Yes</span></td>
+				<td data-value="0"><span class="label label-primary">No</span></td>
+				<td data-value="1"><span class="label label-success">Yes</span></td>
+			</tr>
+
+			<tr>
+				<td data-value="Neomailbox">
+					<img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2003">2003</td>
+				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+				<td data-value="1000">1 GB</td>
+				<td data-value="50">$ 49.95</td>
+				<td data-value="1"><span class="label label-success">Accepted</span></td>
+				<td data-value="1"><span class="label label-success">Built-in</span></td>
+				<td data-value="1"><span class="label label-success">Yes</span></td>
+			</tr>
+
+			<tr>
+				<td data-value="StartMail">
+					<img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2014">2014</td>
+				<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
+				<td data-value="10000">10 GB</td>
+				<td data-value="60">$ 59.95</td>
+				<td data-value="0"><span class="label label-success">Accepted</span></td>
+				<td data-value="1"><span class="label label-success">Built-in</span></td>
+				<td data-value="1"><span class="label label-success">Yes</span></td>
+			</tr>
+
+			<tr>
+				<td data-value="Kolab Now">
+					<img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2010">2010</td>
+				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+				<td data-value="2048">2 GB</td>
+				<td data-value="60">$ 60</td>
+				<td data-value="1"><span class="label label-success">Accepted</span></td>
+				<td data-value="0"><span class="label label-primary">No</span></td>
+				<td data-value="1"><span class="label label-success">Yes</span></td>
+			</tr>
+
 		</tbody>
 	</table>
 </div>
@@ -210,7 +194,8 @@
 <ul>
 	<li><a href="https://www.confidantmail.org/">Confidant Mail</a> - An open-source non-SMTP cryptographic email system optimized for large file attachments. It is a secure and spam-resistant alternative to regular email and online file drop services. It
 		uses <a href="https://theprivacyguide.org/tutorials/gpg.html">GNU Privacy Guard (GPG)</a> for content encryption and authentication, and TLS 1.2 with ephemeral keys for transport encryption.</li>
-</ul>  <h3>Become Your Own Email Provider with Mail-in-a-Box</h3>
+</ul>
+<h3>Become Your Own Email Provider with Mail-in-a-Box</h3>
 <a href="https://mailinabox.email/"><img src="/assets/img/provider/Mail-in-a-Box.png" width="200" height="70" class="img-fluid float-left" alt="Mail-in-a-Box" style="margin-right:10px;"></a>
 <p>Take it a step further and get control of your email with this easy-to-deploy mail server in a box. Mail-in-a-Box lets you become your own mail service provider in a few easy steps. It's sort of like making your own Gmail, but one you control from top
 	to bottom. Technically, Mail-in-a-Box turns a fresh cloud computer into a working mail server. But you don't need to be a technology expert to set it up. <strong>More: <a href="https://mailinabox.email/">https://mailinabox.email/</a></strong></p>

_includes/sections/file-encryption.html

@@ -43,6 +43,5 @@
 <ul>
 	<li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
 	<li><a href="https://diskcryptor.net/">DiskCryptor</a> - A full disk and partition encryption system for Windows including the ability to encrypt the partition and disk on which the OS is installed.</li>
-  <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
-  <li><a href="https://hat.sh/">Hat.sh is a cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</a></li>
+	<li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.
 </ul>

_includes/sections/file-sharing.html

@@ -19,6 +19,7 @@ tor="http://elx57ue5uyfplgva.onion/"
 description="OnionShare is an open source tool that lets you securely and anonymously share a file of any size. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable URL to access and download the files."
 forum="https://forum.privacytools.io/t/discussion-onionshare/754"
 github="https://github.com/micahflee/onionshare"
+windows=""
 mac=""
 linux=""
 %}
@@ -30,6 +31,7 @@ website="https://github.com/warner/magic-wormhole"
 description="Get things from one computer to another, safely. This package provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another."
 forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756"
 github="https://github.com/warner/magic-wormhole"
+windows=""
 mac=""
 linux=""
 %}

_includes/sections/instant-messenger.html

@@ -1,35 +1,35 @@
 <h1 id="im" class="anchor"><a href="#im"><i class="fas fa-link anchor-icon"></i></a> Encrypted Instant Messenger</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using an Instant Messenger like Telegram, LINE, Viber, <a href="https://www.eff.org/deeplinks/2016/10/where-whatsapp-went-wrong-effs-four-biggest-security-concerns">WhatsApp</a>, or plain SMS you should pick an alternative here.</strong>
+	<strong>If you are currently using an Instant Messenger like LINE, Telegram, Viber, <a href="https://www.eff.org/deeplinks/2016/10/where-whatsapp-went-wrong-effs-four-biggest-security-concerns">WhatsApp</a>, or plain SMS messages you should pick an alternative here.</strong>
 </div>
 
-
 {% include cardv2.html
 title="Signal"
 image="/assets/img/tools/Signal.png"
 description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
 All communications are end-to-end encrypted. Signal is free and open source."
-labels="success:VoIP"
 website="https://signal.org/"
 forum="https://forum.privacytools.io/t/discussion-signal/664"
 github="https://github.com/signalapp"
 android=""
 ios=""
+mac=""
+windows=""
+linux=""
 %}
 
-
 {% include cardv2.html
 title="Wire"
 image="/assets/img/tools/wire.png"
-description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
-labels="warning:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text>Warning</a>:Wire stores metadata such as list of your connections/conversations in plaintext (= not encrypted).,success:VoIP"
+description='A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available. <span class="badge badge-warning" data-toggle="tooltip" title="Wire stores metadata such as list of your connections/conversations in plaintext (= not encrypted)."><a href="https://www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text">Warning</a></span>'
 website="https://wire.com/"
 forum="https://forum.privacytools.io/t/discussion-wire/750"
 github="https://github.com/wireapp/"
 android=""
 ios=""
 mac=""
+windows=""
 linux=""
 web=""
 %}
@@ -51,27 +51,55 @@ web=""
 	<ul>
 		<li><a href="https://conversations.im/">Conversations</a> (Android) - An open source Jabber/XMPP client for Android 4.4+ smartphones. <span class="badge badge-success">OMEMO</span></li>
 		<li><a href="https://gajim.org/">Gajim</a> (FreeBSD, Linux, Windows) - An open source fully featured XMPP client. <span class="badge badge-success">OMEMO</span></li>
-    <li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development. <span class="badge badge-success">OMEMO</span> <span class="badge badge-success">VoIP</span></li>
+		<li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development. <span class="badge badge-success">OMEMO</span></li>
 		<li><a href="https://omemo.top/">Other OMEMO ready clients</a>.</li>
 	</ul>
 	<li><a href="https://www.kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
 	<li><a href="https://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
 	<li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
-  <li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. <span class="badge badge-success">VoIP</span></li>
-  <li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you full control over your communications and an unmatched level of privacy. Jami has <em>text messaging, video and audio calls, file transfer, video conferencing</em>. <span class="badge badge-success">VoIP</span></li>
+	<li><a href="https://ricochet.im/">Ricochet</a> - <span class="badge badge-danger" data-toggle="tooltip" title="This software is safe if you manually keep Tor up to date."><a href="#ricochetTor" class="text-white">Danger</a></span> <span class="badge badge-warning" data-toggle="tooltip" title="This software is considered safe but experimental and the client has not been updated since 2016."><a href="https://github.com/ricochet-im/ricochet#experimental">Experimental</a></span> Ricochet uses the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor network</a> to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with your contacts without revealing your location or IP address.</li>
 </ul>
 
 
 <h3>Related Information</h3>
 
 <ul>
+	<li><a href="https://www.vice.com/en_us/article/mg7v3a/ricochet-encrypted-messenger-tackles-metadata-problem-head-on">Ricochet, the Messenger That Beats Metadata, Passes Security Audit | Motherboard</a></li>
 	<li><a href="https://firstlook.org/theintercept/2015/07/14/communicating-secret-watched/">Chatting in Secret While We're All Being Watched - firstlook.org</a></li>
 	<li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
-  <li>Independent security audits</li>
-  <ul>
-    <li><a href="https://eprint.iacr.org/2016/1013.pdf">A Formal Security Analysis of the Signal Messaging Protocol (2019)</a> by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila</li>
-    <li><a href="https://wire.com/en/security/#audits">Independent security audits</a> on Wire's website</li>
-    <li><a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a></li>
-  </ul>
 </ul>
 
+<!-- Updating the Tor binary included with Ricochet -->
+<h3 id="ricochetTor" class="anchor"><a href="#ricochetTor"><i class="fas fa-link anchor-icon"></i></a> Updating the Tor binary included with Ricochet</h3>
+
+Currently there are no known vulnerabilities with Ricochet. The software is safe to use as long as you update the included Tor binary to the latest version.
+
+<ol class="long-string-list">
+	<li>Download the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor Browser</a>.</li>
+	<li>Run the Tor Browser installer or extract package for your platform. Windows (.exe), MacOSX (.dmg) and Linux (.tar.bz2).</li>
+	<li>Copy the Tor binary or create a symbolic link to it: </li>
+	<br>
+	<ul>
+		<li><strong>Windows: </strong>Copy the Tor binary included with the Tor Browser and overwrite the old one included with Ricochet.</li>
+		<ul>
+			<li>Tor Browser binary: <code>%HOMEPATH%\Desktop\Tor Browser\Browser\TorBrowser\Tor\tor.exe</code></li>
+			<li>Ricochet's included binary: <code>%HOMEPATH%\Desktop\Ricochet\tor.exe</code></li>
+		</ul>
+		<br>
+		<li><strong>MacOSX: </strong>Assuming you copied the <code>Tor Browser.app</code> and <code>Ricochet.app</code> from their respective .dmg install media to <code>/Applications</code>: <br>
+			Create a symbolic link to the Tor binary in Terminal. Ricochet will continue to use the up to date version of the Tor binary when you update the Tor Browser Bundle.</li>
+		<ul>
+			<li><code>rm ~/Applications/Ricochet.app/Contents/MacOS/tor <br>
+					ln -s ~/Applications/Tor\ Browser.app/Contents/Resources/TorBrowser/Tor/tor \ <br>
+					~/Applications/Ricochet.app/Contents/MacOS/tor</code>
+			</li>
+		</ul>
+		<br>
+		<li><strong>Linux: </strong>Assuming you extracted the Tor Browser Bundle and Ricochet tarball to your home directory:</li>
+		<ul>
+			<li><code>rm ~/ricochet/tor <br>
+					ln -s ~/tor-browser_en-US/Browser/TorBrowser/Tor/tor ~/ricochet/tor</code>
+			</li>
+		</ul>
+		<ul>
+</ol>

_includes/sections/key-disclosure-law.html

@@ -2,7 +2,8 @@
 
 <h3>Who is required to hand over the encryption keys to authorities?</h3>
 
-<p>Mandatory <a href="https://en.wikipedia.org/wiki/Key_disclosure_law">key disclosure laws</a> require individuals to turn over encryption keys to law enforcement conducting a criminal investigation. How these laws are implemented (who may be legally compelled to assist) vary from nation to nation, but a warrant is generally required. Defenses against key disclosure laws include steganography and encrypting data in a way that provides plausible deniability.</p>  <p><a href="https://en.wikipedia.org/wiki/Steganography">Steganography</a> involves hiding sensitive information (which may be encrypted) inside of ordinary data (for example, encrypting an image file and then hiding it in an audio file). With plausible deniability, data is encrypted in a way that prevents an adversary from being able to prove that the information they are after exists (for example, one password may decrypt benign data and another password, used on the same file, could decrypt sensitive data).</p>
+<p>Mandatory <a href="https://en.wikipedia.org/wiki/Key_disclosure_law">key disclosure laws</a> require individuals to turn over encryption keys to law enforcement conducting a criminal investigation. How these laws are implemented (who may be legally compelled to assist) vary from nation to nation, but a warrant is generally required. Defenses against key disclosure laws include steganography and encrypting data in a way that provides plausible deniability.</p>
+<p><a href="https://en.wikipedia.org/wiki/Steganography">Steganography</a> involves hiding sensitive information (which may be encrypted) inside of ordinary data (for example, encrypting an image file and then hiding it in an audio file). With plausible deniability, data is encrypted in a way that prevents an adversary from being able to prove that the information they are after exists (for example, one password may decrypt benign data and another password, used on the same file, could decrypt sensitive data).</p>
 
 <div class="row mb-2">
 

_includes/sections/live-operating-systems.html

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

_includes/sections/mobile-operating-systems.html

@@ -4,40 +4,38 @@
 	<strong>Even though the source code of the following OS is provided, installing Google Apps may compromise your setup.</strong>
 </div>
 
-{% include cardv2.html
-title="GrapheneOS"
-image="/assets/img/tools/GrapheneOS.png"
-description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security and privacy focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
-badges="info:AOSP"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="https://grapheneos.org/"
-github="https://github.com/GrapheneOS/"
-%}
+<div class="row mb-2">
 
-{% include cardv2.html
+	{% include card.html color="success"
 	title="LineageOS"
-image="/assets/img/tools/LineageOS.png"
-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="warning:contrib:This software may depend on or recommend non-free software."
-website="https://www.lineageos.org/"
-github="https://github.com/LineageOS"
+	image="/assets/img/tools/LineageOS.png"
+	url="https://www.lineageos.org/"
+	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."
 	%}
 
-{% include cardv2.html
+	{% include card.html color="primary"
 	title="Ubuntu Touch"
-image="/assets/img/tools/Ubuntu-Touch.png"
-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="warning:contrib:This software may depend on or recommend non-free software."
-website="https://ubuntu-touch.io/"
-github="https://github.com/ubports"
+	image="/assets/img/tools/Ubuntu-Touch.png"
+	url="https://ubuntu-touch.io/"
+	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>"
 	%}
 
+	{% include card.html color="warning"
+	title="GrapheneOS"
+	labels="warning:contrib:This software may depend on or recommend non-free software."
+	image="/assets/img/tools/GrapheneOS.png"
+	url="https://grapheneos.org/"
+	description="GrapheneOS is a free and open-source security and privacy focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security."
+	%}
+
+</div>
+
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.replicant.us/">Replicant</a> <span class="badge badge-info">AOSP</span> - An open-source operating system based on Android, aiming to replace all proprietary components with free software.</li>
-  <li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
-  <li><a href="https://microg.org/">MicroG</a> <span class="badge badge-info">Add-on Package</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at <a href="https://lineage.microg.org/">Lineage for microG</a>.</li>
+	<li><a href="https://www.replicant.us/">Replicant</a> - An open-source operating system based on Android, aiming to replace all proprietary components with free software.</li>
+	<li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
+	<li><a href="https://microg.org/">MicroG</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement.
 </ul>

_includes/sections/notebooks.html

@@ -4,44 +4,34 @@
 	<strong>If you are currently using an application like Evernote, Google Keep or Microsoft OneNote you should pick an alternative here.</strong>
 </div>
 
-{% include cardv2.html
+<div class="row mb-2">
+
+	{% include card.html color="success"
 	title="Joplin"
 	image="/assets/img/tools/Joplin.png"
+	url="https://joplinapp.org/"
+	footer="OS: Windows, macOS, Linux, iOS, Android, Firefox/Chrome (Web Clipper)."
 	description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
-website="https://joplinapp.org/"
-github="https://github.com/laurent22/joplin"
-mac=""
-linux=""
-ios=""
-android=""
-firefox=""
-chrome=""
 	%}
 
-{% include cardv2.html
+	{% include card.html color="primary"
 	title="Standard Notes"
 	image="/assets/img/tools/StandardNotes.png"
+	url="https://standardnotes.org/"
+	footer="OS: Windows, macOS, Linux, iOS, Android, Web."
 	description="Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors."
-website="https://standardnotes.org/"
-github="https://github.com/standardnotes"
-mac=""
-linux=""
-ios=""
-android=""
-web=""
 	%}
 
-{% include cardv2.html
+	{% include card.html color="warning"
 	title="Turtl"
 	image="/assets/img/tools/Turtl.png"
+	url="https://turtlapp.com/"
+	footer="OS: Windows, macOS, Linux, Android."
 	description="Turtl lets you take notes, bookmark websites, and store documents for sensitive projects. From sharing passwords with your coworkers to tracking research on an article you're writing, Turtl keeps it all safe from everyone but you and those you share with."
-website="https://turtlapp.com/"
-github="https://github.com/turtl"
-mac=""
-linux=""
-android=""
 	%}
 
+</div>
+
 <h3>Warning</h3>
 
 <ul>

_includes/sections/operating-systems.html

@@ -1,40 +1,37 @@
 <h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> PC Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a operating system like Windows 10, you should pick an alternative here.</strong>
+	<strong>If you are currently using a operating system like Microsoft Windows or Apple macOS, you should pick an alternative here.</strong>
 </div>
 
-{% include cardv2.html
+<div class="row mb-2">
+
+	{% include card.html color="success"
 	title="Qubes OS"
+	labels="warning:contrib:This software may depend on or recommend non-free software."
 	image="/assets/img/tools/Qubes-OS.png"
-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="warning:contrib:This software may depend on or recommend non-free software."
-website="https://www.qubes-os.org/"
-github="https://github.com/QubesOS"
-tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
+	url="https://www.qubes-os.org/"
+	tor="http://qubesos4rrrrz6n4.onion"
+	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."
 	%}
 
-{% include cardv2.html
-title="Fedora Workstation"
-image="/assets/img/tools/Fedora.png"
-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="warning:contrib:This software may depend on or recommend non-free software."
-website="https://getfedora.org/"
-git="https://src.fedoraproject.org/"
-%}
-
-{% include cardv2.html
+	{% include card.html color="primary"
 	title="Debian"
 	image="/assets/img/tools/Debian.png"
-description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.'
-badges="info:GNU/Linux"
-website="https://www.debian.org/"
-git="https://salsa.debian.org/qa/debsources"
+	url="https://www.debian.org/"
 	tor="http://sejnfjrq6szgca7v.onion"
+	description="Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project."
 	%}
 
+	{% include card.html color="warning"
+	title="Trisquel"
+	image="/assets/img/tools/Trisquel.png"
+	url="https://trisquel.info/"
+	description="Trisquel is a Linux-based operating system derived from Ubuntu. The project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed."
+	%}
+
+</div>
+
 <h3>Warning</h3>
 
 <ul>
@@ -44,10 +41,9 @@ tor="http://sejnfjrq6szgca7v.onion"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
-  <li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
+	<li><a href="https://www.openbsd.org/">OpenBSD</a> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
+	<li><a href="https://www.archlinux.org/">Arch Linux</a> - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
 		completely open source version of Arch Linux.</li>
-  <li><a href="https://trisquel.info/">Trisquel</a> <span class="badge badge-info">GNU/Linux</span> - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.</li>
-  <li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
+	<li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A Debian GNU/Linux based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
 		and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
 </ul>

_includes/sections/password-managers.html

@@ -23,6 +23,7 @@
 	description='KeePass is a free open source password manager, which helps you to manage your passwords in a secure way. All passwords in one database, which is locked with one
 	master key or a key file. The databases are encrypted using the best and most secure encryption algorithms currently known: AES and Twofish. See also: <a href="https://keepassxc.org/">KeePassXC</a> with official native cross-platform support for Windows/macOS/Linux.'
 	%}
+
 	{% include card.html color="warning"
 	title="LessPass - Browser"
 	image="/assets/img/tools/LessPass.png"

_includes/sections/paste-services.html

@@ -8,13 +8,3 @@ website="https://bin.privacytools.io/"
 forum="https://forum.privacytools.io/t/discussion-privatebin/296"
 github="https://github.com/PrivateBin/PrivateBin"
 %}
-
-
-{% include cardv2.html
-title="CryptPad"
-image="/assets/img/provider/CryptPad.png"
-description="CryptPad is an open source, zero knowledge, realtime collaborative editor. Data is encrypted/decrypted in the browser using 256bit AES."
-website="https://cryptpad.fr/pad/"
-forum="https://forum.privacytools.io/t/discussion-cryptpad/1270"
-github="https://github.com/xwiki-labs/cryptpad"
-%}

_includes/sections/router-firmware.html

@@ -1,38 +1,35 @@
 <h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> Open Source Router Firmware</h1>
 
-{% include cardv2.html
+<div class="row mb-2">
+
+	{% include card.html color="success"
 	title="OpenWrt"
+	labels="warning:contrib:This software may depend on or recommend non-free software."
 	image="/assets/img/tools/OpenWrt.png"
+	url="https://openwrt.org/"
 	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="warning:contrib:This software may depend on or recommend non-free software."
-website="https://openwrt.org/"
-git="https://git.openwrt.org/"
-github="https://github.com/openwrt"
 	%}
 
-{% include cardv2.html
+	{% include card.html color="primary"
 	title="pfSense"
-image="/assets/img/tools/pfSense.png"
-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="warning:contrib:This software may depend on or recommend non-free software."
-website="https://www.pfsense.org/"
-github="https://github.com/pfsense/"
+	image="/assets/img/tools/pfSense.png"
+	url="https://www.pfsense.org/"
+	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."
 	%}
 
-{% include cardv2.html
+	{% include card.html color="warning"
 	title="LibreCMC"
 	image="/assets/img/tools/LibreCMC.png"
-description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)."
-badges="info:GNU/Linux"
-website="https://librecmc.org"
-git="https://gogs.librecmc.org/libreCMC/libreCMC"
+	url="https://librecmc.org"
+	description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF).."
 	%}
 
+</div>
+
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
-  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
+	<li><a href="https://www.openbsd.org/">OpenBSD</a> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
+	<li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
 </ul>

_includes/sections/self-contained-networks.html

@@ -7,11 +7,11 @@
 <div class="row mb-2">
 
 	{% include card.html color="success"
-  title="Tor"
+  title="Tor Browser"
   image="/assets/img/tools/Tor-Project.png"
   url="https://www.torproject.org/"
   tor="http://expyuzz4wqqyqhjn.onion"
-  footer='OS: Windows, macOS, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, Android (<a href="https://www.torproject.org/download/#android">Tor Browser</a>, <a href="https://guardianproject.info/apps/orbot/">Proxy other apps with Orbot</a>), <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a>'
+  footer='OS: Windows, macOS, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, <a href="https://www.torproject.org/docs/android.html.en">Android</a>, <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a>'
   description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool."
   %}
 

_includes/sections/social-networks.html

@@ -34,6 +34,7 @@ description="Friendica has an emphasis on extensive privacy settings and easy se
 website="https://friendi.ca/"
 forum="https://forum.privacytools.io/t/discussion-friendica/291"
 github="https://github.com/friendica/friendica"
+windows=""
 linux=""
 android=""
 web=""
@@ -59,6 +60,7 @@ github="https://github.com/foocorp/gnu-social"
 android=""
 ios=""
 linux=""
+windows=""
 web=""
 %}
 

_includes/sections/social-news-aggregator.html

@@ -1,54 +0,0 @@
-<h1 id="obb" class="anchor"><a href="#social-news-aggregator"><i class="fas fa-link anchor-icon"></i></a> Social News Aggregators</h1>
-
-<div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a online bulletin board like Reddit, you should pick an alternative here.</strong>
-</div>
-
-{% include cardv2.html
-title="Aether"
-image="/assets/img/tools/aether.png"
-description='<a href="https://github.com/nehbit/aether/blob/master/LICENSE.md">Free/libre and open source</a> decentralized social news aggregator with a built in voting system.'
-website="https://github.com/nehbit/aether"
-forum="https://forum.privacytools.io/t/discussion-aether/1256"
-github="https://github.com/nehbit/aether"
-mac=""
-linux=""
-android=""
-ios=""
-bsd=""
-%}
-
-{% include cardv2.html
-title="Tildes"
-image="/assets/img/tools/tildes.png"
-description='Tildes is a web-based self-hostable online bulletin board. It is licensed under <a href="https://gitlab.com/tildes/tildes/blob/master/LICENSE">GPL 3.0</a>.'
-website="https://tildes.net"
-forum="https://forum.privacytools.io/t/discussion-tildes/1257"
-git="https://gitlab.com/tildes/"
-mac=""
-linux=""
-android=""
-ios=""
-bsd=""
-%}
-
-{% include cardv2.html
-title="Raddle"
-image="/assets/img/tools/raddle.png"
-description="Raddle is a public Postmill instance focused on privacy and anti-censorship."
-website="https://raddle.me"
-forum="https://forum.privacytools.io/t/discussion-raddle/1258"
-git="https://gitlab.com/postmill/"
-mac=""
-linux=""
-android=""
-ios=""
-%}
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://beta.akasha.world/">Akasha</a> - A decentralized online bulletin board using <a href="https://www.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a> and <a href="https://www.wikipedia.org/wiki/Ethereum">Ethereum</a>.</li>
-  <li><a href="https://dev.lemmy.ml/">Lemmy</a> - An <a href="https://github.com/dessalines/lemmy/blob/master/LICENSE">AGPL</a> licensed self-hostable link aggregator intended to work in the <a href="https://www.wikipedia.org/wiki/Fediverse">Fediverse</a>.</li>
-  <li><a href="https://notabug.io/">notabug.io</a> - notabug.io is a <a href="https://github.com/notabugio/notabug/blob/master/LICENSE.md">free and open source</a> p2p link aggregator with a strong resemblance to old.reddit.com (not to be confused with <a href="https://notabug.org/">NotABug.org</a>).</li>
-</ul>

_includes/sections/teamchat.html

@@ -1,41 +0,0 @@
-<h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Team Chat Platforms</h1>
-
-<div class="alert alert-warning" role="alert">
-        <strong>If your project or organization currently uses a platform like <a href="https://web.archive.org/web/20171029114027/https://feedback.discordapp.com/forums/326712-discord-dream-land/suggestions/17094256-implement-whispersystems-encryption-for-voice-and">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
-</div>
-
-{% include cardv2.html
-title="Rocket.chat"
-image="/assets/img/tools/rocket.chat.png"
-description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
-labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental</a>:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. The federation was also added afterwards potentially causing room for mistakes."
-website="https://rocket.chat/"
-forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
-github="https://github.com/rocketchat/"
-android=""
-ios=""
-mac=""
-linux=""
-%}
-
-{% include cardv2.html
-title="Keybase"
-image="/assets/img/tools/keybase.png"
-description='Keybase provides a hosted team chat with end-to-end encryption. It has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>.'
-labels="warning:<a href=//github.com/keybase/client/issues/6374>Experimental</a>:The server side of Keybase runs on proprietary code and is centralized."
-website="https://keybase.io/"
-forum="https://forum.privacytools.io/t/discussion-keybase/1224"
-github="https://github.com/Keybase"
-android=""
-ios=""
-mac=""
-linux=""
-web=""
-%}
-
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">Wire Pro</a> - Paid team communication with E2EE. <span class="badge badge-warning" data-toggle="tooltip" title="While the free edition of Wire is a recommended platform, we have not tested the Pro edition.">Untested <i class="far fa-question-circle"></i></span></li>
-</ul>

_includes/sections/voice-video-messenger.html

@@ -1,9 +1,41 @@
-<h1 id="voip" class="anchor"><a href="#voip"><i class="fas fa-link anchor-icon"></i></a> Video/Voice Calling</h1>
+<h1 id="voip" class="anchor"><a href="#voip"><i class="fas fa-link anchor-icon"></i></a> Encrypted Video & Voice Messenger</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a Video/Voice Calling app like Skype, Viber or Google Hangouts, you should pick an alternative here.</strong> Please note that many of the above instant messengers also support <span class="badge badge-success">VoIP</span>. The software listed below are <em>primarily</em> Voice/Video focused.
+	<strong>If you are currently using a Video & Voice Messenger like Skype, Viber or Google Hangouts, you should pick an alternative here.</strong>
 </div>
 
+{% include cardv2.html
+title="Mobile: Signal"
+image="/assets/img/tools/Signal.png"
+website="https://signal.org"
+description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
+All communications are end-to-end encrypted. Signal is free and open source."
+forum="https://forum.privacytools.io/t/discussion-signal/664"
+github="https://github.com/signalapp"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+footer="OS: Android, iOS, macOS, Windows, Linux"
+%}
+
+{% include cardv2.html
+title="Wire"
+image="/assets/img/tools/wire.png"
+website="https://wire.com/download/"
+description="Wire is an app developed by Wire Swiss GmbH.
+The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source. <span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The company keeps a list of all the users you contact until you delete your account.\">Caution <i class=\"far fa-question-circle\"></i></span>"
+forum="https://forum.privacytools.io/t/discussion-wire/750"
+github="https://github.com/wireapp"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+web=""
+%}
+
 {% include cardv2.html
 title="Linphone"
 image="/assets/img/tools/Linphone.png"
@@ -13,34 +45,26 @@ forum="https://forum.privacytools.io/t/discussion-linphone/751"
 github="https://github.com/BelledonneCommunications"
 ios=""
 android=""
+windows=""
 linux=""
 mac=""
 web=""
 %}
 
-{% include cardv2.html
-title="Mumble"
-image="/assets/img/tools/Mumble.png"
-website="https://mumble.info/"
-description="Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, <a href=\"https://github.com/mumble-voip/mumble/issues/1813\">it's missing end-to-end encryption</a>, so self-hosting is recommended."
-forum="https://forum.privacytools.io/t/discussion-mumble/1289"
-github="https://github.com/mumble-voip/"
-linux=""
-mac=""
-%}
+
+
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://jitsi.org/">Jitsi Meet</a> - Jitsi Meet is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application. <span class="badge badge-warning" data-toggle="tooltip" title="Our Firefox tweaks recommend disabling WebRTC as it can be used to leak your IP address even behind a VPN, which is why Tor Browser disables it.">Requires WebRTC</span></li>
+	<li><a href="https://jitsi.org/">Jitsi</a> - Jitsi is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application.</li>
+	<li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. </li>
+	<li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you a full control over your communications and an unmatched level of privacy.</li>
 </ul>
 
 <h3>Related Information</h3>
 
 <ul>
-  <li>More information about Mumble:</li>
-  <ul>
-  <li><a href="https://wiki.mumble.info/wiki/Running_Murmur">Running Mumble Server</a> and <a href="https://wiki.mumble.info/wiki/Murmur.ini">its config file</a>, particularly <a href="https://wiki.mumble.info/wiki/Murmur.ini#obfuscate">obfuscating IPv4 addresses</a> and <a href="https://wiki.mumble.info/wiki/Murmur.ini#Process_Administrivia">logging</a></li>
-  <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/TorifyHOWTO/Mumble">Torifying Mumble</a>
-  </ul>
+	<li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
+	<li><a href="https://www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text">Secure Messaging App Wire Stores Everyone You've Ever Contacted in Plain Text | Motherboard</a></li>
 </ul>

_includes/sections/vpn.html

@@ -20,6 +20,112 @@
 			</tr>
 		</thead>
 		<tbody>
+			<tr>
+				<td data-value="AirVPN">
+					<a href="https://airvpn.org/"><img alt="AirVPN" src="/assets/img/provider/AirVPN.png" width="200" height="70"></a></td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://airvpn.org/" href="https://airvpn.org/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2010">2010</td>
+				<td data-value="{{ 54 | times: eur_to_usd }}">54 €</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>162</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-it"></span> Italy</td>
+			</tr>
+
+			<tr>
+				<td data-value="AzireVPN">
+					<a href="https://www.azirevpn.com/"><img alt="AzireVPN" src="/assets/img/provider/AzireVPN.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.azirevpn.com/" href="https://www.azirevpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2012">2012</td>
+				<td data-value="{{ 45 | times: eur_to_usd }}">45 €</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>22</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+			</tr>
+
+			<tr>
+				<td data-value="blackVPN">
+					<a href="https://www.blackvpn.com/"><img alt="blackVPN" src="/assets/img/provider/blackVPN.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.blackvpn.com/" href="https://www.blackvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2009">2009</td>
+				<td data-value="{{ 49 | times: eur_to_usd }}">49 €</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>31</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
+			</tr>
+
+			<tr>
+				<td data-value="cryptostorm">
+					<a href="https://cryptostorm.is/"><img alt="Cryptostorm" src="/assets/img/provider/Cryptostorm.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://cryptostorm.is/" href="https://cryptostorm.is/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://stormwayszuh4juycoy4kwoww5gvcu2c4tdtpkup667pdwe4qenzwayd.onion. Requires specific software to access: torproject.org" href="http://stormwayszuh4juycoy4kwoww5gvcu2c4tdtpkup667pdwe4qenzwayd.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
+				</td>
+				<td data-value="2006">2006</td>
+				<td data-value="52">$ 52</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>28</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td><span class="flag-icon flag-icon-is"></span> Iceland</td>
+			</tr>
+
+			<tr>
+				<td data-value="ExpressVPN">
+					<a href="https://www.expressvpn.com/"><img alt="ExpressVPN" src="/assets/img/provider/ExpressVPN.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.expressvpn.com/" href="https://www.expressvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://expressobutiolem.onion. Requires specific software to access: torproject.org" href="http://expressobutiolem.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
+				</td>
+				<td data-value="2009">2009</td>
+				<td data-value="100">$ 99.95</td> <!-- USD on December 28, 2018 -->
+				<td><span class="label label-success">Yes</span></td>
+				<td>148</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-vg"></span> British Virgin Islands</td>
+			</tr>
+
+			<tr>
+				<td data-value="FrootVPN">
+					<a href="https://www.frootvpn.com/"><img alt="FrootVPN" src="/assets/img/provider/FrootVPN.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.frootvpn.com/" href="https://www.frootvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2014">2014</td>
+				<td data-value="36">$ 35.88</td>
+				<td><span class="label label-warning">No</span></td>
+				<td>27</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+			</tr>
+
+			<tr>
+				<td data-value="hide.me">
+					<a href="https://hide.me/"><img alt="hide.me" src="/assets/img/provider/hide.me.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://hide.me/" href="https://hide.me/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2012">2012</td>
+				<td data-value="0"><a data-toggle="tooltip" data-placement="bottom" data-original-title="2 GB data transfer, 1 simultaneous connection" href="https://hide.me/pricing">Free</a></td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>160+</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-my"></span> Malaysia</td>
+			</tr>
+
 			<tr>
 				<td data-value="IVPN">
 					<a href="https://www.ivpn.net/"><img alt="IVPN" src="/assets/img/provider/IVPN.png" width="200" height="70"></a>
@@ -66,6 +172,36 @@
 				<td><span class="flag-icon flag-icon-pa"></span> Panama</td>
 			</tr>
 
+			<tr>
+				<td data-value="OVPN">
+					<a href="https://www.ovpn.com/"><img alt="OVPN" src="/assets/img/provider/ovpn.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ovpn.com/" href="https://www.ovpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2014">2014</td>
+				<td data-value="{{ 84 | times: eur_to_usd }}">84 €</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>67</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+			</tr>
+
+			<tr>
+				<td data-value="Perfect Privacy">
+					<a href="https://www.perfect-privacy.com/"><img alt="Perfect Privacy" src="/assets/img/provider/Perfect-Privacy.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.perfect-privacy.com/" href="https://www.perfect-privacy.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2008">2008</td>
+				<td data-value="{{ 119.99 | times: eur_to_usd }}">119.99 €</td>
+				<td><span class="label label-warning">No</span></td>
+				<td>54</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+			</tr>
+
 			<tr>
 				<td data-value="ProtonVPN">
 					<a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a>
@@ -80,6 +216,79 @@
 				<td><span class="label label-warning">No</span></td>
 				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
 			</tr>
+
+			<tr>
+				<td data-value="Proxy.sh">
+					<a href="https://proxy.sh/"><img alt="Proxy.sh" src="/assets/img/provider/Proxy.sh.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://proxy.sh/" href="https://proxy.sh/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2012">2012</td>
+				<td data-value="40">$ 40</td>
+				<td><span class="label label-warning">No</span></td>
+				<td>300+</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
+			</tr>
+
+			<tr>
+				<td data-value="Trust.Zone">
+					<a href="https://trust.zone/"><img alt="Trust.Zone" src="/assets/img/provider/Trust.Zone.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://trust.zone/" href="https://trust.zone/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2014">2014</td>
+				<td data-value="40">$ 39.95</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>164</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
+			</tr>
+			<tr>
+				<td data-value="VPN.ht">
+					<a href="https://vpn.ht/"><img alt="VPN.ht" src="/assets/img/provider/VPN.ht.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpn.ht/" href="https://vpn.ht/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2014">2014</td>
+				<td data-value="40">$ 39.99</td>
+				<td><span class="label label-warning">No</span></td>
+				<td>128</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
+			</tr>
+			<tr>
+				<td data-value="VPNArea">
+					<a href="https://vpnarea.com/"><img alt="VPNArea" src="/assets/img/provider/vpnarea.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpnarea.com/" href="https://vpnarea.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2014">2014</td>
+				<td data-value="59">$ 59</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>204</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-bg"></span> Bulgaria</td>
+			</tr>
+			<tr>
+				<td data-value="VPNTunnel">
+					<a href="https://vpntunnel.com/"><img alt="VPNTunnel" src="/assets/img/provider/VPNTunnel.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpntunnel.com/" href="https://vpntunnel.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2014">2014</td>
+				<td data-value="{{ 35.88 | times: eur_to_usd }}">35.88 €</td>
+				<td><span class="label label-warning">No</span></td>
+				<td>800+</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
+			</tr>
+
 		</tbody>
 	</table>
 </div>
@@ -104,8 +313,8 @@
 
 			<h3>More VPN Providers</h3>
 			<ul>
+				<li><a href="https://www.reddit.com/r/privacytoolsIO/comments/43d4zs/you_guys_might_be_interested_in_this_a/">Guide to Choosing the Best VPN</a></li>
 				<li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
-        <li><a href="https://thewirecutter.com/reviews/best-vpn-service/">In-depth research on 53 popular VPN providers.</a></li>
 			</ul>
 		</div>
 

_layouts/minimal.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 {% include head.html %}
+
 <body data-spy="scroll" data-target="#navbar">
 	<header>
 		{% include nav.html %}
@@ -9,4 +10,5 @@
 	{{ content }}
 	{% include scripts.html %}
 </body>
+
 </html>

bin/build.sh

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

bin/get-html-ls.js

@@ -0,0 +1,13 @@
+const glob = require('glob');
+const pattern = '**/*.html';
+const options = {
+	'ignore': [
+		'_site/**/*.html',
+		'node_modules/**/*.html'
+	]
+};
+
+glob(pattern, options, (error, files) => {
+	if (error) throw error;
+	process.stdout.write(files.join('\n') + '\n');
+});

bin/html-beautify-check.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Runs html-beautify's format check and errors with 0/1 if it needs to be changed.
+APPDIR=$(readlink -f $(dirname $(dirname $0)))
+TMPDIR=$(mktemp -d)
+cd $APPDIR
+
+for line in $*; do
+  filepath=$(readlink -f $line)
+  file=${filepath/$APPDIR\//}
+  mkdir -p $TMPDIR/$(dirname $file)
+  cp $APPDIR/$file $TMPDIR/$file
+done
+
+message=$(find $TMPDIR -type f | xargs node_modules/.bin/html-beautify -r | grep -v unchanged || true)
+if [[ $message ]]; then
+  echo "$message" | sed "s#$TMPDIR##g" | sed "s#\.\.\/##g"
+  rm -rf $TMPDIR
+  exit 1
+fi
+
+rm -rf $TMPDIR

donate.html

@@ -88,21 +88,7 @@ permalink: /donate/
 		<div class="col-md-12 col-lg-8 offset-lg-2 text-right">
 
 			<div class="form-group row">
-        <label for="BNB" class="col-sm-4 col-form-label"><strong>Binance Coin (BNB)</strong></label>
-        <div class="col-sm-8">
-          <input id="BNB" type="text" value="bnb17zlv4xnkjsujks80cclx46uhm9h8txms82htwj" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="EOS" class="col-sm-4 col-form-label"><strong>EOS</strong></label>
-        <div class="col-sm-8">
-          <input id="EOS" type="text" value="privacytools" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="BAT" class="col-sm-4 col-form-label"><strong>Brave (BAT)</strong></label>
+				<label for="BAT" class="col-sm-4 col-form-label"><strong>Brave BAT</strong></label>
 				<div class="col-sm-8">
 					<input id="BAT" type="text" value="0x13DA8c6176a9bd171B8285067Ae38420B39eC11E" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
 				</div>

nginx/000-includes.conf

@@ -1,2 +0,0 @@
-include /var/www/privacytools.io/nginx/010-headers.conf;
-include /var/www/privacytools.io/nginx/020-redirects.conf;

nginx/010-headers.conf

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

nginx/020-redirects.conf

@@ -1,12 +0,0 @@
-location = /old/ {
-	return 301 /classic/;
-}
-location = /software/im/ {
-	return 301 /software/real-time-communication/;
-}
-location = /software/voip/ {
-	return 301 /software/real-time-communication/;
-}
-location = /software/teamchat/ {
-	return 301 /software/real-time-communication/;
-}

package.json

@@ -0,0 +1,28 @@
+{
+  "name": "privacytools.io",
+  "version": "1.0.0",
+  "devDependencies": {
+    "glob": "^7.1.4",
+    "husky": "^3.0.2",
+    "js-beautify": "^1.10.1",
+    "lint-staged": "^9.2.1"
+  },
+  "scripts": {
+    "build": "bundle exec jekyll build",
+    "serve": "bundle exec jekyll serve",
+    "format:html": "node bin/get-html-ls.js | xargs node_modules/.bin/html-beautify -r",
+    "format-test:html": "node bin/get-html-ls.js | xargs bash ./bin/html-beautify-check.sh"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "node_modules/.bin/lint-staged"
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/privacytoolsIO/privacytools.io.git"
+  },
+  "bugs": {
+    "url": "https://github.com/privacytoolsIO/privacytools.io/issues"
+  }
+}

pages/old.html

@@ -41,8 +41,6 @@ permalink: /classic/
 
 {% include sections/voice-video-messenger.html %}
 
-{% include sections/teamchat.html %}
-
 {% include sections/file-sharing.html %}
 
 {% include sections/cloud-storage.html %}
@@ -63,8 +61,6 @@ permalink: /classic/
 
 {% include sections/social-networks.html %}
 
-{% include sections/social-news-aggregator.html %}
-
 {% include sections/dns.html %}
 
 {% include sections/notebooks.html %}

pages/providers/social-news-aggregator.html

@@ -1,8 +0,0 @@
----
-layout: page
-permalink: /providers/social-news-aggregator/
-title: "Social News Aggregator"
-description: "Stay up-to-date with privacy-respecting online bulletin boards."
----
-
-{% include sections/social-news-aggregator.html %}

pages/providers/vpn.html

@@ -58,6 +58,7 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your
 					<li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">Slicing Onions: Part 1 – Myth-busting Tor</a> by blacklight447</li>
 					<li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-2-onion-recipes-vpn-not-required">Slicing Onions: Part 2 – Onion recipes; VPN not required</a> by blacklight447</li>
 				</ol>
-      <p>
+			</p>
+		</div>
 	</div>
 </div>

pages/software/im.html

@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/im/
+title: "Instant Messaging"
+description: "Discover secure and private ways to message others online without letting any third parties read your messages."
+---
+
+{% include sections/instant-messenger.html %}

pages/software/real-time-communication.html

@@ -1,16 +0,0 @@
----
-layout: page
-permalink: /software/real-time-communication/
-title: "Real-Time Communication"
-description: "Discover secure and private ways to communicate with others online without letting any third parties read your messages."
----
-
-{% include sections/instant-messenger.html %}
-
-<hr/>
-
-{% include sections/voice-video-messenger.html %}
-
-<hr/>
-
-{% include sections/teamchat.html %}

pages/software/video-voice.html

@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/voip/
+title: "VoIP"
+description: "Find a voice and video messenger that supports completely End-to-End encrypted calls."
+---
+
+{% include sections/voice-video-messenger.html %}

privacy-policy.html

@@ -37,10 +37,7 @@ description: "This Privacy Policy explains what information privacytoolsIO and i
 <p>privacytoolsIO uses a self-hosted Matomo install to track visitor data. You can opt out entirely using the form below. This form may not function correctly with
 	an ad blocker enabled.</p>
 
-  <iframe
-        style="border: 1; height: 120px; width: 100%;"
-        src="https://stats.privacytools.io/index.php?module=CoreAdminHome&action=optOut&language=en&backgroundColor=&fontColor=212529&fontSize=1rem&fontFamily=-apple-system%2CBlinkMacSystemFont%2C%22Segoe%20UI%22%2CRoboto%2C%22Helvetica%20Neue%22%2CArial%2Csans-serif%2C%22Apple%20Color%20Emoji%22%2C%22Segoe%20UI%20Emoji%22%2C%22Segoe%20UI%20Symbol%22%2C%22Noto%20Color%20Emoji%22"
-        ></iframe>
+<iframe style="border: 1; height: 120px; width: 100%;" src="https://stats.privacytools.io/index.php?module=CoreAdminHome&action=optOut&language=en&backgroundColor=&fontColor=212529&fontSize=1rem&fontFamily=-apple-system%2CBlinkMacSystemFont%2C%22Segoe%20UI%22%2CRoboto%2C%22Helvetica%20Neue%22%2CArial%2Csans-serif%2C%22Apple%20Color%20Emoji%22%2C%22Segoe%20UI%20Emoji%22%2C%22Segoe%20UI%20Symbol%22%2C%22Noto%20Color%20Emoji%22"></iframe>
 
 <p>privacytoolsIO respects your Do Not Track setting in your browser. Users with Do Not Track enabled will not be tracked by any of our platforms.
 	You are also free to block stats.privacytools.io using whatever method you prefer with no detrimental effects on your experience using our services.</p>

source_code.md

@@ -134,24 +134,22 @@ Backend: closed-source
 
  Status.im: https://github.com/status-im
 
- Tox: https://github.com/TokTok/c-toxcore
+ Ricochet: https://github.com/ricochet-im/ricochet
 
- Ring/Jami: https://git.jami.net/savoirfairelinux
+## Encrypted Video & Voice Messenger
+ Signal: https://github.com/signalapp
 
-## Team chat
+ Wire: https://github.com/wireapp
 
- Rocket.chat: https://github.com/rocketchat/
- 
- Keybase: https://github.com/Keybase
-
-## Video & Voice Messenger
  Linphone: https://github.com/BelledonneCommunications/
 
- Mumble: https://github.com/mumble-voip/
-
    Worth Mentioning
 
- Jitsi Meet: https://github.com/jitsi/jitsi-meet
+ Jitsi: https://github.com/jitsi/jitsi-meet
+
+ Tox: https://github.com/TokTok/c-toxcore
+
+ Ring/Jami: https://gerrit-ring.savoirfairelinux.com/#/q/status:open
 
  ## File Sharing
   OnionShare: https://github.com/micahflee/onionshare
@@ -213,22 +211,23 @@ Backend: closed-source
     Flock: https://github.com/signalapp/Flock
 
 ## File Encryption Software
-
  VeraCrypt: https://www.veracrypt.fr/en/Source%20Code.html
 
  GNU Privacy Guard: https://github.com/gpg/gnupg
 
  PeaZip: https://github.com/giorgiotani/PeaZip/
 
+ Cryptomator: https://github.com/cryptomator/cryptomator
 
   Worth Mentioning:
-- Cryptomator: https://github.com/cryptomator/cryptomator
 
-- DiskCryptor: https://github.com/smartinm/diskcryptor
+   miniLock: https://github.com/kaepora/miniLock
 
-- Linux Unified Key Setup (LUKS): https://gitlab.com/cryptsetup/cryptsetup/
+   AES Crypt: https://github.com/marcobellaccini/pyAesCrypt
 
-- Hat.sh: https://github.com/sh-dv/hat.sh
+   DiskCryptor: https://github.com/smartinm/diskcryptor
+
+   Linux Unified Key Setup (LUKS): https://gitlab.com/cryptsetup/cryptsetup/
 
 ## Self-contained Networks
  TorBrowser: https://gitweb.torproject.org/tor.git
@@ -258,57 +257,22 @@ Worth Mentioning:
 
    GNU Social: https://gnu.io/source/
 
-## Social News Aggregators
-
-Aether: https://github.com/nehbit/aether
-
-Tildes: https://gitlab.com/tildes
-
-Raddle: https://gitlab.com/postmill
-
-### Worth Mentioning
-
-- Akasha: https://github.com/AkashaProject
-
-- Lemmy: https://github.com/dessalines/lemmy
-
-- notabug.io: https://github.com/notabugio/notabug
-
 ## Domain Name System (DNS)
-
  Njalla: Non-free/Proprietary Software
 
  DNSCrypt: https://github.com/dnscrypt
-
 DNSCrypt-proxy: https://github.com/jedisct1/dnscrypt-proxy/
 
  OpenNic: https://github.com/opennic/ (mostly)
-
 Webpage: https://github.com/opennic/opennic-web
 
-### Worth Mentioning
+  Worth Mentioning
 
-- NoTrack: https://github.com/quidsup/notrack
+   NoTrack: https://github.com/quidsup/notrack
 
-- Namecoin: https://github.com/namecoin
+   Namecoin: https://github.com/namecoin
 
-- Pi-hole: https://github.com/pi-hole
-
-## Encrypted ICANN DNS Providers
-
-AdGuard DNS: https://github.com/AdguardTeam/AdGuardDNS/
-
-BlahDNS: https://github.com/ookangzheng/blahdns/
-
-CloudFlare DNS: https://github.com/cloudflare/dns
-
-PowerDNS: https://github.com/PowerDNS/pdns
-
-### Worth Mentioning and Additional Information
-
-- DNSCloak: https://github.com/s-s/dnscloak
-
-- Stubby: https://github.com/getdnsapi/stubby
+   Pi-hole: https://github.com/pi-hole
 
 ## Digital Notebook
  Joplin: https://github.com/laurent22/joplin
@@ -330,8 +294,6 @@ PowerDNS: https://github.com/PowerDNS/pdns
 
  Ghostbin: https://github.com/kilgarth/ghostbin
 
- CryptPad: https://github.com/xwiki-labs/cryptpad
-
   Worth Mentioning:
 
    Disroot: https://github.com/PrivateBin/PrivateBin via https://disroot.org/en/services/privatebin
@@ -423,9 +385,10 @@ Backend: Closed Source
      MicroG: https://github.com/microg
 
 ## Android Privacy Add-ons
-
    NetGuard: https://github.com/M66B/NetGuard/
 
+   XPrivacyLua: https://github.com/M66B/XPrivacyLua/
+
 ## Open Source Router Firmware
    OpenWRT: https://git.openwrt.org/?p=openwrt/openwrt.git;a=shortlog;h=refs/tags/v18.06.1