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

@@ -1,19 +1,11 @@
-<!-- PLEASE READ OUR CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
+<!-- PLEASE READ OUR [CONTRIBUTING GUIDELINES](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
 
 ## Description
 
 Resolves: #none <!-- 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 [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
-
-- [ ] I have [listed the source code](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md).
-
-- [ ] This project is [free/libre software](https://www.wikipedia.org/wiki/Free_software).
-
-- [ ] This project has an [associated discussion](https://github.com/privacytoolsIO/privacytools.io/issues).
-
-* Netlify preview for the mainly edited page: <!-- link or Non Applicable? Edit this in afterwards -->
-
-* 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
+    # Assume bundler is being used, therefore
+    # the `install` step will run `bundle install` by default.
+    script: ./bin/build.sh
 
-sudo: false # route your build to the container-based infrastructure for a faster build
+    sudo: false # route your build to the container-based infrastructure for a faster build
 
-cache: bundler # caching bundler gem packages will speed up 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 %}
@@ -71,4 +70,4 @@
 				</div>
 			</div>
 		</div>
-</div>
+	</div>

_includes/cardv2.html

@@ -1,255 +1,49 @@
 <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 | 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 | 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 %}
+			<img src="{{include.image}}" height="120" width="120" class="panel-pic" alt="{{include.title}}">
+			{{include.description}}
 		</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>
-        {% 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 %}
+		<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 %}
 
-          {% 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 %}
+		<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.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.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.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 %}
+			{% 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.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.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.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>
 <br>

_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/head.html

@@ -21,7 +21,7 @@
 	<meta property="og:type" content="website" />
 	<meta property="og:url" content="{{ page.permalink | prepend: site.url }}" />
 	<meta property="og:image" content="https://www.privacytools.io/assets/img/layout/ogimage.jpg" />
-  <meta property="og:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}"/>
+	<meta property="og:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}" />
 	<meta property="og:locale" content="en_GB" />
 	<meta property="og:site_name" content="privacytools.io" />
 

_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>
@@ -107,9 +104,6 @@
 				<li class="nav-item">
 					<a class="nav-link" href="/donate/">Donate <i class="fas fa-heart text-danger"></i></a>
 				</li>
-        <li class="nav-item">
-          <a class="nav-link" href="https://blog.privacytools.io">Blog</a>
-        </li>
 			</ul>
 		</div>
 	</div>

_includes/panel.html

@@ -11,4 +11,4 @@
 				{{include.body}}
 			</div>
 		</div>
-</div>
+	</div>

_includes/scripts.html

@@ -3,11 +3,11 @@
 <script src="/assets/js/bootstrap.min.js?v=4"></script>
 <script src="/assets/js/sortable.min.js?v=4"></script>
 <script>
-  $(function () {
+	$(function() {
 		$("[data-toggle='tooltip']").tooltip();
 	});
 
-  $('.navbar a').not(".dropdown-toggle").click(function (e) {
+	$('.navbar a').not(".dropdown-toggle").click(function(e) {
 		if ($(".navbar-toggler").is(":visible")) {
 			$('.navbar-collapse').collapse('toggle');
 		}
@@ -27,11 +27,17 @@
 	_paq.push(['trackPageView']);
 	_paq.push(['enableLinkTracking']);
 	(function() {
-    var u="https://stats.privacytools.io/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
+		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>
+<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-fingerprint.html

@@ -9,9 +9,9 @@
 <p>When you visit a web page, your browser voluntarily sends information about its configuration, such as available fonts, browser type, and add-ons. If this combination of information is unique, it may be possible to identify and track you without using cookies. EFF created a Tool called <a href="https://panopticlick.eff.org/">Panopticlick</a> to test your browser to see how unique it is.</p>
 
 <p>
-<a class="btn btn-warning" href="https://panopticlick.eff.org/">
+	<a class="btn btn-warning" href="https://panopticlick.eff.org/">
 		Test your Browser now
-</a>
+	</a>
 </p>
 
 <p>You need to find what <strong>most browsers</strong> are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a <a href="https://addons.mozilla.org/firefox/addon/uaswitcher/">spoofed user agent string</a> to match what the large userbase has. You need to have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even the TBB, will make your browser stick out from the masses.</p>

_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"
@@ -17,9 +17,9 @@ 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"
@@ -30,3 +30,17 @@ android=""
 ios=""
 bsd=""
 %}
+
+{% include cardv2.html
+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=""
+ios=""
+%}

_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/browser-webrtc.html

@@ -7,7 +7,7 @@
 <p>While software like NoScript prevents this, it's probably a good idea to block this protocol directly as well, just to be safe.</p>
 
 <p>
-<a class="btn btn-warning" target="_blank" rel="noopener noreferrer" href="https://ipleak.net">Test your Browser now</a>
+	<a class="btn btn-warning" target="_blank" rel="noopener noreferrer" href="https://ipleak.net">Test your Browser now</a>
 </p>
 
 <h3>How to disable WebRTC in Firefox?</h3>
@@ -35,7 +35,7 @@
 <p>Now you can be 100% sure WebRTC is disabled.</p>
 
 <p>
-<a class="btn btn-primary" target="_blank" rel="noopener noreferrer" href="https://ipleak.net">Test your Browser again</a>
+	<a class="btn btn-primary" target="_blank" rel="noopener noreferrer" href="https://ipleak.net">Test your Browser again</a>
 </p>
 
 <h3>How to fix the WebRTC Leak in Google Chrome?</h3>

_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/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><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>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>
+		<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>
-
-  <h3>Worth Mentioning and Additional Information</h3>
-
-  <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>
-  </ul>
-</div>

_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,10 +194,11 @@
 <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>
+	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>
 
 <h3>Related Information</h3>
 

_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</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</a></li>
+	<li><a href="https://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/header.html

@@ -4,10 +4,10 @@
 </div>
 
 <form method="POST" action="https://search.privacytools.io/" id="search_form" role="search">
-<div class="input-group col-12 col-md-8 offset-md-2">
-<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try search.privacytools.io, a Privacy-Respecting Search Engine" autocomplete="off" value="">
-<span class="input-group-btn">
-<button type="submit" class="btn btn-primary input-lg"><span class="hide_if_nojs"><i class="fas fa-search"></i> </span><span class="hidden active_if_nojs">start search</span></button>
-</span>
-</div>
+	<div class="input-group col-12 col-md-8 offset-md-2">
+		<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try search.privacytools.io, a Privacy-Respecting Search Engine" autocomplete="off" value="">
+		<span class="input-group-btn">
+			<button type="submit" class="btn btn-primary input-lg"><span class="hide_if_nojs"><i class="fas fa-search"></i> </span><span class="hidden active_if_nojs">start search</span></button>
+		</span>
+	</div>
 </form>

_includes/sections/instant-messenger.html

@@ -1,29 +1,28 @@
 <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 some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.|success:VoIP"
+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/"
@@ -52,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">
 
@@ -72,7 +73,7 @@
 <p>Services based in the United States are not recommended because of the country's surveillance programs, use of <a href="https://www.eff.org/issues/national-security-letters/faq">National Security Letters</a> (NSLs) and accompanying gag orders, which forbid the recipient from talking about the request. This combination allows the government to <a href="https://www.schneier.com/blog/archives/2013/08/more_on_the_nsa.html">secretly force</a> companies to grant complete access to customer data and transform the service into a tool of mass surveillance.</p>
 
 <p>An example of this is <a href="https://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order">Lavabit</a> – a secure email service created by Ladar Levison. The FBI <a href="https://www.vice.com/en_us/article/nzz888/lavabit-founder-ladar-levison-discusses-his-federal-battle-for-privacy">requested</a> Snowden's records after finding out that he used the service. Since Lavabit did not keep logs and email content was stored encrypted, the FBI served a subpoena (with a gag order) for the service's SSL keys. Having the SSL keys would allow them to access
-communications (both metadata and unencrypted content) in real time for all of Lavabit's customers, not just Snowden's.</p>
+	communications (both metadata and unencrypted content) in real time for all of Lavabit's customers, not just Snowden's.</p>
 
 <p>Ultimately, Levison turned over the SSL keys and <a href="https://www.theguardian.com/commentisfree/2014/may/20/why-did-lavabit-shut-down-snowden-email">shut down</a> the service at the same time. The US government then <a href="https://www.cnbc.com/id/100962389">threatened Levison with arrest</a>, saying that shutting down the service was a violation of the court order.</p>
 

_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
-title="Tails"
-image="/assets/img/tools/Tails.png"
-description='Tails is a live operating system, that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and helps to: Use the Internet anonymously and circumvent censorship; Internet connections go through the Tor network; leave no trace on the computer; use state-of-the-art cryptographic tools to encrypt files, emails and instant messaging.'
-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/"
-%}
+<div class="row mb-2">
 
-{% include cardv2.html
-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"
-%}
+	{% 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"
+	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
-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/"
-%}
+	{% include card.html color="primary"
+	title="KNOPPIX"
+	labels="warning:contrib:This software may depend on or recommend non-free software."
+	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 card.html color="warning"
+	title="Puppy Linux"
+	labels="warning:contrib:This software may depend on or recommend non-free software."
+	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
-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"
-%}
+	{% include card.html color="success"
+	title="LineageOS"
+	labels="warning:contrib:This software may depend on or recommend non-free software."
+	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
-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"
-%}
+	{% include card.html color="primary"
+	title="Ubuntu Touch"
+	labels="warning:contrib:This software may depend on or recommend non-free software."
+	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,46 +4,33 @@
 	<strong>If you are currently using an application like Evernote, Google Keep or Microsoft OneNote you should pick an alternative here.</strong>
 </div>
 
-{% include cardv2.html
-title="Joplin"
-image="/assets/img/tools/Joplin.png"
-description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
-website="https://joplinapp.org/"
-github="https://github.com/laurent22/joplin"
-windows=""
-mac=""
-linux=""
-ios=""
-android=""
-firefox=""
-chrome=""
-%}
+<div class="row mb-2">
 
-{% include cardv2.html
-title="Standard Notes"
-image="/assets/img/tools/StandardNotes.png"
-description="Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors."
-website="https://standardnotes.org/"
-github="https://github.com/standardnotes"
-windows=""
-mac=""
-linux=""
-ios=""
-android=""
-web=""
-%}
+	{% 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."
+	%}
 
-{% include cardv2.html
-title="Turtl"
-image="/assets/img/tools/Turtl.png"
-description="Turtl lets you take notes, bookmark websites, and store documents for sensitive projects. From sharing passwords with your coworkers to tracking research on an article you're writing, Turtl keeps it all safe from everyone but you and those you share with."
-website="https://turtlapp.com/"
-github="https://github.com/turtl"
-windows=""
-mac=""
-linux=""
-android=""
-%}
+	{% 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."
+	%}
+
+	{% 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."
+	%}
+
+</div>
 
 <h3>Warning</h3>
 

_includes/sections/operating-systems.html

@@ -1,39 +1,36 @@
 <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
-title="Qubes OS"
-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/"
-%}
+<div class="row mb-2">
 
-{% 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 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"
+	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="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"
-tor="http://sejnfjrq6szgca7v.onion"
-%}
+	{% include card.html color="primary"
+	title="Debian"
+	image="/assets/img/tools/Debian.png"
+	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>
 
@@ -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> <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 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

@@ -1,68 +1,53 @@
 <h1 id="pw" class="anchor"><a href="#pw"><i class="fas fa-link anchor-icon"></i></a> Password Manager Software</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a password manager software like 1Password, LastPass, Roboform, or iCloud Keychain, you should pick an alternative here.</strong>
+	<strong>If you are currently using a password manager software like 1Password, LastPass, Roboform or iCloud Keychain, you should pick an alternative here.</strong>
 </div>
 
-{%
-  include cardv2.html
+<div class="row mb-2">
+
+	{% include card.html color="success"
 	title="Bitwarden - Cloud/Self-host"
 	image="/assets/img/tools/bitwarden.png"
-  description="<strong>Bitwarden</strong> is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
-  website="https://bitwarden.com/"
-  forum="https://forum.privacytools.io/t/discussion-bitwarden/1343"
-  github="https://github.com/bitwarden"
-  web="https://vault.bitwarden.com/#/"
-  linux="https://vault.bitwarden.com/download/?app=desktop&platform=linux"
-  mac="https://vault.bitwarden.com/download/?app=desktop&platform=macos"
-  firefox="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/"
-  chrome="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb"
-  safari="https://safari-extensions.apple.com/details/?id=com.bitwarden.safari-LTZ2PFU5D6"
-  opera="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/"
-  edge="https://www.microsoft.com/store/apps/9P6KXL0SVNNL"
-  android="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
-  ios="https://itunes.apple.com/app/bitwarden-free-password-manager/id1137397744?mt=8"
-%}
+	url="https://bitwarden.com/"
+	footer="OS: Windows, macOS, Linux, iOS, Android, Web."
+	description="Bitwarden is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
+	%}
 
-{%
-  include cardv2.html
-  title="KeePassXC - Local"
-  image="/assets/img/tools/keepassxc.png"
-  description="<strong>KeePassXC</strong> is a community fork of KeePassX, a native cross-platform port of KeePass Password Safe, with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager."
-  website="https://keepassxc.org/"
-  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
-  github="https://github.com/keepassxreboot/keepassxc"
-  web="https://keepassxc.org/"
-  linux="https://keepassxc.org/download/#linux"
-  mac="https://keepassxc.org/download/#mac"
-%}
+	{% include card.html color="primary"
+	title="KeePass / KeePassXC - Local"
+	image="/assets/img/tools/KeePass.png"
+	url="https://keepass.info/download.html"
+	website="keepass.info"
+	footer="OS: Windows, macOS, Linux, iOS, Android, BSD."
+	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 cardv2.html
+	{% include card.html color="warning"
 	title="LessPass - Browser"
 	image="/assets/img/tools/LessPass.png"
-  description="<strong>LessPass</strong> is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
-  website="https://lesspass.com/"
-  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
-  github="https://github.com/keepassxreboot/keepassxc"
-  firefox="https://addons.mozilla.org/en-US/firefox/addon/lesspass/"
-  chrome="https://chrome.google.com/webstore/detail/lesspass/lcmbpoclaodbgkbjafnkbbinogcbnjih"
-  android="https://play.google.com/store/apps/details?id=com.lesspass.android&hl=en"
-%}
+	url="https://lesspass.com/"
+	footer="OS: Windows, macOS, Linux, Android."
+	description="LessPass is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
+	%}
+
+</div>
 
 <h3>Worth Mentioning</h3>
 
 <ul>
 	<li>
-    <a href="https://masterpassword.app">Master Password</a> - Master Password is based on an ingenious password generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site, and your master password. No syncing, backups, or internet access needed.
+		<a href="https://masterpassword.app">Master Password</a> - Master Password is based on an ingenious password generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site and your master password. No syncing, backups or internet access needed.
 	</li>
 
 	<li>
-    <a href="https://psono.com/">Psono</a> - Free and open source password manager for teams with client side encryption and secure sharing of passwords, files, bookmarks, emails. All secrets are protected by a master password. Uses <a href="https://nacl.cr.yp.to/">NACL Crypto</a>, a combination of Curve25519, Salsa20 and Poly1305.
+		<a href="https://psono.com/">Psono</a> - Free and open source password manager for teams with client side encryption and secure sharing of passwords, files, bookmarks, emails... All secrets are protected by a master password. Uses <a href="https://nacl.cr.yp.to/">NACL Crypto</a>, a combination of Curve25519, Salsa20 and Poly1305.
 	</li>
 
 	<li>
-    <a href="https://pwsafe.org/">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted username/password list. With Password Safe all you have to do is create and remember a single "Master Password" of your choice in order to unlock and access your entire username/password list.
+		<a href="https://pwsafe.org/">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted username/password list. With Password Safe all you have to do is create and remember
+		a single "Master Password" of your choice in order to unlock and access your entire username/password list.
 	</li>
 </ul>
 

_includes/sections/paste-services.html

@@ -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
-title="OpenWrt"
-image="/assets/img/tools/OpenWrt.png"
-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"
-%}
+<div class="row mb-2">
 
-{% include cardv2.html
-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/"
-%}
+	{% 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."
+	%}
 
-{% include cardv2.html
-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"
-%}
+	{% include card.html color="primary"
+	title="pfSense"
+	labels="warning:contrib:This software may depend on or recommend non-free software."
+	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 card.html color="warning"
+	title="LibreCMC"
+	image="/assets/img/tools/LibreCMC.png"
+	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-news-aggregator.html

@@ -1,57 +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"
-windows=""
-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/"
-windows=""
-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/"
-windows=""
-mac=""
-linux=""
-android=""
-ios=""
-%}
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://beta.akasha.world/">Akasha</a> - A decentralized online bulletin board using <a href="https://www.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a> and <a href="https://www.wikipedia.org/wiki/Ethereum">Ethereum</a>.</li>
-  <li><a href="https://dev.lemmy.ml/">Lemmy</a> - An <a href="https://github.com/dessalines/lemmy/blob/master/LICENSE">AGPL</a> licensed self-hostable link aggregator intended to work in the <a href="https://www.wikipedia.org/wiki/Fediverse">Fediverse</a>.</li>
-  <li><a href="https://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,43 +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=""
-windows=""
-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>Warning</a>:The server side of Keybase runs on proprietary code and is centralized."
-website="https://keybase.io/"
-forum="https://forum.privacytools.io/t/discussion-keybase/1224"
-github="https://github.com/Keybase"
-android=""
-ios=""
-mac=""
-windows=""
-linux=""
-web=""
-%}
-
-
-<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"
@@ -19,30 +51,20 @@ 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/"
-windows=""
-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

@@ -1,90 +1,337 @@
-<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Recommended VPN Service</h1>
+<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Privacy VPN Services</h1>
 
 <div class="alert alert-success" role="alert">
-  <strong>Our recommended provider is outside the US, uses encryption, accepts Bitcoin, supports OpenVPN, and has a no logging policy. <a href="/providers/vpn/#criteria">Read our full list of criteria for more information</a>.</strong>
+	<strong>All providers listed here are outside the US, use encryption, accept Bitcoin, support OpenVPN and have a no logging policy.</strong>
 </div>
 
-<div class="container-fluid">
+{% assign eur_to_usd = 1.14 %}
+<div class="table-responsive">
+	<table class="table sortable-theme-bootstrap" data-sortable>
+		<thead>
+			<tr>
+				<th data-sorted="true" data-sorted-direction="descending">VPN Provider</th>
+				<th data-sortable="false">Website</th>
+				<th data-sortable="true">Since</th>
+				<th data-sortable="true">Yearly Price</th>
+				<th data-sortable="true">Free Trial</th>
+				<th data-sortable="true" title="Number of Servers"># Servers</th>
+				<th data-sortable="true">WireGuard</th>
+				<th data-sortable="true">Jurisdiction</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td data-value="AirVPN">
+					<a href="https://airvpn.org/"><img alt="AirVPN" src="/assets/img/provider/AirVPN.png" width="200" height="70"></a></td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://airvpn.org/" href="https://airvpn.org/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2010">2010</td>
+				<td data-value="{{ 54 | times: eur_to_usd }}">54 €</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>162</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-it"></span> Italy</td>
+			</tr>
 
-  <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/provider/Mullvad.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Mullvad">
-    </div>
-    <div class="col">
-    <h2>Mullvad <span class="badge badge-info">EUR €60/Year</span></h2>
-    <p><strong>Mullvad</strong> is a fast and inexpensive VPN with a serious focus on transparency and security, they have been in operation since <strong>2009</strong>. It is the only VPN provider that currently meets our criteria for recommendation. Mullvad is based in <span class="flag-icon flag-icon-se"></span> Sweden and does not have a free trial. Visit <a href="https://mullvad.net/">mullvad.net</a> to create an account.</p>
-    <h5><span class="badge badge-success">409+ Servers</span></h5>
-    <p>Mullvad has 409 servers in 38 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</p>
-    <h5><span class="badge badge-success">WireGuard Support</span></h5>
-    <p>In addition to standard OpenVPN connections, Mullvad supports Wireguard. Wireguard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.</p>
-    <h5><span class="badge badge-success">Independently Audited</span></h5>
-    <p>Mullvad's VPN clients have been audited by Cure53 and Assured AB in a pentest report <a href="https://cure53.de/pentest-report_mullvad_v2.pdf">published at cure53.de</a>. The security researchers concluded:</p>
-    <blockquote class="blockquote">
-      <p class="mb-0">...Cure53 and Assured AB are happy with the results of the audit and the software leaves an overall positive impression. With security dedication of the in-house team at the Mullvad VPN compound, the testers have no doubts about the project being on the right track from a security standpoint.</p>
-    </blockquote>
-    <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
-    <p>Mullvad in addition to accepting credit/debit cards and PayPal, accepts <strong>Bitcoin</strong>, <strong>Bitcoin Cash</strong>, and <strong>cash/local currency</strong> as anonymous forms of payment. They also accept Swish and bank wire transfers.</p>
-    <h5><span class="badge badge-warning">No Mobile Clients</span></h5>
-    <p>While iOS and Android clients are reportedly in the works, mobile users will need to use a traditional OpenVPN client and configuration files, which are a bit more difficult to configure.</p>
-    <h5><span class="badge badge-info">Extra Functionality</span></h5>
-    <p>The Mullvad VPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. The Mullvad website is also accessible via Tor at <a href="http://xcln5hkbriyklr6n.onion/">xcln5hkbriyklr6n.onion</a>.</p>
-    </div>
-  </div>
+			<tr>
+				<td data-value="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>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ivpn.net/" href="https://www.ivpn.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2009">2009</td>
+				<td data-value="100">$ 100</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>38</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td><span class="flag-icon flag-icon-gi"></span> Gibraltar</td>
+			</tr>
+
+			<tr>
+				<td data-value="Mullvad">
+					<a href="https://mullvad.net/"><img alt="Mullvad" src="/assets/img/provider/Mullvad.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mullvad.net/" href="https://mullvad.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://xcln5hkbriyklr6n.onion. Requires specific software to access: torproject.org" href="http://xcln5hkbriyklr6n.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
+				</td>
+				<td data-value="2009">2009</td>
+				<td data-value="{{ 60 | times: eur_to_usd }}">60 €</td>
+				<td><span class="label label-success">No</span></td>
+				<td>281</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+			</tr>
+
+			<tr>
+				<td data-value="NordVPN">
+					<a href="https://nordvpn.com/"><img alt="NordVPN" src="/assets/img/provider/NordVPN.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://nordvpn.com/" href="https://nordvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2012">2012</td>
+				<td data-value="84">$ 83.88</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>5200+</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-pa"></span> Panama</td>
+			</tr>
+
+			<tr>
+				<td data-value="OVPN">
+					<a href="https://www.ovpn.com/"><img alt="OVPN" src="/assets/img/provider/ovpn.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ovpn.com/" href="https://www.ovpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2014">2014</td>
+				<td data-value="{{ 84 | times: eur_to_usd }}">84 €</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>67</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+			</tr>
+
+			<tr>
+				<td data-value="Perfect Privacy">
+					<a href="https://www.perfect-privacy.com/"><img alt="Perfect Privacy" src="/assets/img/provider/Perfect-Privacy.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.perfect-privacy.com/" href="https://www.perfect-privacy.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2008">2008</td>
+				<td data-value="{{ 119.99 | times: eur_to_usd }}">119.99 €</td>
+				<td><span class="label label-warning">No</span></td>
+				<td>54</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+			</tr>
+
+			<tr>
+				<td data-value="ProtonVPN">
+					<a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonvpn.com/" href="https://protonvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2016">2016</td>
+				<td data-value="0"><a data-toggle="tooltip" data-placement="bottom" data-original-title="3 countries, 1 device, speed: low" href="https://protonvpn.com/pricing">Free</a></td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>396</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+			</tr>
+
+			<tr>
+				<td data-value="Proxy.sh">
+					<a href="https://proxy.sh/"><img alt="Proxy.sh" src="/assets/img/provider/Proxy.sh.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://proxy.sh/" href="https://proxy.sh/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2012">2012</td>
+				<td data-value="40">$ 40</td>
+				<td><span class="label label-warning">No</span></td>
+				<td>300+</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
+			</tr>
+
+			<tr>
+				<td data-value="Trust.Zone">
+					<a href="https://trust.zone/"><img alt="Trust.Zone" src="/assets/img/provider/Trust.Zone.png" width="200" height="70"></a>
+				</td>
+				<td>
+					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://trust.zone/" href="https://trust.zone/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+				</td>
+				<td data-value="2014">2014</td>
+				<td data-value="40">$ 39.95</td>
+				<td><span class="label label-success">Yes</span></td>
+				<td>164</td>
+				<td><span class="label label-warning">No</span></td>
+				<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
+			</tr>
+			<tr>
+				<td data-value="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>
 
 <div class="alert alert-warning" role="alert">
-  <strong>Note: Using a VPN provider will not make you anonymous, but it will give you better privacy in certain situations. A VPN is not a tool for illegal activities. Don't rely on a "no log" policy.</strong>
+	<strong>Note: Using a VPN provider will not make you anonymous. But it will give you a better privacy. A VPN is not a tool for illegal activities. Don't rely on a "no log" policy.</strong>
 </div>
 
-<h1 id="vpn" class="anchor"><a href="#worth-mentioning"><i class="fas fa-link anchor-icon"></i></a> Other Providers Worth Mentioning</h1>
+<div class="container">
+	<div class="row">
+		<div class="col-md-6">
+			<h3>Our VPN Provider Criteria</h3>
 
-<div class="container-fluid">
+			<ul>
+				<li>Operating outside the USA or other Five Eyes countries.<br>More: <a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus">Avoid all US and UK based services.</a></li>
+				<li>OpenVPN software support.</li>
+				<li>Accepts Bitcoin, cash, debit cards or cash cards as a payment method.</li>
+				<li>No personal information is required to create an account. Only username, password and <a href="/providers/email/"><i class="fas fa-link"></i> Email.</a></li>
+			</ul>
 
-  <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/provider/ProtonVPN.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="ProtonVPN">
-    </div>
-    <div class="col">
-    <h2>ProtonVPN <span class="badge badge-info">Free</span> <span class="badge badge-info">USD $96/year</span></h2>
-    <p><strong>ProtonVPN</strong> is a strong contender in the VPN space, and they have been in operation since <strong>2016</strong>. ProtonVPN is based in <span class="flag-icon flag-icon-ch"></span> Switzerland and offers a limited free pricing tier, as well as premium options. Unfortunately due to its lack of an independent security audit it does not meet the complete criteria for recommendation, see our notes below.</p>
-    <h5><span class="badge badge-danger">Not Audited</span></h5>
-    <p>ProtonVPN has not undergone a security audit by an independent third party, and therefore cannot be strongly recommended at this time. We have still chosen to list it on this page with the assumption that an audit will be published soon:</p>
-    <blockquote class="blockquote">
-      <p class="mb-0">We are currently undergoing a complete security audit of our VPN applications by a reputable Swiss security company. The results of the audit will be summarized in a public report for cases like this.</p>
-      <footer class="blockquote-footer">Marc Loebekken, ProtonVPN AG Legal counsel</footer>
-    </blockquote>
-    <p>We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner.
-    <h5><span class="badge badge-success">442+ Servers</span></h5>
-    <p>ProtonVPN has 442 servers in 33 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</p>
-    <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
-    <p>ProtonVPN does technically accept Bitcoin payments, however you either need to have an existing account, or contact their support team in advance to register with Bitcoin.</p>
-    <h5><span class="badge badge-success">Mobile Clients</span></h5>
-    <p>In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for iOS or Android allowing for easy connections to their servers.</p>
-    <h5><span class="badge badge-info">Extra Functionality</span></h5>
-    <p>The ProtonVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. ProtonVPN also offers "Tor" servers allowing you to easily connect to onion sites, but we still strongly recommend using the official Tor Browser for this purpose.</p>
-    </div>
+			<p>We're not affiliated with any of the above-listed VPN providers. This way we can give you honest recommendations.</p>
+
+			<h3>More VPN Providers</h3>
+			<ul>
+				<li><a href="https://www.reddit.com/r/privacytoolsIO/comments/43d4zs/you_guys_might_be_interested_in_this_a/">Guide to Choosing the Best VPN</a></li>
+				<li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
+			</ul>
 		</div>
 
-  <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/provider/IVPN.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="IVPN">
-    </div>
-    <div class="col">
-    <h2>IVPN <span class="badge badge-info">USD $100/Year</span></h2>
-    <p><strong>IVPN</strong> is another strong premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar and offers a 3 day free trial. Unfortunately due to its lack of an independent security audit it does not meet the complete criteria for recommendation, see our notes below.</p>
-    <h5><span class="badge badge-danger">No Security Audit</span></h5>
-    <p>IVPN has undergone a <a href="https://cure53.de/audit-report_ivpn.pdf">no-logging audit from Cure53</a> which concluded in agreement with IVPN's no-logging claim. However, IVPN has not undergone a more comprehensive security audit by an independent third party, and therefore cannot be strongly recommended at this time. We have still chosen to list it on this page with the assumption that an audit will be published soon: The IVPN team <a href="https://twitter.com/yaelwrites/status/1161796418220089344">reportedly plans to begin the process in September</a>.</p>
-    <p>We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner.
-    <h5><span class="badge badge-success">70+ Servers</span></h5>
-    <p>IVPN has 70 servers in 29 countries at the time of writing this page. Typically the more servers a provider offers, the better. IVPN has a decent (but not exceptional) server count that will most likely provide adequate coverage to most users.</p>
-    <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
-    <p>In addition to accepting credit/debit cards and PayPal, IVPN accepts <strong>Bitcoin</strong> and <strong>cash/local currency</strong> (on annual plans) as anonymous forms of payment.</p>
-    <h5><span class="badge badge-success">Mobile Clients</span></h5>
-    <p>In addition to providing standard OpenVPN configuration files, IVPN has mobile clients for iOS or Android allowing for easy connections to their servers.</p>
-    <h5><span class="badge badge-info">Extra Functionality</span></h5>
-    <p>The IVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. IVPN also provides "AntiTracker" functionality, which blocks advertising networks and trackers from the network level.</p>
-    </div>
-  </div>
+		<div class="col-md-6">
 
+			<h3>Related VPN information</h3>
+
+			<ul>
+				<li><a href="https://vikingvpn.com/blogs/off-topic/beware-of-vpn-marketing-and-affiliate-programs">Beware of False Reviews - VPN Marketing and Affiliate Programs</a></li>
+				<li><a href="https://www.goldenfrog.com/take-back-your-internet/articles/7-myths-about-vpn-logging-and-anonymity">I am Anonymous When I Use a VPN - 7 Myths Debunked</a><br />(<strong>Note:</strong> While this is a good read, they also use the article for self-promotion)</li>
+				<li><a href="https://torrentfreak.com/proxy-sh-vpn-provider-monitored-traffic-to-catch-hacker-130930/">Proxy.sh VPN Provider Sniffed Server Traffic to Catch Hacker</a></li>
+				<li><a href="https://proxy.sh/panel/knowledgebase.php?action=displayarticle&id=5">Ethical policy - All of the reasons why Proxy.sh might enable logging</a></li>
+				<li><a href="https://www.ivpn.net/privacy">IVPN.net will collect your email and IP address after sign up</a><br />Read the <a data-toggle="tooltip" data-placement="top" data-original-title="The IP collected at signup is only used for a few seconds by our fraud module and then discarded, it is not stored. Storing them would significantly increase our own liability and certainly would not be in our interest. You're absolutely welcome to signup using Tor or a VPN.">Email statement</a> from IVPN.</li>
+				<li><a href="https://medium.com/@blackVPN/no-logs-6d65d95a3016">blackVPN announced to delete connection logs after disconnection</a></li>
+				<li><a href="https://gist.github.com/kennwhite/1f3bc4d889b02b35d8aa">Don't use LT2P IPSec, use other protocols.</a></li>
+			</ul>
+
+		</div>
+	</div>
 </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>