Use updated label functionality

The labels/badges functionality added to cardv2.html in cbe5de4cc2 work better here.

.github/CODEOWNERS

@@ -1,11 +1,3 @@
-# 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
@@ -13,5 +5,13 @@
 /_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/ISSUE_TEMPLATE/6_Translation_Issues.md

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

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

.github/PULL_REQUEST_TEMPLATE.md

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

.gitignore

@@ -3,98 +3,3 @@ 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

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

.lintstagedrc

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

.nvmrc

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

.travis.yml

@@ -1,19 +1,11 @@
-matrix:
+language: ruby
-  include:
+rvm:
-  - language: ruby
+  - 2.4.1
-    rvm: 2.4.1
 
-    # Assume bundler is being used, therefore
+# Assume bundler is being used, therefore
-    # the `install` step will run `bundle install` by default.
+# the `install` step will run `bundle install` by default.
-    script: ./bin/build.sh
+script: ./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

404.html

@@ -4,20 +4,20 @@ active_page: 404
 ---
 
 <div class="container text-center">
-	<h1 class="header-404">404</h1>
+  <h1 class="header-404">404</h1>
-	<p><strong>We couldn't find that :(</strong></p>
+  <p><strong>We couldn't find that :(</strong></p>
-	<p>Maybe you were looking for one of these pages?</p>
+  <p>Maybe you were looking for one of these pages?</p>
-	<div class="row">
+  <div class="row">
-		<div class="col-md-6 offset-md-3">
+    <div class="col-md-6 offset-md-3">
-			<div class="card card-list">
+      <div class="card card-list">
-				<ul class="list-group list-group-flush">
+        <ul class="list-group list-group-flush">
-					<li class="list-group-item"><a href="/"><i class="fas fa-home"></i> Back to our Homepage</a></li>
+          <li class="list-group-item"><a href="/"><i class="fas fa-home"></i> Back to our Homepage</a></li>
-					<li class="list-group-item"><a href="/providers/"><i class="fas fa-server"></i> Privacy Focused Service Providers</a></li>
+          <li class="list-group-item"><a href="/providers/"><i class="fas fa-server"></i> Privacy Focused Service Providers</a></li>
-					<li class="list-group-item"><a href="/browsers/"><i class="fas fa-compass"></i> Privacy Protecting Web Browsers</a></li>
+          <li class="list-group-item"><a href="/browsers/"><i class="fas fa-compass"></i> Privacy Protecting Web Browsers</a></li>
-					<li class="list-group-item"><a href="/software/"><i class="fas fa-window-restore"></i> Privacy-Centric Software</a></li>
+          <li class="list-group-item"><a href="/software/"><i class="fas fa-window-restore"></i> Privacy-Centric Software</a></li>
-				</ul>
+        </ul>
-			</div>
+      </div>
-		</div>
+    </div>
-	</div>
+  </div>
-	<p class="text-danger text-center"><i class="fas fa-exclamation-circle"></i> If you believe you reached this page in error, please <a href="/contact/">contact us</a>!</p>
+  <p class="text-danger text-center"><i class="fas fa-exclamation-circle"></i> If you believe you reached this page in error, please <a href="/contact/">contact us</a>!</p>
-</div>
+</div>

README.md

@@ -1,4 +1,4 @@
-[![privacytools](https://privacytools.io/assets/img/layout/logo.png)](https://www.privacytools.io/)
+[![privacytools](./assets/img/layout/logo.png)](https://www.privacytools.io/)
 
 _Encryption Against Global Mass Surveillance._
 
@@ -15,13 +15,9 @@ 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. Run `gem install bundler` to install [bundler](https://bundler.io/).
+1. Install [bundler](https://bundler.io/) by running `gem install bundler`.
-1. Run `bundle install` to install the required Ruby dependencies.
+1. Run `bundle install` to install the required dependencies.
-1. Install [Node.js](https://nodejs.org/).
+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 `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
 
@@ -35,6 +31,7 @@ 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

@@ -1,73 +1,74 @@
 <div class="col-xl-4 col-lg-6 col-md-12 mb-2">
-	<div class="card card-{{include.color}}">
+    <div class="card card-{{include.color}}">
-		{% if include.color == "warning" %}
+        {% if include.color == "warning" %}
-		<div class="card-header text-dark bg-{{include.color}}">
+        <div class="card-header text-dark bg-{{include.color}}">
-			{% else %}
+        {% else %}
-			<div class="card-header text-white bg-{{include.color}}">
+        <div class="card-header text-white bg-{{include.color}}">
-				{% endif %}
+        {% endif %}
-				<h3 class="h5">{{include.title}}</h3>
+        <h3 class="h5">{{include.title}}</h3>
-			</div>
+        </div>
-			<div class="card-body">
+        <div class="card-body">
-				{% if include.labels %}
+            {% if include.labels %}
-				{% assign labels = include.labels | replace:", ", "," | split:"," %}
+            {% assign labels = include.labels | replace:", ", "," | split:"," %}
-				<div class="mb-1">
+            <div class="mb-1">
-					{% for label in labels %}
+                {% for label in labels %}
-					{% assign label_data = label | split:":" %}
+                    {% assign label_data = label | split:":" %}
-					{% assign color = label_data[0] %}
+                    {% assign color = label_data[0] %}
-					{% assign text = label_data[1] %}
+                    {% assign text = label_data[1] %}
-					{% assign tooltip = label_data[2] | default: "" %}
+                    {% assign tooltip = label_data[2] | default: "" %}
-					{% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+                    {% 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}}
+                        {% else %}
-						{% endif %}
+                        >{{text}}
-					</span>
+                        {% endif %}
-					{% endfor %}
+                    </span>
-				</div>
+                {% endfor %}
-				{% endif %}
+            </div>
-				<p>
+            {% endif %}
-					{% if include.image %}
+            <p>
-					<img src="{{include.image}}" width="120" height="120" alt="{{include.title}}" class="panel-item">
+              {% if include.image %}
-					{% elsif include.icon %}
+              <img src="{{include.image}}" width="120" height="120" alt="{{include.title}}" class="panel-item">
-					<i class="{{ include.icon }} panel-icon{% if include.iconcolor %} text-{{include.iconcolor}}{% endif %}"></i>
+              {% elsif include.icon %}
-					{% endif %}
+              <i class="{{ include.icon }} panel-icon{% if include.iconcolor %} text-{{include.iconcolor}}{% endif %}"></i>
-					{{include.description}}
+              {% endif %}
-				</p>
+              {{include.description}}
-				<div>
+            </p>
-					<p>
+            <div>
-						{% if include.url %}
+            <p>
-						<a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">Website:
+                {% if include.url %}
-							{% if include.website %}
+                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">Website:
-							{{include.website}}
+                    {% if include.website %}
-							{% else %}
+                        {{include.website}}
-							{{ include.url | remove: "https://" | remove: "http://" | remove: "www." | remove: "/" | remove: "github.com" }}
+                    {% else %}
-							{% endif %}
+                        {{ include.url | remove: "https://" | remove: "http://" | remove: "www." | remove: "/" | remove: "github.com" }}
-						</a>
+                    {% endif %}
-						{% elsif include.page %}
+                </a>
-						<a class="btn btn-{{include.color}} mb-1" href="{{include.page}}">
+                {% elsif include.page %}
-							{% if include.moretext %}
+                <a class="btn btn-{{include.color}} mb-1" href="{{include.page}}">
-							{{include.moretext}}
+                    {% if include.moretext %}
-							{% else %}
+                        {{include.moretext}}
-							Learn More
+                    {% else %}
-							{% endif %}
+                        Learn More
-						</a>
+                    {% endif %}
-						{% endif %}
+                </a>
-						{% if include.tor %}
+                {% endif %}
-						<a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.tor}} Requires specific software to access: torproject.org" href="{{include.tor}}"><img alt="Tor" src="/assets/img/layout/tor.png" width="35" height="35"></a>
+                {% if include.tor %}
-						{% endif %}
+                <a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.tor}} 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.git %}
+                {% if include.git %}
-						<a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.git}} supports source code compiling and open review | is free software" href="{{include.git}}"><img alt="Git" src="assets/img/layout/git.png" width="35"></a>
+                <a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.git}} supports source code compiling and open review | is free software" href="{{include.git}}"><img alt="Git" src="assets/img/layout/git.png" width="35"></a>
-						{% endif %}
+                {% endif %}
 
-						{% if include.extra_button %}
+                {% if include.extra_button %}
-						{{include.extra_button}}
+                    {{include.extra_button}}
-						{% endif %}
+                {% endif %}
-					</p>
+            </p>
-					{% if include.footer %}
+            {% if include.footer %}
-					<p>{{include.footer}}</p>
+                <p>{{include.footer}}</p>
-					{% endif %}
+            {% endif %}
-				</div>
+            </div>
-			</div>
+        </div>
-		</div>
+    </div>
-	</div>
+</div>

_includes/cardv2.html

@@ -1,49 +1,89 @@
 <div class="card">
-	<div class="card-header text-white bg-secondary">
+  <div class="card-header text-white bg-secondary">
-		<h3 class="h5">{{include.title}}</h3>
+    <h3 class="h5">
-	</div>
+      {% if include.badges %}
-	<div class="card-body">
+      <span class="mr-2">{{include.title}}</span>
-		<p class="card-text">
+      {% assign badges = include.badges | replace:", ", "," | split:"," %}
-			<img src="{{include.image}}" height="120" width="120" class="panel-pic" alt="{{include.title}}">
+          {% for badge in badges %}
-			{{include.description}}
+              {% assign badge_data = badge | split:":" %}
-		</p>
+              {% assign color = badge_data[0] %}
-		<a href="{{include.website}}" class="btn btn-primary"><i class="fas fa-external-link-alt fa-fw"></i> Website</a>
+              {% assign text = badge_data[1] %}
-		{% if include.forum %}
+              {% assign tooltip = badge_data[2] | default: false %}
-		<a href="{{include.forum}}" class="btn btn-success"><i class="fab fa-discourse fa-fw"></i> Forum</a>
+              {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
-		{% endif %}
+              <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
-		{% if include.tor %}
+                  }}
-		<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>
+                  {% else %}
-		{% endif %}
+                  >{{text}}
+                  {% endif %}
+              </span>
+          {% endfor %}
+      {% else %}
+      {{include.title}}
+      {% endif %}
+    </h3>
+  </div>
+  <div class="card-body">
+    <p class="card-text">
+      <img src="{{include.image}}" height="120" width="120" class="panel-pic" alt="{{include.title}}">
+      {{include.description}}
+      {% if include.labels %}
+      {% assign labels = include.labels | replace:", ", "," | split:"," %}
+          {% for label in labels %}
+              {% assign label_data = label | split:":" %}
+              {% assign color = label_data[0] %}
+              {% assign text = label_data[1] %}
+              {% assign tooltip = label_data[2] | default: false %}
+              {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+              <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
+                  }}
+                  {% else %}
+                  >{{text}}
+                  {% endif %}
+              </span>
+          {% endfor %}
+      {% endif %}
+    </p>
+    <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
+      <div class="flex-shrink-0 mr-2">
+        <a href="{{include.website}}" class="btn btn-primary mt-1"><i class="fas fa-external-link-alt fa-fw"></i> Website</a>
+        {% if include.forum %}
+        <a href="{{include.forum}}" class="btn btn-success mt-1"><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="float-right">
+      <div class="mt-2">
-			{% if include.windows %}<i class="fab fa-windows fa-2x fa-fw"></i>{% endif %}
+          {% if include.windows %}<i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-			{% if include.mac %}<i class="fab fa-apple fa-2x fa-fw"></i>{% endif %}
+          {% if include.mac %}<i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-			{% if include.linux %}<i class="fab fa-linux fa-2x fa-fw"></i>{% endif %}
+          {% if include.linux %}<i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-			{% if include.bsd %}<i class="fab fa-freebsd fa-2x fa-fw"></i>{% endif %}
+          {% if include.bsd %}<i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>{% endif %}
 
-			{% if include.firefox %}<i class="fab fa-firefox fa-2x fa-fw"></i>{% endif %}
+          {% if include.firefox %}<i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-			{% if include.chrome %}<i class="fab fa-chrome fa-2x fa-fw"></i>{% endif %}
+          {% if include.chrome %}<i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-			{% if include.safari %}<i class="fab fa-safari fa-2x fa-fw"></i>{% endif %}
+          {% if include.safari %}<i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-			{% if include.opera %}<i class="fab fa-opera fa-2x fa-fw"></i>{% endif %}
+          {% if include.opera %}<i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-			{% if include.edge %}<i class="fab fa-edge fa-2x fa-fw"></i>{% endif %}
+          {% if include.edge %}<i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>{% endif %}
 
-			{% if include.android %}<i class="fab fa-android fa-2x fa-fw"></i>{% endif %}
+          {% if include.android %}<i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-			{% if include.ios %}<i class="fab fa-app-store-ios fa-2x fa-fw"></i>{% endif %}
+          {% if include.ios %}<i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>{% endif %}
-			{% if include.fire %}<i class="fas fa-fire fa-2x fa-fw"></i>{% endif %}
+          {% if include.fire %}<i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>{% endif %}
 
-			{% if include.web %}<i class="fas fa-desktop fa-2x fa-fw"></i>{% endif %}
+          {% if include.web %}<i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>{% endif %}
 
-			{{include.icon1}}
+          {{include.icon1}}
-			{{include.icon2}}
+          {{include.icon2}}
-			{{include.icon3}}
+          {{include.icon3}}
 
-			{% if include.github %}<a href="{{include.github}}"><i class="fab fa-github fa-2x fa-fw"></i></a>{% endif %}
+          {% 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"></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"></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"></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 %}
 
-		</div>
+      </div>
+    </div>
 
-	</div>
+  </div>
 </div>
-<br>
+<br>

_includes/footer.html

@@ -1,78 +1,78 @@
 <footer>
 
-	<hr class="footer-divider" />
+  <hr class="footer-divider" />
 
-	<h3 id="participate">Spread the word and help your friends</h3>
+  <h3 id="participate">Spread the word and help your friends</h3>
 
-	<div class="row mb-4">
+  <div class="row mb-4">
-		<div class="col-12 col-md-6 d-flex justify-content-between">
+    <div class="col-12 col-md-6 d-flex justify-content-between">
-			<a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/" class="share-btn email" title="Email">
+      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/" class="share-btn email" title="Email">
-				<i class="fas fa-envelope pl-3"></i>
+        <i class="fas fa-envelope pl-3"></i>
-			</a>
+      </a>
 
-			<a href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io" class="share-btn facebook" title="Facebook">
+      <a href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io" class="share-btn facebook" title="Facebook">
-				<i class="fab fa-facebook-f pl-3"></i>
+        <i class="fab fa-facebook-f pl-3"></i>
-			</a>
+      </a>
 
-			<a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://www.privacytools.io/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
+      <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://www.privacytools.io/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
-				<i class="fab fa-twitter pl-3"></i>
+        <i class="fab fa-twitter pl-3"></i>
-			</a>
+      </a>
 
-			<a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn mastodon" title="Mastodon">
+      <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn mastodon" title="Mastodon">
-				<i class="fab fa-mastodon pl-3"></i>
+        <i class="fab fa-mastodon pl-3"></i>
-			</a>
+      </a>
-		</div>
+    </div>
-		<div class="col-12 col-md-6 d-flex justify-content-between">
+    <div class="col-12 col-md-6 d-flex justify-content-between">
-			<a href="https://reddit.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
+      <a href="https://reddit.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
-				<i class="fab fa-reddit-alien pl-3"></i>
+        <i class="fab fa-reddit-alien pl-3"></i>
-			</a>
+      </a>
 
-			<a href="https://www.linkedin.com/shareArticle?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
+      <a href="https://www.linkedin.com/shareArticle?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
-				<i class="fab fa-linkedin-in pl-3"></i>
+        <i class="fab fa-linkedin-in pl-3"></i>
-			</a>
+      </a>
 
-			<a href="http://www.stumbleupon.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn stumbleupon" title="StumbleUpon">
+      <a href="http://www.stumbleupon.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn stumbleupon" title="StumbleUpon">
-				<i class="fab fa-stumbleupon pl-3"></i>
+        <i class="fab fa-stumbleupon pl-3"></i>
-			</a>
+      </a>
 
-			<a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn diaspora" title="Diaspora*">
+      <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn diaspora" title="Diaspora*">
-				<i class="fas fa-asterisk pl-3"></i>
+        <i class="fas fa-asterisk pl-3"></i>
-			</a>
+      </a>
-		</div>
+    </div>
-	</div>
+  </div>
 
-	<h3>Copy URL and Description</h3>
+  <h3>Copy URL and Description</h3>
 
-	<p>
+  <p>
-		<input type="text" value="www.privacytools.io - encryption against global mass surveillance" onclick="this.focus();this.select()" class="form-control input-lg">
+  <input type="text" value="www.privacytools.io - encryption against global mass surveillance" onclick="this.focus();this.select()" class="form-control input-lg">
-		<span class="help-block">For easy copy and paste. Share this text snippet.</span>
+  <span class="help-block">For easy copy and paste. Share this text snippet.</span>
-	</p>
+  </p>
 
-	<hr class="footer-divider" />
+  <hr class="footer-divider" />
 
-	<div class="row mt-3">
+  <div class="row mt-3">
-		<div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center d-flex justify-content-center">
+    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center d-flex justify-content-center">
-			<a href="https://www.privacytools.io/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."><img alt="CC0" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
+      <a href="https://www.privacytools.io/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."><img alt="CC0" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
-		</div>
+    </div>
 
-		<div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
+    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
-			<a href="https://www.kopimi.com/" data-toggle="tooltip" data-placement="top" data-original-title="kopimi (copyme), symbol showing that you want to be copied. use kopimi in your own fancy. kopimi may be put on homepages or blogs, in books, in software, as sound logos in music or whatever."><img alt="kopimi" src="/assets/img/layout/kopimi.png" width="32" height="33">kopimi</a>
+      <a href="https://www.kopimi.com/" data-toggle="tooltip" data-placement="top" data-original-title="kopimi (copyme), symbol showing that you want to be copied. use kopimi in your own fancy. kopimi may be put on homepages or blogs, in books, in software, as sound logos in music or whatever."><img alt="kopimi" src="/assets/img/layout/kopimi.png" width="32" height="33">kopimi</a>
-		</div>
+    </div>
 
-		<div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
+    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
-			<i class="far fa-envelope fa-2x"></i>
+      <i class="far fa-envelope fa-2x"></i>
-			<a href="/contact/">Contact</a>
+      <a href="/contact/">Contact</a>
-		</div>
+    </div>
 
-		<div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
+    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
-			<i class="fas fa-heart fa-2x text-danger"></i>
+      <i class="fas fa-heart fa-2x text-danger"></i>
-			<a data-toggle="tooltip" data-placement="top" data-original-title="Please support this project by donating. We are ad free and not affiliated with any providers. Your donation will cover our cost for server and domain." href="/donate/">Donate</a>
+      <a data-toggle="tooltip" data-placement="top" data-original-title="Please support this project by donating. We are ad free and not affiliated with any providers. Your donation will cover our cost for server and domain." href="/donate/">Donate</a>
-		</div>
+    </div>
-	</div>
+  </div>
 
-	<div class="copyright-text">
+  <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><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>Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong> (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</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>
-	</div>
+  </div>
 
-</footer>
+</footer>

_includes/head.html

@@ -1,47 +1,47 @@
 <head>
-	<meta charset="utf-8">
+  <meta charset="utf-8">
-	<meta name="referrer" content="no-referrer">
+  <meta name="referrer" content="no-referrer">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<meta name="keywords" content="privacy, anonymity, privacy tools, surveillance, encryption">
+  <meta name="keywords" content="privacy, anonymity, privacy tools, surveillance, encryption">
-	<meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
+  <meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
-	<meta name="msapplication-TileColor" content="#da532c">
+  <meta name="msapplication-TileColor" content="#da532c">
-	<meta name="msapplication-TileImage" content="/assets/img/favicons/mstile-144x144.png">
+  <meta name="msapplication-TileImage" content="/assets/img/favicons/mstile-144x144.png">
-	<meta name="msapplication-config" content="/assets/img/favicons/browserconfig.xml">
+  <meta name="msapplication-config" content="/assets/img/favicons/browserconfig.xml">
-	<meta name="theme-color" content="#ffffff">
+  <meta name="theme-color" content="#ffffff">
 
-	<!-- title -->
+  <!-- title -->
-	{% if page.title %}
+  {% if page.title %}
-	<title>{{ page.title }} | privacytools.io</title>
+  <title>{{ page.title }} | privacytools.io</title>
-	<meta property="og:title" content="{{ page.title }} | privacytools.io" />
+  <meta property="og:title" content="{{ page.title }} | privacytools.io" />
-	{% else %}
+  {% else %}
-	<title>{{ site.title }}</title>
+  <title>{{ site.title }}</title>
-	<meta property="og:title" content="{{ site.title }}" />
+  <meta property="og:title" content="{{ site.title }}" />
-	{% endif %}
+  {% endif %}
-	<meta property="og:type" content="website" />
+  <meta property="og:type" content="website" />
-	<meta property="og:url" content="{{ page.permalink | prepend: site.url }}" />
+  <meta property="og:url" content="{{ page.permalink | prepend: site.url }}" />
-	<meta property="og:image" content="https://www.privacytools.io/assets/img/layout/ogimage.jpg" />
+  <meta property="og:image" content="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:locale" content="en_GB" />
-	<meta property="og:site_name" content="privacytools.io" />
+  <meta property="og:site_name" content="privacytools.io" />
 
-	<!-- icons -->
+  <!-- icons -->
-	<link rel="apple-touch-icon" sizes="57x57" href="/assets/img/favicons/apple-touch-icon-57x57.png">
+  <link rel="apple-touch-icon" sizes="57x57" href="/assets/img/favicons/apple-touch-icon-57x57.png">
-	<link rel="apple-touch-icon" sizes="60x60" href="/assets/img/favicons/apple-touch-icon-60x60.png">
+  <link rel="apple-touch-icon" sizes="60x60" href="/assets/img/favicons/apple-touch-icon-60x60.png">
-	<link rel="apple-touch-icon" sizes="72x72" href="/assets/img/favicons/apple-touch-icon-72x72.png">
+  <link rel="apple-touch-icon" sizes="72x72" href="/assets/img/favicons/apple-touch-icon-72x72.png">
-	<link rel="apple-touch-icon" sizes="76x76" href="/assets/img/favicons/apple-touch-icon-76x76.png">
+  <link rel="apple-touch-icon" sizes="76x76" href="/assets/img/favicons/apple-touch-icon-76x76.png">
-	<link rel="apple-touch-icon" sizes="114x114" href="/assets/img/favicons/apple-touch-icon-114x114.png">
+  <link rel="apple-touch-icon" sizes="114x114" href="/assets/img/favicons/apple-touch-icon-114x114.png">
-	<link rel="apple-touch-icon" sizes="120x120" href="/assets/img/favicons/apple-touch-icon-120x120.png">
+  <link rel="apple-touch-icon" sizes="120x120" href="/assets/img/favicons/apple-touch-icon-120x120.png">
-	<link rel="apple-touch-icon" sizes="144x144" href="/assets/img/favicons/apple-touch-icon-144x144.png">
+  <link rel="apple-touch-icon" sizes="144x144" href="/assets/img/favicons/apple-touch-icon-144x144.png">
-	<link rel="apple-touch-icon" sizes="152x152" href="/assets/img/favicons/apple-touch-icon-152x152.png">
+  <link rel="apple-touch-icon" sizes="152x152" href="/assets/img/favicons/apple-touch-icon-152x152.png">
-	<link rel="apple-touch-icon" sizes="180x180" href="/assets/img/favicons/apple-touch-icon-180x180.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="/assets/img/favicons/apple-touch-icon-180x180.png">
-	<link rel="icon" type="image/png" href="/assets/img/favicons/favicon-32x32.png" sizes="32x32">
+  <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-32x32.png" sizes="32x32">
-	<link rel="icon" type="image/png" href="/assets/img/favicons/android-chrome-192x192.png" sizes="192x192">
+  <link rel="icon" type="image/png" href="/assets/img/favicons/android-chrome-192x192.png" sizes="192x192">
-	<link rel="icon" type="image/png" href="/assets/img/favicons/favicon-96x96.png" sizes="96x96">
+  <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-96x96.png" sizes="96x96">
-	<link rel="icon" type="image/png" href="/assets/img/favicons/favicon-16x16.png" sizes="16x16">
+  <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-16x16.png" sizes="16x16">
-	<link rel="manifest" href="/assets/img/favicons/manifest.json">
+  <link rel="manifest" href="/assets/img/favicons/manifest.json">
-	<link rel="shortcut icon" href="/assets/img/favicons/favicon.ico">
+  <link rel="shortcut icon" href="/assets/img/favicons/favicon.ico">
 
-	<!-- CSS stylesheets -->
+  <!-- CSS stylesheets -->
-	<link href="/assets/css/style.css?v=5" rel="stylesheet">
+  <link href="/assets/css/style.css?v=5" rel="stylesheet">
-</head>
+</head>

_includes/nav.html

@@ -1,110 +1,113 @@
 <nav id="navbar" class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark">
-	<div class="container">
+  <div class="container">
-		<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-			<span class="navbar-toggler-icon"></span>
+      <span class="navbar-toggler-icon"></span>
-		</button>
+    </button>
 
-		<div class="collapse navbar-collapse" id="navbarSupportedContent">
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
-			<ul class="navbar-nav mr-auto">
+      <ul class="navbar-nav mr-auto">
-				<li class="nav-item">
+        <li class="nav-item">
-					<a class="nav-link" href="/index.html"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a>
+          <a class="nav-link" href="/index.html"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a>
-				</li>
+        </li>
-				<li class="nav-item dropdown">
+        <li class="nav-item dropdown">
-					<a class="nav-link dropdown-toggle" href="/providers/" id="providerDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <a class="nav-link dropdown-toggle" href="/providers/" id="providerDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-						Provider
+            Provider
-					</a>
+          </a>
-					<div class="dropdown-menu" aria-labelledby="providerDropdown">
+          <div class="dropdown-menu" aria-labelledby="providerDropdown">
-						<a class="dropdown-item" href="/providers/#ukusa"><i class="fab fa-creative-commons-nc fa-fw"></i> Avoid US & UK services</a>
+            <a class="dropdown-item" href="/providers/#ukusa"><i class="fab fa-creative-commons-nc fa-fw"></i> Avoid US & UK services</a>
-						<a class="dropdown-item" href="/providers/cloud-storage/"><i class="fas fa-cloud fa-fw"></i> Cloud Storage</a>
+            <a class="dropdown-item" href="/providers/cloud-storage/"><i class="fas fa-cloud fa-fw"></i> Cloud Storage</a>
-						<a class="dropdown-item" href="/providers/dns/"><i class="fa fa-tasks fa-fw"></i> DNS</a>
+            <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/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/hosting/"><i class="fas fa-database fa-fw"></i> Hosting</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/paste/"><i class="fas fa-paste fa-fw"></i> Pastebins</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/search-engines/"><i class="fab fa-searchengin fa-fw"></i> Search Engines</a>
-						<a class="dropdown-item" href="/providers/vpn/"><i class="far fa-eye-slash fa-fw"></i> VPN</a>
+            <a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt fa-fw"></i> Social Networks</a>
-					</div>
+            <a class="dropdown-item" href="/providers/social-news-aggregator/"><i class="far fa-newspaper fa-fw"></i> Social News Aggregators</a>
-				</li>
+            <a class="dropdown-item" href="/providers/vpn/"><i class="far fa-eye-slash fa-fw"></i> VPN</a>
-				<li class="nav-item dropdown">
+          </div>
-					<a class="nav-link dropdown-toggle" href="/browsers/" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        </li>
-						Browser
+        <li class="nav-item dropdown">
-					</a>
+          <a class="nav-link dropdown-toggle" href="/browsers/" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-					<div class="dropdown-menu" aria-labelledby="browserDropdown">
+            Browser
-						<a class="dropdown-item" href="/browsers/#fingerprint"><i class="fas fa-fingerprint fa-fw"></i> Fingerprint</a>
+          </a>
-						<a class="dropdown-item" href="/browsers/#addons"><i class="far fa-list-alt fa-fw"></i> Firefox Privacy Add-ons</a>
+          <div class="dropdown-menu" aria-labelledby="browserDropdown">
-						<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/#fingerprint"><i class="fas fa-fingerprint fa-fw"></i> Fingerprint</a>
-						<a class="dropdown-item" href="/browsers/#browser"><i class="fas fa-check fa-fw"></i> Recommendation</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/#webrtc"><i class="far fa-eye fa-fw"></i> WebRTC IP Leak</a>
+            <a class="dropdown-item" href="/browsers/#about_config"><i class="fas fa-wrench fa-fw"></i> Privacy Related Tweaks</a>
-					</div>
+            <a class="dropdown-item" href="/browsers/#browser"><i class="fas fa-check fa-fw"></i> Recommendation</a>
-				</li>
+            <a class="dropdown-item" href="/browsers/#webrtc"><i class="far fa-eye fa-fw"></i> WebRTC IP Leak</a>
-				<li class="nav-item dropdown">
+          </div>
-					<a class="nav-link dropdown-toggle" href="/software/" id="softwareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        </li>
-						Software
+        <li class="nav-item dropdown">
-					</a>
+          <a class="nav-link dropdown-toggle" href="/software/" id="softwareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-					<div class="dropdown-menu" aria-labelledby="softwareDropdown">
+            Software
-						<a class="dropdown-item" href="/software/notebooks/"><i class="far fa-sticky-note fa-fw"></i> Digital Notebook</a>
+          </a>
-						<a class="dropdown-item" href="/software/email/#messaging"><i class="fas fa-random fa-fw"></i> Email Alternatives</a>
+          <div class="dropdown-menu" aria-labelledby="softwareDropdown">
-						<a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> Email Clients</a>
+            <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/encryption-tools/"><i class="fas fa-lock fa-fw"></i> File Encryption</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/file-sharing/"><i class="fas fa-file-export fa-fw"></i> File Sharing</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/im/"><i class="fab fa-telegram-plane fa-fw"></i> Instant Messenger</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/passwords/"><i class="fas fa-user-lock fa-fw"></i> Password Manager</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/productivity/"><i class="fas fa-briefcase fa-fw"></i> Productivity Tools</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/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</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/networks/"><i class="fas fa-user-secret fa-fw"></i> Self-contained Networks</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/cloud/"><i class="fas fa-hdd fa-fw"></i> Self-Hosted Cloud Server</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/voip/"><i class="fas fa-phone fa-fw"></i> Video & Voice Messenger</a>
+            <a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</a>
-					</div>
+            <a class="dropdown-item" href="/software/networks/"><i class="fas fa-user-secret fa-fw"></i> Self-contained Networks</a>
-				</li>
+            <a class="dropdown-item" href="/software/cloud/"><i class="fas fa-hdd fa-fw"></i> Self-Hosted Cloud Server</a>
-				<li class="nav-item dropdown">
+          </div>
-					<a class="nav-link dropdown-toggle" href="/operating-systems/" id="osDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        </li>
-						OS
+        <li class="nav-item dropdown">
-					</a>
+          <a class="nav-link dropdown-toggle" href="/operating-systems/" id="osDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-					<div class="dropdown-menu" aria-labelledby="osDropdown">
+            OS
-						<a class="dropdown-item" href="/operating-systems/#aaddons"><i class="fas fa-th fa-fw"></i> Android Privacy Add-ons</a>
+          </a>
-						<a class="dropdown-item" href="/operating-systems/#win10"><i class="far fa-thumbs-down fa-fw"></i> Don't use Windows 10</a>
+          <div class="dropdown-menu" aria-labelledby="osDropdown">
-						<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/#aaddons"><i class="fas fa-th fa-fw"></i> Android Privacy Add-ons</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/#win10"><i class="far fa-thumbs-down fa-fw"></i> Don't use Windows 10</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/#live_os"><i class="fas fa-compact-disc fa-fw"></i> Live CD OS</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/#mobile_os"><i class="fas fa-mobile-alt fa-fw"></i> Mobile OS</a>
-					</div>
+            <a class="dropdown-item" href="/operating-systems/#os"><i class="fas fa-th-large fa-fw"></i> PC OS</a>
-				</li>
+            <a class="dropdown-item" href="/operating-systems/#firmware"><i class="fas fa-signal fa-fw"></i> Router Firmware</a>
-				<li class="nav-item">
+          </div>
-					<a class="nav-link" href="/index.html#participate">Participate</a>
+        </li>
-				</li>
+        <li class="nav-item">
-			</ul>
+          <a class="nav-link" href="/index.html#participate">Participate</a>
-			<ul class="navbar-nav">
+        </li>
-				<li class="nav-item dropdown">
+      </ul>
-					<a class="nav-link dropdown-toggle" href="#" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="fas fa-language text-danger"></i>
+      <ul class="navbar-nav">
-						Language
+        <li class="nav-item dropdown">
-					</a>
+          <a class="nav-link dropdown-toggle" href="#" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="fas fa-language text-danger"></i>
-					<div class="dropdown-menu" aria-labelledby="servicesDropdown">
+            Language
-						<a href="https://privacytools.twngo.xyz/" class="dropdown-item">繁體中文</a>
+          </a>
-						<a href="https://victorhck.gitlab.io/privacytools-es/" class="dropdown-item">Español</a>
+          <div class="dropdown-menu" aria-labelledby="servicesDropdown">
-						<a href="https://www.privacidade.digital/" class="dropdown-item">Português</a>
+            <a href="https://privacytools.twngo.xyz/" class="dropdown-item">繁體中文</a>
-						<a href="https://privacytools.it-sec.rocks/" class="dropdown-item">Deutsch</a>
+            <a href="https://victorhck.gitlab.io/privacytools-es/" class="dropdown-item">Español</a>
-						<a href="https://privacytools-it.github.io/" class="dropdown-item">Italiano</a>
+            <a href="https://pl.privacytools.io/" class="dropdown-item">Polski</a>
-						<a href="https://privacytools.ru" class="dropdown-item">Русский</a>
+            <a href="https://www.privacidade.digital/" class="dropdown-item">Português</a>
-						<a href="https://privacytools.dreads-unlock.fr" class="dropdown-item">Français</a>
+            <a href="https://privacytools.it-sec.rocks/" class="dropdown-item">Deutsch</a>
-					</div>
+            <a href="https://privacytools-it.github.io/" class="dropdown-item">Italiano</a>
-				</li>
+            <a href="https://privacytools.ru" class="dropdown-item">Русский</a>
-				<li class="nav-item dropdown">
+            <a href="https://privacytools.dreads-unlock.fr" class="dropdown-item">Français</a>
-					<a class="nav-link dropdown-toggle" href="/services/" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          </div>
-						Services
+        </li>
-					</a>
+        <li class="nav-item dropdown">
-					<div class="dropdown-menu" aria-labelledby="servicesDropdown">
+          <a class="nav-link dropdown-toggle" href="/services/" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-						<a class="dropdown-item" href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-fw"></i> Discourse - Forum</a>
+            Services
-						<a class="dropdown-item" href="https://git.privacytools.io/"><i class="fab fa-git fa-fw"></i> Gitea - Git-Repository Manager</a>
+          </a>
-						<a class="dropdown-item" href="https://social.privacytools.io/"><i class="fas fa-retweet fa-fw"></i> Mastodon - Social Network</a>
+          <div class="dropdown-menu" aria-labelledby="servicesDropdown">
-						<a class="dropdown-item" href="https://chat.privacytools.io/"><i class="fas fa-comment fa-fw"></i> Matrix - Federated Chat</a>
+            <a class="dropdown-item" href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-fw"></i> Discourse - Forum</a>
-						<a class="dropdown-item" href="https://bin.privacytools.io/"><i class="fas fa-clipboard fa-fw"></i> PrivateBin - Encrypted Pastebin</a>
+            <a class="dropdown-item" href="https://git.privacytools.io/"><i class="fab fa-git fa-fw"></i> Gitea - Git-Repository Manager</a>
-						<a class="dropdown-item" href="https://search.privacytools.io/"><i class="fas fa-search fa-fw"></i> Searx - Privacy Friendly Search</a>
+            <a class="dropdown-item" href="https://social.privacytools.io/"><i class="fas fa-retweet fa-fw"></i> Mastodon - Social Network</a>
-						<a class="dropdown-item" href="https://write.privacytools.io/"><i class="fas fa-pen-alt fa-fw"></i> Write Freely - Federated Blog</a>
+            <a class="dropdown-item" href="https://chat.privacytools.io/"><i class="fas fa-comment fa-fw"></i> Matrix - Federated Chat</a>
-					</div>
+            <a class="dropdown-item" href="https://bin.privacytools.io/"><i class="fas fa-clipboard fa-fw"></i> PrivateBin - Encrypted Pastebin</a>
-				</li>
+            <a class="dropdown-item" href="https://search.privacytools.io/"><i class="fas fa-search fa-fw"></i> Searx - Privacy Friendly Search</a>
-				<li class="nav-item">
+            <a class="dropdown-item" href="https://write.privacytools.io/"><i class="fas fa-pen-alt fa-fw"></i> Write Freely - Federated Blog</a>
-					<a class="nav-link" href="/donate/">Donate <i class="fas fa-heart text-danger"></i></a>
+          </div>
-				</li>
+        </li>
-			</ul>
+        <li class="nav-item">
-		</div>
+          <a class="nav-link" href="/donate/">Donate <i class="fas fa-heart text-danger"></i></a>
-	</div>
+        </li>
-</nav>
+      </ul>
+    </div>
+  </div>
+</nav>

_includes/panel.html

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

_includes/scripts.html

@@ -3,15 +3,15 @@
 <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();
+    $("[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")) {
+    if ($(".navbar-toggler").is(":visible")) {
-			$('.navbar-collapse').collapse('toggle');
+      $('.navbar-collapse').collapse('toggle');
-		}
+    }
-	});
+  });
 </script>
 
 <!--
@@ -22,22 +22,16 @@
 -->
 
 <script type="text/javascript">
-	var _paq = window._paq || [];
+  var _paq = window._paq || [];
-	/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-	_paq.push(['trackPageView']);
+  _paq.push(['trackPageView']);
-	_paq.push(['enableLinkTracking']);
+  _paq.push(['enableLinkTracking']);
-	(function() {
+  (function() {
-		var u = "https://stats.privacytools.io/";
+    var u="https://stats.privacytools.io/";
-		_paq.push(['setTrackerUrl', u + 'matomo.php']);
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
-		_paq.push(['setSiteId', '1']);
+    _paq.push(['setSiteId', '1']);
-		var d = document,
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-			g = d.createElement('script'),
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-			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

@@ -1,56 +1,39 @@
 <h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> Android Privacy Add-ons</h1>
 
 <div class="alert alert-success" role="alert">
-	<strong>Improve your privacy with these add-ons for Android.</strong>
+  <strong>Improve your privacy with these add-ons for Android.</strong>
 </div>
 
 <div class="container-fluid">
 
-	<div class="row mb-2">
+  <div class="row mb-2">
-		<div class="col-lg-3 col-sm-12">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
-			<img src="/assets/img/addons/Blokada.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Blokada">
+      <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>
-		<div class="col">
+    <div class="col">
-			<h3>Block ads with <a href="https://blokada.org/">Blokada</a></h3>
+    <h3>Block ads with <a href="https://blokada.org/">Blokada</a></h3>
-			<p><strong>Blokada</strong> works across all of your apps, not only the browser. It doesn't require root, supports both wifi and mobile networks, and is perfectly safe and simple to use. Just turn it on, and it will do the job silently!
+    <p><strong>Blokada</strong> works across all of your apps, not only the browser. It doesn't require root, supports both wifi and mobile networks, and is perfectly safe and simple to use. Just turn it on, and it will do the job silently!
-		</div>
+    </div>
-	</div>
+  </div>
 
-	<div class="row mb-2">
+  <div class="row mb-2">
-		<div class="col-lg-3 col-sm-12">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
-			<img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
+      <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>
-		<div class="col">
+    <div class="col">
-			<h3>Control your traffic with <a href="https://www.netguard.me/">NetGuard</a></h3>
+    <h3>Control your traffic with <a href="https://www.netguard.me/">NetGuard</a></h3>
-			<p><strong>NetGuard</strong> provides simple and advanced ways to block certain apps' access to the internet without the help of root privileges. Applications and addresses can individually be allowed or denied access to your Wi-Fi and/or mobile connection, allowing you to control which apps are able to call home or not.
+    <p><strong>NetGuard</strong> provides simple and advanced ways to block certain apps' access to the internet without the help of root privileges. Applications and addresses can individually be allowed or denied access to your Wi-Fi and/or mobile connection, allowing you to control which apps are able to call home or not.
-		</div>
+    </div>
-	</div>
+  </div>
 
-	<div class="row mb-2">
+  <div class="row mb-2">
-		<div class="col-lg-3 col-sm-12">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
-			<img src="/assets/img/addons/Orbot.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Orbot">
+      <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>
-		<div class="col">
+    <div class="col">
-			<h3>Tor for Android with <a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>
+    <h3>Tor for Android with <a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>
-			<p><strong>Orbot</strong> is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. <strong>Root Mode:</strong> Orbot can be configured to transparently proxy all of your Internet traffic through Tor. You can also choose which specific apps you want to use through Tor.
+    <p><strong>Orbot</strong> is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. <strong>Root Mode:</strong> Orbot can be configured to transparently proxy all of your Internet traffic through Tor. You can also choose which specific apps you want to use through Tor.
-		</div>
+    </div>
-	</div>
+  </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> Excellent Firefox Privacy Add-ons</h1>
 
 <div class="alert alert-primary" role="alert">
-	<strong>Improve your privacy with these excellent Firefox 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"
-github="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
+git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
 firefox=""
 chrome=""
 %}
@@ -97,7 +97,7 @@ chrome=""
 <h2>For Experts Only</h2>
 
 <div class="alert alert-warning" role="alert">
-	<strong>These addons require quite a lot of interaction from the user. Some sites will not work properly until you have configured the add-ons.</strong>
+  <strong>These addons require quite a lot of interaction from the user. Some sites will not work properly until you have configured the add-ons.</strong>
 </div>
 
 {% include cardv2.html
@@ -121,4 +121,4 @@ forum="https://forum.privacytools.io/t/discussion-noscript-security-suite/272"
 github="https://github.com/hackademix/noscript"
 firefox=""
 chrome=""
-%}
+%}

_includes/sections/browser-fingerprint.html

@@ -1,7 +1,7 @@
 <h1 id="fingerprint" class="anchor"><a href="#fingerprint"><i class="fas fa-link anchor-icon"></i></a> Browser Fingerprint - Is your browser configuration unique?</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong>Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.</strong>
+  <strong>Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.</strong>
 </div>
 
 <img src="/assets/img/layout/browser-fingerprint.jpg" width="439" height="350" class="img-fluid float-right" alt="Fingerprint image" style="margin-left:20px;">
@@ -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
+  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>
@@ -27,7 +27,7 @@
 <h3>Related Information</h3>
 
 <ul>
-	<li><a href="https://panopticlick.eff.org/static/browser-uniqueness.pdf">How Unique Is Your Web Browser? Peter Eckersley, EFF.</a></li>
+  <li><a href="https://panopticlick.eff.org/static/browser-uniqueness.pdf">How Unique Is Your Web Browser? Peter Eckersley, EFF.</a></li>
-	<li><a href="#addons"><i class="fas fa-link"></i> Our Firefox privacy add-ons section.</a></li>
+  <li><a href="#addons"><i class="fas fa-link"></i> Our Firefox privacy add-ons section.</a></li>
-	<li><a href="https://www.browserleaks.com/">BrowserLeaks.com</a> - Web browser security testing tools, that tell you what exactly personal identity data may be leaked without any permissions when you surf the Internet.</li>
+  <li><a href="https://www.browserleaks.com/">BrowserLeaks.com</a> - Web browser security testing tools, that tell you what exactly personal identity data may be leaked without any permissions when you surf the Internet.</li>
-</ul>
+</ul>

_includes/sections/browser-recommendation.html

@@ -17,9 +17,9 @@ bsd=""
 %}
 
 {% include cardv2.html
-title="Tor Browser - For Experts"
+title="Tor Browser - for anonymity"
 image="/assets/img/tools/Tor-Browser.png"
-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>'
+description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
 website="https://www.torproject.org/"
 forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
 git="https://trac.torproject.org/projects/tor"
@@ -43,4 +43,4 @@ mac=""
 linux=""
 android=""
 ios=""
-%}
+%}

_includes/sections/browser-tweaks.html

@@ -5,143 +5,161 @@
 <h3>Preparation:</h3>
 
 <ol>
-	<li>Enter "about:config" in the firefox address bar and press enter.</li>
+  <li>Enter "about:config" in the firefox address bar and press enter.</li>
-	<li>Press the button "I'll be careful, I promise!"</li>
+  <li>Press the button "I'll be careful, I promise!"</li>
-	<li>Follow the instructions below...</li>
+  <li>Follow the instructions below...</li>
 </ol>
 
 <h3>Getting started:</h3>
 
 <dl class="long-string-list">
-	<dt>privacy.firstparty.isolate = true</dt>
+  <dt>privacy.firstparty.isolate = true</dt>
-	<dd>A result of the <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> effort, this preference isolates all browser identifier sources (e.g. cookies) to the first party domain, with the goal of preventing tracking across different domains. (Don't do this if you are using the Firefox Addon "Cookie AutoDelete" with Firefox v58 or below.)</dd>
+  <dd>A result of the <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> effort, this preference isolates all browser identifier sources (e.g. cookies) to the first party domain, with the goal of preventing tracking across different domains. (Don't do this if you are using the Firefox Addon "Cookie AutoDelete" with Firefox v58 or below.)</dd>
 
-	<dt>privacy.resistFingerprinting = true</dt>
+  <dt>privacy.resistFingerprinting = true</dt>
-	<dd>A result of the <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> effort, this preference makes Firefox more resistant to browser fingerprinting.</dd>
+  <dd>A result of the <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> effort, this preference makes Firefox more resistant to browser fingerprinting.</dd>
 
-	<dt>privacy.trackingprotection.fingerprinting.enabled = true</dt>
+  <dt>privacy.trackingprotection.fingerprinting.enabled = true</dt>
-	<dd>[FF67+] Blocks Fingerprinting</dd>
+  <dd>[FF67+] Blocks Fingerprinting</dd>
 
-	<dt>privacy.trackingprotection.cryptomining.enabled = true</dt>
+  <dt>privacy.trackingprotection.cryptomining.enabled = true</dt>
-	<dd>[FF67+] Blocks CryptoMining</dd>
+  <dd>[FF67+] Blocks CryptoMining</dd>
 
-	<dt>privacy.trackingprotection.enabled = true</dt>
+  <dt>privacy.trackingprotection.enabled = true</dt>
-	<dd>This is Mozilla's new built-in tracking protection. It uses Disconnect.me filter list, which is redundant if you are already using uBlock Origin 3rd party filters, therefore you should set it to false if you are using the add-on functionalities.</dd>
+  <dd>This is Mozilla's new built-in tracking protection. It uses Disconnect.me filter list, which is redundant if you are already using uBlock Origin 3rd party filters, therefore you should set it to false if you are using the add-on functionalities.</dd>
 
-	<dt>browser.cache.offline.enable = false</dt>
+  <dt>browser.cache.offline.enable = false</dt>
-	<dd>Disables offline cache.</dd>
+  <dd>Disables offline cache.</dd>
 
-	<dt>browser.safebrowsing.malware.enabled = false</dt>
+  <dt>browser.safebrowsing.malware.enabled = false</dt>
-	<dd>Disable Google Safe Browsing malware checks. Security risk, but privacy improvement.</dd>
+  <dd>Disable Google Safe Browsing malware checks. Security risk, but privacy improvement.</dd>
 
-	<dt>browser.safebrowsing.phishing.enabled = false</dt>
+  <dt>browser.safebrowsing.phishing.enabled = false</dt>
-	<dd>Disable Google Safe Browsing and phishing protection. Security risk, but privacy improvement.</dd>
+  <dd>Disable Google Safe Browsing and phishing protection. Security risk, but privacy improvement.</dd>
 
-	<dt>browser.send_pings = false</dt>
+  <dt>browser.send_pings = false</dt>
-	<dd>The attribute would be useful for letting websites track visitors' clicks.</dd>
+  <dd>The attribute would be useful for letting websites track visitors' clicks.</dd>
 
-	<dt>browser.sessionstore.max_tabs_undo = 0</dt>
+  <dt>browser.sessionstore.max_tabs_undo = 0</dt>
-	<dd>Even with Firefox set to not remember history, your closed tabs are stored temporarily at Menu -&gt; History -&gt; Recently Closed Tabs.</dd>
+  <dd>Even with Firefox set to not remember history, your closed tabs are stored temporarily at Menu -&gt; History -&gt; Recently Closed Tabs.</dd>
 
-	<dt>browser.urlbar.speculativeConnect.enabled = false</dt>
+  <dt>browser.urlbar.speculativeConnect.enabled = false</dt>
-	<dd>Disable preloading of autocomplete URLs. Firefox preloads URLs that autocomplete when a user types into the address bar, which is a concern if URLs are suggested that the user does not want to connect to. <a href="https://www.ghacks.net/2017/07/24/disable-preloading-firefox-autocomplete-urls/">Source</a></dd>
+  <dd>Disable preloading of autocomplete URLs. Firefox preloads URLs that autocomplete when a user types into the address bar, which is a concern if URLs are suggested that the user does not want to connect to. <a href="https://www.ghacks.net/2017/07/24/disable-preloading-firefox-autocomplete-urls/">Source</a></dd>
 
-	<dt>dom.battery.enabled = false</dt>
+  <dt>dom.battery.enabled = false</dt>
-	<dd>The battery status of your device could be tracked.</dd>
+  <dd>The battery status of your device could be tracked.</dd>
 
-	<dt>dom.event.clipboardevents.enabled = false</dt>
+  <dt>dom.event.clipboardevents.enabled = false</dt>
-	<dd>Disable that websites can get notifications if you copy, paste, or cut something from a web page, and it lets them know which part of the page had been selected.</dd>
+  <dd>Disable that websites can get notifications if you copy, paste, or cut something from a web page, and it lets them know which part of the page had been selected.</dd>
 
-	<dt>geo.enabled = false</dt>
+  <dt>geo.enabled = false</dt>
-	<dd>Disables geolocation.</dd>
+  <dd>Disables geolocation.</dd>
 
-	<dt>media.eme.enabled = false</dt>
+  <dt>media.eme.enabled = false</dt>
-	<dd>
+  <dd>
-		<p>Disables playback of DRM-controlled HTML5 content, which, if enabled, automatically downloads the Widevine Content Decryption Module provided by Google Inc. <a href="https://support.mozilla.org/kb/enable-drm#w_opt-out-of-cdm-playback-uninstall-cdms-and-stop-all-cdm-downloads">Details</a></p>
+  <p>Disables playback of DRM-controlled HTML5 content, which, if enabled, automatically downloads the Widevine Content Decryption Module provided by Google Inc. <a href="https://support.mozilla.org/kb/enable-drm#w_opt-out-of-cdm-playback-uninstall-cdms-and-stop-all-cdm-downloads">Details</a></p>
-		<p>DRM-controlled content that requires the Adobe Flash or Microsoft Silverlight NPAPI plugins will still play, if installed and enabled in Firefox.</p>
+  <p>DRM-controlled content that requires the Adobe Flash or Microsoft Silverlight NPAPI plugins will still play, if installed and enabled in Firefox.</p>
-	</dd>
+  </dd>
 
-	<dt>media.gmp-widevinecdm.enabled = false</dt>
+  <dt>media.gmp-widevinecdm.enabled = false</dt>
-	<dd>Disables the Widevine Content Decryption Module provided by Google Inc., used for the playback of DRM-controlled HTML5 content. <a href="https://support.mozilla.org/kb/enable-drm#w_disable-the-google-widevine-cdm-without-uninstalling">Details</a></dd>
+  <dd>Disables the Widevine Content Decryption Module provided by Google Inc., used for the playback of DRM-controlled HTML5 content. <a href="https://support.mozilla.org/kb/enable-drm#w_disable-the-google-widevine-cdm-without-uninstalling">Details</a></dd>
 
-	<dt>media.navigator.enabled = false</dt>
+  <dt>media.navigator.enabled = false</dt>
-	<dd>Websites can track the microphone and camera status of your device.</dd>
+  <dd>Websites can track the microphone and camera status of your device.</dd>
 
-	<dt>network.cookie.cookieBehavior = 1</dt>
+  <dt>network.cookie.cookieBehavior = 1</dt>
-	<dd>
+  <dd>
-		Disable cookies
+  Disable cookies
-		<ul>
+  <ul>
-			<li>0 = Accept all cookies by default</li>
+    <li>0 = Accept all cookies by default</li>
-			<li>1 = Only accept from the originating site (block third-party cookies)</li>
+    <li>1 = Only accept from the originating site (block third-party cookies)</li>
-			<li>2 = Block all cookies by default</li>
+    <li>2 = Block all cookies by default</li>
-		</ul>
+  </ul>
-	</dd>
+  </dd>
 
-	<dt>network.cookie.lifetimePolicy = 2</dt>
+  <dt>network.cookie.lifetimePolicy = 2</dt>
-	<dd>
+  <dd>
-		cookies are deleted at the end of the session
+  cookies are deleted at the end of the session
-		<ul>
+  <ul>
-			<li>0 = Accept cookies normally</li>
+    <li>0 = Accept cookies normally</li>
-			<li>1 = Prompt for each cookie</li>
+    <li>1 = Prompt for each cookie</li>
-			<li>2 = Accept for current session only</li>
+    <li>2 = Accept for current session only</li>
-			<li>3 = Accept for N days</li>
+    <li>3 = Accept for N days</li>
-		</ul>
+  </ul>
-	</dd>
+  </dd>
 
-	<dt>network.http.referer.trimmingPolicy = 2</dt>
+  <dt>network.http.referer.trimmingPolicy = 2</dt>
-	<dd>
+  <dd>
-		Send only the scheme, host, and port in the <code>Referer</code> header
+  Send only the scheme, host, and port in the <code>Referer</code> header
-		<ul>
+  <ul>
-			<li>0 = Send the full URL in the <code>Referer</code> header</li>
+    <li>0 = Send the full URL in the <code>Referer</code> header</li>
-			<li>1 = Send the URL without its query string in the <code>Referer</code> header</li>
+    <li>1 = Send the URL without its query string in the <code>Referer</code> header</li>
-			<li>2 = Send only the scheme, host, and port in the <code>Referer</code> header</li>
+    <li>2 = Send only the scheme, host, and port in the <code>Referer</code> header</li>
-		</ul>
+  </ul>
-	</dd>
+  </dd>
 
-	<dt>network.http.referer.XOriginPolicy = 2</dt>
+  <dt>network.http.referer.XOriginPolicy = 2</dt>
-	<dd>
+  <dd>
-		Only send <code>Referer</code> header when the full hostnames match. (Note: if you notice significant breakage, you might try <code>1</code> combined with an <code>XOriginTrimmingPolicy</code> tweak below.) <a href="https://feeding.cloud.geek.nz/posts/tweaking-referrer-for-privacy-in-firefox/">Source</a>
+  Only send <code>Referer</code> header when the full hostnames match. (Note: if you notice significant breakage, you might try <code>1</code> combined with an <code>XOriginTrimmingPolicy</code> tweak below.) <a href="https://feeding.cloud.geek.nz/posts/tweaking-referrer-for-privacy-in-firefox/">Source</a>
-		<ul>
+  <ul>
-			<li>0 = Send <code>Referer</code> in all cases</li>
+    <li>0 = Send <code>Referer</code> in all cases</li>
-			<li>1 = Send <code>Referer</code> to same eTLD sites</li>
+    <li>1 = Send <code>Referer</code> to same eTLD sites</li>
-			<li>2 = Send <code>Referer</code> only when the full hostnames match</li>
+    <li>2 = Send <code>Referer</code> only when the full hostnames match</li>
-		</ul>
+  </ul>
-	</dd>
+  </dd>
 
-	<dt>network.http.referer.XOriginTrimmingPolicy = 2</dt>
+  <dt>network.http.referer.XOriginTrimmingPolicy = 2</dt>
-	<dd>
+  <dd>
-		When sending <code>Referer</code> across origins, only send scheme, host, and port in the <code>Referer</code> header of cross-origin requests. <a href="https://feeding.cloud.geek.nz/posts/tweaking-referrer-for-privacy-in-firefox/">Source</a>
+  When sending <code>Referer</code> across origins, only send scheme, host, and port in the <code>Referer</code> header of cross-origin requests. <a href="https://feeding.cloud.geek.nz/posts/tweaking-referrer-for-privacy-in-firefox/">Source</a>
-		<ul>
+  <ul>
-			<li>0 = Send full url in <code>Referer</code></li>
+    <li>0 = Send full url in <code>Referer</code></li>
-			<li>1 = Send url without query string in <code>Referer</code></li>
+    <li>1 = Send url without query string in <code>Referer</code></li>
-			<li>2 = Only send scheme, host, and port in <code>Referer</code></li>
+    <li>2 = Only send scheme, host, and port in <code>Referer</code></li>
-		</ul>
+  </ul>
-	</dd>
+  </dd>
 
-	<dt>webgl.disabled = true</dt>
+  <dt>network.trr.mode = 2</dt>
-	<dd>WebGL is a potential security risk. <a href="https://security.stackexchange.com/questions/13799/is-webgl-a-security-concern">Source</a></dd>
+  <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>browser.sessionstore.privacy_level = 2</dt>
+  <dt>network.trr.uri = CHANGEME</dt>
-	<dd>
+  <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>
-		This preference controls when to store extra information about a session: contents of forms, scrollbar positions, cookies, and POST data. <a href="http://kb.mozillazine.org/Browser.sessionstore.privacy_level">Details</a>
-		<ul>
-			<li>0 = Store extra session data for any site. (Default starting with Firefox 4.)</li>
-			<li>1 = Store extra session data for unencrypted (non-HTTPS) sites only. (Default before Firefox 4.)</li>
-			<li>2 = Never store extra session data.</li>
-		</ul>
-	</dd>
 
-	<dt>extensions.pocket.enabled = false</dt>
+  <dt>network.security.esni.enabled = true</dt>
-	<dd>Disables Pocket completely.</dd>
+  <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>network.IDN_show_punycode = true</dt>
+  <dt>webgl.disabled = true</dt>
-	<dd>Not rendering IDNs as their Punycode equivalent leaves you open to phishing attacks that can be very difficult to notice. <a href="https://krebsonsecurity.com/2018/03/look-alike-domains-and-visual-confusion/#more-42636">Source</a></dd>
+  <dd>WebGL is a potential security risk. <a href="https://security.stackexchange.com/questions/13799/is-webgl-a-security-concern">Source</a></dd>
 
-	<dt>extensions.blocklist.url = https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%20/%20/</dt>
+  <dt>browser.sessionstore.privacy_level = 2</dt>
-	<dd>
+  <dd>
-		<p>Limit the amount of identifiable information sent when requesting the Mozilla harmful extension blocklist.
+  This preference controls when to store extra information about a session: contents of forms, scrollbar positions, cookies, and POST data. <a href="http://kb.mozillazine.org/Browser.sessionstore.privacy_level">Details</a>
-			<p>Optionally, the blocklist can be disabled entirely by setting <code>extensions.blocklist.enabled</code> to false for increased privacy, but decreased security. <a href="https://old.reddit.com/r/privacytoolsIO/comments/9uqeew/firefox_tip_sanitize_firefox_blocklist_url_so_it/">Source</a></p>
+  <ul>
-	</dd>
+    <li>0 = Store extra session data for any site. (Default starting with Firefox 4.)</li>
+    <li>1 = Store extra session data for unencrypted (non-HTTPS) sites only. (Default before Firefox 4.)</li>
+    <li>2 = Never store extra session data.</li>
+  </ul>
+  </dd>
+
+  <dt>extensions.pocket.enabled = false</dt>
+  <dd>Disables Pocket completely.</dd>
+
+  <dt>network.IDN_show_punycode = true</dt>
+  <dd>Not rendering IDNs as their Punycode equivalent leaves you open to phishing attacks that can be very difficult to notice. <a href="https://krebsonsecurity.com/2018/03/look-alike-domains-and-visual-confusion/#more-42636">Source</a></dd>
+
+  <dt>extensions.blocklist.url = https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%20/%20/</dt>
+  <dd>
+  <p>Limit the amount of identifiable information sent when requesting the Mozilla harmful extension blocklist.
+  <p>Optionally, the blocklist can be disabled entirely by setting <code>extensions.blocklist.enabled</code> to false for increased privacy, but decreased security. <a href="https://old.reddit.com/r/privacytoolsIO/comments/9uqeew/firefox_tip_sanitize_firefox_blocklist_url_so_it/">Source</a></p>
+  </dd>
 </dl>
 
 <h3>Firefox user.js Templates</h3>
@@ -154,8 +172,8 @@
 <h3>Related Information</h3>
 
 <ul>
-	<li><a href="https://ffprofile.com/">ffprofile.com</a> - Helps you to create a Firefox profile with the defaults you like.</li>
+  <li><a href="https://ffprofile.com/">ffprofile.com</a> - Helps you to create a Firefox profile with the defaults you like.</li>
-	<li><a href="http://kb.mozillazine.org/Category:Security_and_privacy-related_preferences">mozillazine.org</a> - Security and privacy-related preferences. </li>
+  <li><a href="http://kb.mozillazine.org/Category:Security_and_privacy-related_preferences">mozillazine.org</a> - Security and privacy-related preferences. </li>
-	<li><a href="https://addons.mozilla.org/firefox/addon/privacy-settings/">Privacy Settings</a> - A Firefox add-on to alter built-in privacy settings easily with a toolbar panel.</li>
+  <li><a href="https://addons.mozilla.org/firefox/addon/privacy-settings/">Privacy Settings</a> - A Firefox add-on to alter built-in privacy settings easily with a toolbar panel.</li>
-	<li><a href="https://12bytes.org/articles/tech/firefox/the-firefox-privacy-guide-for-dummies/">Firefox Privacy Guide For Dummies</a> - Guide on ways (already discussed and others) to improve your privacy and safety on Firefox.</li>
+  <li><a href="https://12bytes.org/articles/tech/firefox/the-firefox-privacy-guide-for-dummies/">Firefox Privacy Guide For Dummies</a> - Guide on ways (already discussed and others) to improve your privacy and safety on Firefox.</li>
-</ul>
+</ul>

_includes/sections/browser-webrtc.html

@@ -1,13 +1,13 @@
 <h1 id="webrtc" class="anchor"><a href="#webrtc"><i class="fas fa-link anchor-icon"></i></a> WebRTC IP Leak Test - Is your IP address leaking?</h1>
 
 <div class="alert alert-danger" role="alert">
-	<strong>WebRTC is a new communication protocol that relies on JavaScript that can leak your actual IP address from behind your VPN.</strong>
+  <strong>WebRTC is a new communication protocol that relies on JavaScript that can leak your actual IP address from behind your VPN.</strong>
 </div>
 
 <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>
@@ -16,26 +16,26 @@
 <p><strong>Explained:</strong></p>
 
 <ol class="long-string-list">
-	<li>Enter "about:config" in the firefox address bar and press enter.</li>
+  <li>Enter "about:config" in the firefox address bar and press enter.</li>
-	<li>Press the button "I'll be careful, I promise!"</li>
+  <li>Press the button "I'll be careful, I promise!"</li>
-	<li>Search for "media.peerconnection.enabled"</li>
+  <li>Search for "media.peerconnection.enabled"</li>
-	<li>Double click the entry, the column "Value" should now be "false"</li>
+  <li>Double click the entry, the column "Value" should now be "false"</li>
-	<li>Done. Do the WebRTC leak test again.</li>
+  <li>Done. Do the WebRTC leak test again.</li>
 </ol>
 
 <p>If you want to make sure every single WebRTC related setting is really disabled change these settings:</p>
 
 <ol class="long-string-list">
-	<li>media.peerconnection.turn.disable = true</li>
+  <li>media.peerconnection.turn.disable = true</li>
-	<li>media.peerconnection.use_document_iceservers = false</li>
+  <li>media.peerconnection.use_document_iceservers = false</li>
-	<li>media.peerconnection.video.enabled = false</li>
+  <li>media.peerconnection.video.enabled = false</li>
-	<li>media.peerconnection.identity.timeout = 1</li>
+  <li>media.peerconnection.identity.timeout = 1</li>
 </ol>
 
 <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>
@@ -44,4 +44,4 @@
 
 <h3>What about other browsers?</h3>
 
-<p>Chrome on iOS, Internet Explorer and Safari does not implement WebRTC yet. <a href="#browser"><i class="fas fa-link"></i> But we recommend using Firefox on all devices.</a></p>
+<p>Chrome on iOS, Internet Explorer and Safari does not implement WebRTC yet. <a href="#browser"><i class="fas fa-link"></i> But we recommend using Firefox on all devices.</a></p>

_includes/sections/calendar-contacts-sync.html

@@ -1,50 +1,50 @@
 <h1 id="calendar_contacts" class="anchor"><a href="#calendar_contacts"><i class="fas fa-link anchor-icon"></i></a> Calendar and Contacts Sync</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong>If you are currently using a calendar and or contacts synchronization service like Google Sync or iCloud, you should pick an alternative here.</strong>
+  <strong>If you are currently using a calendar and or contacts synchronization service like Google Sync or iCloud, you should pick an alternative here.</strong>
 </div>
 
 <div class="row mb-2">
 
-	{% include card.html color="success"
+  {% include card.html color="success"
-	title="Nextcloud"
+  title="Nextcloud"
-	image="/assets/img/provider/Nextcloud.png"
+  image="/assets/img/provider/Nextcloud.png"
-	url="https://nextcloud.com/"
+  url="https://nextcloud.com/"
-	footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
+  footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
-	description="NextCloud is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server."
+  description="NextCloud is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server."
-	%}
+  %}
 
-	{% include card.html color="primary"
+  {% include card.html color="primary"
-	title="Email Providers"
+  title="Email Providers"
-	image="/assets/img/misc/email.png"
+  image="/assets/img/misc/email.png"
-	url="../email"
+  url="../email"
-	website="Email Providers section"
+  website="Email Providers section"
-	footer="OS: depends on email provider."
+  footer="OS: depends on email provider."
-	description="Many email providers also offer calendar and or contacts sync services. Refer to the <a href=\"../email\">Email Providers section</a> to choose an email provider and check if they also offer calendar and or contacts sync."
+  description="Many email providers also offer calendar and or contacts sync services. Refer to the <a href=\"../email\">Email Providers section</a> to choose an email provider and check if they also offer calendar and or contacts sync."
-	%}
+  %}
 
-	{% include card.html color="warning"
+  {% include card.html color="warning"
-	title="EteSync"
+  title="EteSync"
-	image="/assets/img/provider/etesync.png"
+  image="/assets/img/provider/etesync.png"
-	url="https://www.etesync.com/"
+  url="https://www.etesync.com/"
-	footer="Client OS: Android, Web. Server OS: Linux."
+  footer="Client OS: Android, Web. Server OS: Linux."
-	description="EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free."
+  description="EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free."
-	%}
+  %}
 
 </div>
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li>
+  <li>
-		<a href="https://fruux.com/">fruux</a> - a unified contacts/calendaring system that works across platforms and devices.
+    <a href="https://fruux.com/">fruux</a> - a unified contacts/calendaring system that works across platforms and devices.
-	</li>
+  </li>
 
-	<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.
+    <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>
 
-	<li>
+  <li>
-		<a href="../cloud">cloud backups</a> - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/#encrypt">encrypting</a> them).
+    <a href="../cloud">cloud backups</a> - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/#encrypt">encrypting</a> them).
-	</li>
+  </li>
-</ul>
+</ul>

_includes/sections/cloud-storage.html

@@ -1,7 +1,7 @@
 <h1 id="cloud" class="anchor"><a href="#cloud"><i class="fas fa-link anchor-icon"></i></a> Encrypted Cloud Storage Services</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong>If you are currently using Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should pick an alternative here.</strong>
+  <strong>If you are currently using Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should pick an alternative here.</strong>
 </div>
 
 {% include cardv2.html
@@ -37,6 +37,6 @@ bsd=""
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
-	<li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li>
+  <li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li>
-</ul>
+</ul>

_includes/sections/dns.html

@@ -30,13 +30,281 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
 <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://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://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><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>
-	<ul>
+
-		<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>
+<h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> Encrypted ICANN DNS Providers</h1>
-		<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>
+<div class="alert alert-warning" role="alert">
-		<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>
+  <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>
-	</ul>
+</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>
+
+  <ul>
+    <li>DNS-over-TLS (DoT) - A security protocol for encrypted DNS on a dedicated port 853.</li>
+    <li>DNS-over-HTTPS (DoH) - Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443.</li>
+    <li>DNSCrypt - An older yet robust method of encrypting DNS.</li>
+  </ul>
+
+  <h3>Worth Mentioning and Additional Information</h3>
+
+  <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://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby">Stubby</a> - An <a href="https://github.com/getdnsapi/stubby">open-source</a> application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.
+    </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-alternatives.html

@@ -29,5 +29,5 @@ linux=""
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li><a href="https://i2pbote.xyz/">I2P-Bote</a> - End-to-end encrypted decentralized mail system within the I2P network.</li>
+  <li><a href="https://i2pbote.xyz/">I2P-Bote</a> - End-to-end encrypted decentralized mail system within the I2P network.</li>
-</ul>
+</ul>

_includes/sections/email-clients.html

@@ -30,17 +30,17 @@ bsd=""
 <h3>Privacy Email Tools</h3>
 
 <ul>
-	<li><a href="https://www.gpg4usb.org/">gpg4usb</a> - A very easy to use and small portable editor to encrypt and decrypt any text-message or -file. For Windows and Linux. <a href="https://theprivacyguide.org/tutorials/gpg.html">GPG tutorial</a>.</li>
+  <li><a href="https://www.gpg4usb.org/">gpg4usb</a> - A very easy to use and small portable editor to encrypt and decrypt any text-message or -file. For Windows and Linux. <a href="https://theprivacyguide.org/tutorials/gpg.html">GPG tutorial</a>.</li>
-	<li><a href="https://www.mailvelope.com/">Mailvelope</a> - A browser extension that enables the exchange of encrypted emails following the <a href="https://theprivacyguide.org/tutorials/pgp.html">OpenPGP encryption standard</a>.</li>
+  <li><a href="https://www.mailvelope.com/">Mailvelope</a> - A browser extension that enables the exchange of encrypted emails following the <a href="https://theprivacyguide.org/tutorials/pgp.html">OpenPGP encryption standard</a>.</li>
-	<li><a href="https://www.enigmail.net/">Enigmail</a> - A security extension to Thunderbird and Seamonkey. It enables you to write and receive email messages signed and/or encrypted with the <a href="https://theprivacyguide.org/tutorials/pgp.html">OpenPGP standard</a>.</li>
+  <li><a href="https://www.enigmail.net/">Enigmail</a> - A security extension to Thunderbird and Seamonkey. It enables you to write and receive email messages signed and/or encrypted with the <a href="https://theprivacyguide.org/tutorials/pgp.html">OpenPGP standard</a>.</li>
-	<li><a href="https://addons.thunderbird.net/thunderbird/addon/torbirdy/">TorBirdy</a> - TorBirdy configures Thunderbird to make connections over the Tor anonymity network. This extension is in beta and should be considered experimental.</li>
+  <li><a href="https://addons.thunderbird.net/thunderbird/addon/torbirdy/">TorBirdy</a> - TorBirdy configures Thunderbird to make connections over the Tor anonymity network. This extension is in beta and should be considered experimental.</li>
-	<li><a href="https://www.emailprivacytester.com/">Email Privacy Tester</a> - This tool will send an Email to your address and perform privacy-related tests.</li>
+  <li><a href="https://www.emailprivacytester.com/">Email Privacy Tester</a> - This tool will send an Email to your address and perform privacy-related tests.</li>
 </ul>
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li><a href="https://github.com/k9mail/k-9/releases">K-9 Mail</a> - An independent mail application for Android. It supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP.</li>
+  <li><a href="https://github.com/k9mail/k-9/releases">K-9 Mail</a> - An independent mail application for Android. It supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP.</li>
-	<li><a href="https://www.gnupg.org/">GNU Privacy Guard</a> - Email Encryption. GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. <a href="https://theprivacyguide.org/tutorials/gpg.html">Tutorial.</a> Use <a href="https://gpgtools.org/">GPGTools for macOS.</a></li>
+  <li><a href="https://www.gnupg.org/">GNU Privacy Guard</a> - Email Encryption. GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. <a href="https://theprivacyguide.org/tutorials/gpg.html">Tutorial.</a> Use <a href="https://gpgtools.org/">GPGTools for macOS.</a></li>
-	<li><a href="https://www.mailpile.is/">Mailpile (Beta)</a> - A modern, fast web-mail client with user-friendly encryption and privacy features.</li>
+  <li><a href="https://www.mailpile.is/">Mailpile (Beta)</a> - A modern, fast web-mail client with user-friendly encryption and privacy features.</li>
-</ul>
+</ul>

_includes/sections/email-providers.html

@@ -1,211 +1,226 @@
 <h1 id="email" class="anchor"><a href="#email"><i class="fas fa-link anchor-icon"></i></a> Privacy-Conscious Email Providers - No Affiliates</h1>
 
 <div class="alert alert-success" role="alert">
-	<strong>All providers listed here are operating outside the US and support <a data-toggle="tooltip" data-placement="bottom" data-original-title="When sending or receiving emails, if both the sending and receiving servers support TLS encryption, the email is sent between servers using an encrypted connection.">SMTP TLS.</a> The table is sortable.</strong>
+  <strong>All providers listed here are operating outside the US and support <a data-toggle="tooltip" data-placement="bottom" data-original-title="When sending or receiving emails, if both the sending and receiving servers support TLS encryption, the email is sent between servers using an encrypted connection.">SMTP TLS.</a> The table is sortable.</strong>
 </div>
 
 <div class="table-responsive">
-	<table class="table sortable-theme-bootstrap" data-sortable>
+  <table class="table sortable-theme-bootstrap" data-sortable>
-		<thead>
+    <thead>
-			<tr>
+      <tr>
-				<th data-sorted="true" data-sorted-direction="descending">Email Provider</th>
+        <th data-sorted="true" data-sorted-direction="descending">Email Provider</th>
-				<th data-sortable="false">Website</th>
+        <th data-sortable="false">Website</th>
-				<th data-sortable="true">Since</th>
+        <th data-sortable="true">Since</th>
-				<th data-sortable="true">Jurisdiction</th>
+        <th data-sortable="true">Jurisdiction</th>
-				<th data-sortable="true">Storage</th>
+        <th data-sortable="true">Storage</th>
-				<th data-sortable="true">Yearly Price</th>
+        <th data-sortable="true">Yearly Price</th>
-				<th data-sortable="true">Bitcoin</th>
+        <th data-sortable="true">Bitcoin</th>
-				<th data-sortable="true">Encryption</th>
+        <th data-sortable="true">Encryption</th>
-				<th data-sortable="true">Own Domain</th>
+        <th data-sortable="true">Own Domain</th>
-			</tr>
+      </tr>
-		</thead>
+    </thead>
 
-		<tbody>
+    <tbody>
 
-			<tr>
+      <tr>
-				<td data-value="ProtonMail">
+        <td data-value="ProtonMail">
-					<img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70">
+          <img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70">
-				</td>
+        </td>
-				<td>
+        <td>
-					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonmail.com" href="https://protonmail.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="https://protonmail.com" href="https://protonmail.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="https://protonirockerxow.onion. Requires specific software to access: torproject.org" href="https://protonirockerxow.onion"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonirockerxow.onion. Requires specific software to access: torproject.org" href="https://protonirockerxow.onion"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
-				</td>
+        </td>
-				<td data-value="2013">2013</td>
+        <td data-value="2013">2013</td>
-				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-				<td data-value="500">500 MB</td>
+        <td data-value="500">500 MB</td>
-				<td data-value="0"><span class="label label-warning">Free</span></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">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">Built-in</span></td>
-				<td data-value="1"><span class="label label-success">Yes</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="disroot.org">
+        <td data-value="disroot.org">
-					<img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
+          <img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2015">2015</td>
+        <td data-value="2015">2015</td>
-				<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
+        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-				<td data-value="2000">2 GB</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-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">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">Built-in</span></td>
-				<td data-value="1"><span class="label label-success">Yes</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="Tutanota">
+        <td data-value="Tutanota">
-					<img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70">
+          <img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70">
-				</td>
+        </td>
-				<td>
+        <td>
-					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.tutanota.com" href="https://www.tutanota.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.tutanota.com" href="https://www.tutanota.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-				</td>
+        </td>
-				<td data-value="2011">2011</td>
+        <td data-value="2011">2011</td>
-				<td><span class="flag-icon flag-icon-de"></span> Germany</td>
+        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
-				<td data-value="1000">1 GB</td>
+        <td data-value="1000">1 GB</td>
-				<td data-value="0"><span class="label label-warning">Free</span></td>
+        <td data-value="0"><span class="label label-warning">Free</span></td>
-				<td data-value="0"><span class="label label-primary">No</span></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="1"><span class="label label-success">Built-in</span></td>
-				<td data-value="1"><span class="label label-success">Yes</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="Mailfence">
+        <td data-value="Mailfence">
-					<img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
+          <img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2013">2013</td>
+        <td data-value="2013">2013</td>
-				<td><span class="flag-icon flag-icon-be"></span> Belgium</td>
+        <td><span class="flag-icon flag-icon-be"></span> Belgium</td>
-				<td data-value="500">500 MB</td>
+        <td data-value="500">500 MB</td>
-				<td data-value="0"><span class="label label-warning">Free</span></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">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">Built-in</span></td>
-				<td data-value="1"><span class="label label-success">Yes</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="mailbox.org">
+        <td data-value="mailbox.org">
-					<img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
+          <img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
 
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2014">2014</td>
+        <td data-value="2014">2014</td>
-				<td><span class="flag-icon flag-icon-de"></span> Germany</td>
+        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
-				<td data-value="2000">2 GB</td>
+        <td data-value="2000">2 GB</td>
-				<td data-value="13">12 €</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">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">Built-in</span></td>
-				<td data-value="1"><span class="label label-success">Yes</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="Posteo">
+        <td data-value="Posteo">
-					<img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
+          <img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2009">2009</td>
+        <td data-value="2009">2009</td>
-				<td><span class="flag-icon flag-icon-de"></span> Germany</td>
+        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
-				<td data-value="2000">2 GB</td>
+        <td data-value="2000">2 GB</td>
-				<td data-value="13">12 €</td>
+        <td data-value="13">12 €</td>
-				<td data-value="0"><span class="label label-primary">No</span></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="1"><span class="label label-success">Built-in</span></td>
-				<td data-value="0"><span class="label label-primary">No</span></td>
+        <td data-value="0"><span class="label label-primary">No</span></td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="Runbox">
+        <td data-value="Runbox">
-					<img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
+          <img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
 
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="1999">1999</td>
+        <td data-value="1999">1999</td>
-				<td><span class="flag-icon flag-icon-no"></span> Norway</td>
+        <td><span class="flag-icon flag-icon-no"></span> Norway</td>
-				<td data-value="1000">1 GB</td>
+        <td data-value="1000">1 GB</td>
-				<td data-value="20">$ 19.95</td>
+        <td data-value="20">$ 19.95</td>
-				<td data-value="1"><span class="label label-primary">Yes</span></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="0"><span class="label label-primary">No</span></td>
-				<td data-value="1"><span class="label label-success">Yes</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="Neomailbox">
+        <td data-value="Neomailbox">
-					<img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
+          <img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2003">2003</td>
+        <td data-value="2003">2003</td>
-				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-				<td data-value="1000">1 GB</td>
+        <td data-value="1000">1 GB</td>
-				<td data-value="50">$ 49.95</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">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">Built-in</span></td>
-				<td data-value="1"><span class="label label-success">Yes</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="StartMail">
+        <td data-value="Soverin">
-					<img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
+          <img alt="Soverin" src="/assets/img/provider/Soverin.png" width="200" height="70">
-				</td>
+        </td>
-				<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>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://soverin.net/" href="https://soverin.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-				</td>
+        </td>
-				<td data-value="2014">2014</td>
+        <td data-value="2015">2015</td>
-				<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
+        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-				<td data-value="10000">10 GB</td>
+        <td data-value="25000">25 GB</td>
-				<td data-value="60">$ 59.95</td>
+        <td data-value="35">29 €</td>
-				<td data-value="0"><span class="label label-success">Accepted</span></td>
+        <td data-value="0"><span class="label label-success">No</span></td>
-				<td data-value="1"><span class="label label-success">Built-in</span></td>
+        <td data-value="1"><span class="label label-success">No</span></td>
-				<td data-value="1"><span class="label label-success">Yes</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="Kolab Now">
+        <td data-value="StartMail">
-					<img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
+          <img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2010">2010</td>
+        <td data-value="2014">2014</td>
-				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-				<td data-value="2048">2 GB</td>
+        <td data-value="10000">10 GB</td>
-				<td data-value="60">$ 60</td>
+        <td data-value="60">$ 59.95</td>
-				<td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="0"><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">Built-in</span></td>
-				<td data-value="1"><span class="label label-success">Yes</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
-			</tr>
+      </tr>
 
-		</tbody>
+      <tr>
-	</table>
+        <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>
 
 <h3>Interesting Email Providers Under Development</h3>
 
 <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
+  <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>
+    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>
+</ul>  <h3>Become Your Own Email Provider with Mail-in-a-Box</h3>
-<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>
 
 <ul>
-	<li><a href="https://www.wired.com/2011/10/ecpa-turns-twenty-five/">Aging 'Privacy' Law Leaves Cloud E-Mail Open to Cops</a> - Data stored in the cloud for longer than 6 months is considered abandoned and may be accessed by intelligence agencies without
+  <li><a href="https://www.wired.com/2011/10/ecpa-turns-twenty-five/">Aging 'Privacy' Law Leaves Cloud E-Mail Open to Cops</a> - Data stored in the cloud for longer than 6 months is considered abandoned and may be accessed by intelligence agencies without
-		a warrant. Learning: Use an external email client like Thunderbird or Enigmail, download your emails and store them locally. Never leave them on the server.</li>
+    a warrant. Learning: Use an external email client like Thunderbird or Enigmail, download your emails and store them locally. Never leave them on the server.</li>
-	<li><a href="https://www.eff.org/deeplinks/2012/04/may-firstriseup-server-seizure-fbi-overreaches-yet-again">With May First/Riseup Server Seizure, FBI Overreaches Yet Again</a></li>
+  <li><a href="https://www.eff.org/deeplinks/2012/04/may-firstriseup-server-seizure-fbi-overreaches-yet-again">With May First/Riseup Server Seizure, FBI Overreaches Yet Again</a></li>
-	<li><a href="https://www.autistici.org/ai/crackdown/">Autistici/Inventati server compromised</a> - The cryptographic services offered by the Autistici/Inventati server have been compromised on 15th June 2004. It was discovered on 21st June 2005. One year
+  <li><a href="https://www.autistici.org/ai/crackdown/">Autistici/Inventati server compromised</a> - The cryptographic services offered by the Autistici/Inventati server have been compromised on 15th June 2004. It was discovered on 21st June 2005. One year
-		later. During an enquiry on a single mailbox, the Postal Police may have tapped for a whole year every user's private communication going through the server autistici.org/inventati.org.</li>
+    later. During an enquiry on a single mailbox, the Postal Police may have tapped for a whole year every user's private communication going through the server autistici.org/inventati.org.</li>
-</ul>
+</ul>

_includes/sections/file-encryption.html

@@ -1,47 +1,47 @@
 <h1 id="encrypt" class="anchor"><a href="#encrypt"><i class="fas fa-link anchor-icon"></i></a> File Encryption Software</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong>If you are currently not using encryption software for your hard disk, emails or file archives, you should pick an encryption software here.</strong>
+  <strong>If you are currently not using encryption software for your hard disk, emails or file archives, you should pick an encryption software here.</strong>
 </div>
 
 <div class="row mb-2">
 
-	{% include card.html color="success"
+  {% include card.html color="success"
-	title="VeraCrypt - Disk Encryption"
+  title="VeraCrypt - Disk Encryption"
-	image="/assets/img/tools/VeraCrypt.png"
+  image="/assets/img/tools/VeraCrypt.png"
-	url="https://veracrypt.fr/"
+  url="https://veracrypt.fr/"
-	footer="OS: Windows, macOS, Linux."
+  footer="OS: Windows, macOS, Linux."
-	description="VeraCrypt is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file or encrypt a partition
+  description="VeraCrypt is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file or encrypt a partition
-	or the entire storage device with pre-boot authentication. VeraCrypt is a fork of the discontinued TrueCrypt project. It was initially released on June 22, 2013. According to its developers, security improvements have been implemented and issues
+  or the entire storage device with pre-boot authentication. VeraCrypt is a fork of the discontinued TrueCrypt project. It was initially released on June 22, 2013. According to its developers, security improvements have been implemented and issues
-	raised by the initial TrueCrypt code audit have been addressed."
+  raised by the initial TrueCrypt code audit have been addressed."
-	%}
+  %}
 
-	{% include card.html color="primary"
+  {% include card.html color="primary"
-	title="GNU Privacy Guard - Email Encryption"
+  title="GNU Privacy Guard - Email Encryption"
-	image="/assets/img/tools/GnuPG.png"
+  image="/assets/img/tools/GnuPG.png"
-	url="https://gpgtools.org/"
+  url="https://gpgtools.org/"
-	footer="OS: Windows, macOS, Linux, Android, BSD."
+  footer="OS: Windows, macOS, Linux, Android, BSD."
-	description="GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification
+  description="GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification
-	of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German
+  of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German
-	government. <a href=\"https://gpgtools.org/\">GPGTools for macOS</a>."
+  government. <a href=\"https://gpgtools.org/\">GPGTools for macOS</a>."
-	%}
+  %}
 
-	{% include card.html color="warning"
+  {% include card.html color="warning"
-	title="PeaZip - File Archive Encryption"
+  title="PeaZip - File Archive Encryption"
-	image="/assets/img/tools/PeaZip.png"
+  image="/assets/img/tools/PeaZip.png"
-	url="http://www.peazip.org/"
+  url="http://www.peazip.org/"
-	footer="OS: Windows, Linux, BSD."
+  footer="OS: Windows, Linux, BSD."
-	description="PeaZip is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume
+  description="PeaZip is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume
-	split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 181 file extensions (as of version 5.5.1).</p>
+  split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 181 file extensions (as of version 5.5.1).</p>
-	<p><strong>macOS alternative:</strong> <a href=\"https://www.keka.io/\">Keka</a> is a free file archiver."
+  <p><strong>macOS alternative:</strong> <a href=\"https://www.keka.io/\">Keka</a> is a free file archiver."
-	%}
+  %}
 
 </div>
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
-	<li><a href="https://diskcryptor.net/">DiskCryptor</a> - A full disk and partition encryption system for Windows including the ability to encrypt the partition and disk on which the OS is installed.</li>
+  <li><a href="https://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><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>
+</ul>

_includes/sections/file-sharing.html

@@ -39,5 +39,5 @@ linux=""
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li><a href="https://github.com/schollz/croc">croc</a> - Easily and securely send things from one computer to another.</li>
+  <li><a href="https://github.com/schollz/croc">croc</a> - Easily and securely send things from one computer to another.</li>
-</ul>
+</ul>

_includes/sections/file-sync.html

@@ -2,29 +2,29 @@
 
 <div class="row mb-2">
 
-	{% include card.html color="success"
+  {% include card.html color="success"
-	title="SparkleShare"
+  title="SparkleShare"
-	image="/assets/img/tools/SparkleShare.png"
+  image="/assets/img/tools/SparkleShare.png"
-	url="https://sparkleshare.org/"
+  url="https://sparkleshare.org/"
-	footer="OS: Windows, macOS, Linux."
+  footer="OS: Windows, macOS, Linux."
-	description="SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically
+  description="SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically
-	kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
+  kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
-	%} {% include card.html color="primary"
+  %}    {% include card.html color="primary"
-	title="Syncthing"
+  title="Syncthing"
-	image="/assets/img/tools/Syncthing.png"
+  image="/assets/img/tools/Syncthing.png"
-	url="https://syncthing.net/"
+  url="https://syncthing.net/"
-	footer="OS: Windows, macOS, Linux, Android, BSD, Solaris."
+  footer="OS: Windows, macOS, Linux, Android, BSD, Solaris."
-	description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to
+  description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to
-	choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
+  choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
-	%}
+  %}
 
 </div>
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li>
+  <li>
-		<a href="https://git-annex.branchable.com/">git-annex</a> - Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle,
+    <a href="https://git-annex.branchable.com/">git-annex</a> - Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle,
-		whether due to limitations in memory, time, or disk space.
+    whether due to limitations in memory, time, or disk space.
-	</li>
+  </li>
-</ul>
+</ul>

_includes/sections/fourteen-eyes.html

@@ -5,7 +5,7 @@
 <p>The UKUSA Agreement is an agreement between the United Kingdom, United States, Australia, Canada, and New Zealand to cooperatively collect, analyze, and share intelligence. Members of this group, known as the <a href="https://www.giswatch.org/en/communications-surveillance/unmasking-five-eyes-global-surveillance-practices">Five Eyes</a>, focus on gathering and analyzing intelligence from different parts of the world. While Five Eyes countries have agreed to <a href="https://www.pbs.org/newshour/world/an-exclusive-club-the-five-countries-that-dont-spy-on-each-other">not spy on each other</a> as adversaries, leaks by Snowden have revealed that some Five Eyes members monitor each other's citizens and <a href="https://www.theguardian.com/uk/2013/jun/21/gchq-cables-secret-world-communications-nsa">share intelligence</a> to <a href="https://www.theguardian.com/politics/2013/jun/10/nsa-offers-intelligence-british-counterparts-blunkett">avoid breaking domestic laws</a> that prohibit them from spying on their own citizens. The Five Eyes alliance also cooperates with groups of third-party countries to share intelligence (forming the Nine Eyes and Fourteen Eyes), however Five Eyes and third-party countries can and do spy on each other.</p>
 
 <div class="row mb-3">
-	{% include panel.html color="danger"
+  {% include panel.html color="danger"
   title="Five Eyes"
   body='
   <ol class="card-ol">
@@ -18,7 +18,7 @@
   '
   %}
 
-	{% include panel.html color="warning"
+  {% include panel.html color="warning"
   title="Nine Eyes"
   body='
   <ol class="card-ol">
@@ -30,7 +30,7 @@
   '
   %}
 
-	{% include panel.html color="secondary"
+  {% include panel.html color="secondary"
   title="Fourteen Eyes"
   body='
   <ol class="card-ol">
@@ -42,4 +42,4 @@
   </ol>
   '
   %}
-</div>
+</div>

_includes/sections/header.html

@@ -1,13 +1,13 @@
 <div class="jumbotron p-5">
-	<h1 class="display-4"><a href="https://www.privacytools.io/" title="privacytools.io"><img src="/assets/img/layout/logo.png" width="600" height="88" class="img-fluid" alt="privacytools.io"></a></h1>
+  <h1 class="display-4"><a href="https://www.privacytools.io/" title="privacytools.io"><img src="/assets/img/layout/logo.png" width="600" height="88" class="img-fluid" alt="privacytools.io"></a></h1>
-	<p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. privacytools.io provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
+  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. privacytools.io provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
 </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">
+<div class="input-group col-12 col-md-8 offset-md-2">
-		<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try search.privacytools.io, a Privacy-Respecting Search Engine" autocomplete="off" value="">
+<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try search.privacytools.io, a Privacy-Respecting Search Engine" autocomplete="off" value="">
-		<span class="input-group-btn">
+<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>
+<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>
+</span>
-	</div>
+</div>
-</form>
+</form>

_includes/sections/instant-messenger.html

@@ -1,28 +1,29 @@
 <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 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>
+  <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>
 </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. <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>'
+description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
+labels="warning:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text>Warning</a>:Wire stores metadata such as list of your connections/conversations in plaintext (= not encrypted).,success:VoIP"
 website="https://wire.com/"
 forum="https://forum.privacytools.io/t/discussion-wire/750"
 github="https://github.com/wireapp/"
@@ -38,35 +39,43 @@ web=""
 <ul>
 	<li><a href="https://securechatguide.org/effguide.html">securechatguide.org</a> - Guide to Choosing a Messenger.</li>
 	<li><a href="https://www.securemessagingapps.com/">securemessagingapps.com</a> - Secure Messaging Apps Comparison.</li>
-	<li><a href="https://www.thinkprivacy.io/messengers.html">thinkprivacy.io</a> - Simple Secure Messaging Apps Comparison.</li>
+  <li><a href="https://www.thinkprivacy.io/messengers.html">thinkprivacy.io</a> - Simple Secure Messaging Apps Comparison.</li>
 </ul>
 
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li><a href="https://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.
+  <li><a href="https://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.
-	<li><a href="https://retroshare.cc/">RetroShare</a> - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </li>
+  <li><a href="https://retroshare.cc/">RetroShare</a> - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </li>
-	<li><a href="https://xmpp.org/">XMPP</a> - Federated instant messaging protocol with <a href="https://conversations.im/omemo/">OMEMO</a>, OTR, or OpenPGP end-to-end encryption:</li>
+  <li><a href="https://xmpp.org/">XMPP</a> - Federated instant messaging protocol with <a href="https://conversations.im/omemo/">OMEMO</a>, OTR, or OpenPGP end-to-end encryption:</li>
-	<ul>
+  <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://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://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></li>
+    <li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development. <span class="badge badge-success">OMEMO</span> <span class="badge badge-success">VoIP</span></li>
-		<li><a href="https://omemo.top/">Other OMEMO ready clients</a>.</li>
+    <li><a href="https://omemo.top/">Other OMEMO ready clients</a>.</li>
-	</ul>
+  </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://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://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://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://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>
+  <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>
+  <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>
 </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://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://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><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 -->
@@ -75,31 +84,31 @@ web=""
 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>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>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>
+  <li>Copy the Tor binary or create a symbolic link to it: </li>
-	<br>
+  <br>
-	<ul>
+  <ul>
-		<li><strong>Windows: </strong>Copy the Tor binary included with the Tor Browser and overwrite the old one included with Ricochet.</li>
+      <li><strong>Windows: </strong>Copy the Tor binary included with the Tor Browser and overwrite the old one included with Ricochet.</li>
-		<ul>
+      <ul>
-			<li>Tor Browser binary: <code>%HOMEPATH%\Desktop\Tor Browser\Browser\TorBrowser\Tor\tor.exe</code></li>
+          <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>
+          <li>Ricochet's included binary: <code>%HOMEPATH%\Desktop\Ricochet\tor.exe</code></li>
-		</ul>
+      </ul>
-		<br>
+      <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>
+      <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>
+          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>
+      <ul>
-			<li><code>rm ~/Applications/Ricochet.app/Contents/MacOS/tor <br>
+          <li><code>rm ~/Applications/Ricochet.app/Contents/MacOS/tor <br>
-					ln -s ~/Applications/Tor\ Browser.app/Contents/Resources/TorBrowser/Tor/tor \ <br>
+                    ln -s ~/Applications/Tor\ Browser.app/Contents/Resources/TorBrowser/Tor/tor \ <br>
-					~/Applications/Ricochet.app/Contents/MacOS/tor</code>
+                          ~/Applications/Ricochet.app/Contents/MacOS/tor</code>
-			</li>
+          </li>
-		</ul>
+      </ul>
-		<br>
+      <br>
-		<li><strong>Linux: </strong>Assuming you extracted the Tor Browser Bundle and Ricochet tarball to your home directory:</li>
+      <li><strong>Linux: </strong>Assuming you extracted the Tor Browser Bundle and Ricochet tarball to your home directory:</li>
-		<ul>
+      <ul>
-			<li><code>rm ~/ricochet/tor <br>
+          <li><code>rm ~/ricochet/tor <br>
-					ln -s ~/tor-browser_en-US/Browser/TorBrowser/Tor/tor ~/ricochet/tor</code>
+                    ln -s ~/tor-browser_en-US/Browser/TorBrowser/Tor/tor ~/ricochet/tor</code>
-			</li>
+          </li>
-		</ul>
+      </ul>
-		<ul>
+  <ul>
-</ol>
+</ol>

_includes/sections/key-disclosure-law.html

@@ -2,12 +2,11 @@
 
 <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>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><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">
 
-	{% include panel.html color="danger"
+  {% include panel.html color="danger"
   title="Key disclosure laws apply"
   body='
   <ol class="card-ol">
@@ -25,7 +24,7 @@
   '
   %}
 
-	{% include panel.html color="warning"
+  {% include panel.html color="warning"
   title="Key disclosure laws may apply"
   body='
   <ol class="card-ol">
@@ -39,7 +38,7 @@
   '
   %}
 
-	{% include panel.html color="success"
+  {% include panel.html color="success"
   title="Key disclosure laws don't apply"
   body='
   <ol class="card-ol">
@@ -61,9 +60,9 @@
 <h3>Related Information</h3>
 
 <ul>
-	<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law">Wikipedia page on key disclosure law</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law">Wikipedia page on key disclosure law</a></li>
-	<li><a href="https://law.stackexchange.com/questions/1523/can-a-us-citizen-be-required-to-provide-the-authentication-key-for-encrypted-dat">law.stackexchange.com question about key disclosure law in US</a></li>
+  <li><a href="https://law.stackexchange.com/questions/1523/can-a-us-citizen-be-required-to-provide-the-authentication-key-for-encrypted-dat">law.stackexchange.com question about key disclosure law in US</a></li>
-	<li><a href="https://peertube.mastodon.host/videos/watch/e09915eb-5962-4830-a02f-8da5c2b59e71">DEFCON 20: Crypto and the Cops: the Law of Key Disclosure and Forced Decryption</a></li>
+  <li><a href="https://peertube.mastodon.host/videos/watch/e09915eb-5962-4830-a02f-8da5c2b59e71">DEFCON 20: Crypto and the Cops: the Law of Key Disclosure and Forced Decryption</a></li>
 </ul>
 
 <h3 id="usa" class="anchor">Why is it not recommended to choose a US-based service?</h3>
@@ -73,17 +72,17 @@
 <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>
 
 <h3>Related Information</h3>
 
 <ul>
-	<li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus">Avoid all US and UK based services</a></li>
+  <li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus">Avoid all US and UK based services</a></li>
-	<li><a href="https://en.wikipedia.org/wiki/Surespot#History">Proof that warrant canaries work based on the surespot example.</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Surespot#History">Proof that warrant canaries work based on the surespot example.</a></li>
-	<li><a href="https://en.wikipedia.org/wiki/UKUSA_Agreement">The United Kingdom – United States of America Agreement (UKUSA)</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/UKUSA_Agreement">The United Kingdom – United States of America Agreement (UKUSA)</a></li>
-	<li><a href="https://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order">Lavabit: Suspension and gag order</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order">Lavabit: Suspension and gag order</a></li>
-	<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law">Key disclosure law</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law">Key disclosure law</a></li>
-	<li><a href="https://en.wikipedia.org/wiki/Portal:Mass_surveillance">Wikipedia Portal: Mass_surveillance</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Portal:Mass_surveillance">Wikipedia Portal: Mass_surveillance</a></li>
-</ul>
+</ul>

_includes/sections/live-operating-systems.html

@@ -1,37 +1,38 @@
 <h1 id="live_os" class="anchor"><a href="#live_os"><i class="fas fa-link anchor-icon"></i></a> Live CD Operating Systems</h1>
 
-<div class="row mb-2">
+{% 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/"
+%}
 
-	{% include card.html color="success"
+{% include cardv2.html
-	title="Tails"
+title="KNOPPIX"
-	labels="warning:contrib:This software may depend on or recommend non-free software."
+image="/assets/img/tools/KNOPPIX.png"
-	image="/assets/img/tools/Tails.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.'
-	url="https://tails.boum.org/"
+badges="info:GNU/Linux"
-	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."
+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="primary"
+{% include cardv2.html
-	title="KNOPPIX"
+title="Puppy Linux"
-	labels="warning:contrib:This software may depend on or recommend non-free software."
+image="/assets/img/tools/Puppy-Linux.png"
-	image="/assets/img/tools/KNOPPIX.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.'
-	url="https://www.knopper.net/knoppix/"
+badges="info:GNU/Linux"
-	website="knopper.net"
+labels="warning:contrib:This software may depend on or recommend non-free software."
-	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."
+website="http://puppylinux.org/"
-	%}
+source="http://distro.ibiblio.org/puppylinux/"
-
+%}
-	{% 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-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-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
-		provided by extensions.</li>
+    provided by extensions.</li>
-</ul>
+</ul>

_includes/sections/mobile-operating-systems.html

@@ -1,41 +1,43 @@
 <h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> Mobile Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong>Even though the source code of the following OS is provided, installing Google Apps may compromise your setup.</strong>
+  <strong>Even though the source code of the following OS is provided, installing Google Apps may compromise your setup.</strong>
 </div>
 
-<div class="row mb-2">
+{% 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/"
+%}
 
-	{% include card.html color="success"
+{% include cardv2.html
-	title="LineageOS"
+title="LineageOS"
-	labels="warning:contrib:This software may depend on or recommend non-free software."
+image="/assets/img/tools/LineageOS.png"
-	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.'
-	url="https://www.lineageos.org/"
+badges="info:AOSP"
-	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."
+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="primary"
+{% include cardv2.html
-	title="Ubuntu Touch"
+title="Ubuntu Touch"
-	labels="warning:contrib:This software may depend on or recommend non-free software."
+image="/assets/img/tools/Ubuntu-Touch.png"
-	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>"
-	url="https://ubuntu-touch.io/"
+badges="info:GNU/Linux"
-	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>"
+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="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> - An open-source operating system based on Android, aiming to replace all proprietary components with free software.</li>
+  <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-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
+  <li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
-	<li><a href="https://microg.org/">MicroG</a> <span class="badge badge-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.
+  <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.
-</ul>
+</ul>

_includes/sections/notebooks.html

@@ -1,47 +1,60 @@
 <h1 id="notebook" class="anchor"><a href="#notebook"><i class="fas fa-link anchor-icon"></i></a> Digital Notebook</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong>If you are currently using an application like Evernote, Google Keep or Microsoft OneNote you should pick an alternative here.</strong>
+  <strong>If you are currently using an application like Evernote, Google Keep or Microsoft OneNote you should pick an alternative here.</strong>
 </div>
 
-<div class="row mb-2">
+{% 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=""
+%}
 
-	{% include card.html color="success"
+{% include cardv2.html
-	title="Joplin"
+title="Standard Notes"
-	image="/assets/img/tools/Joplin.png"
+image="/assets/img/tools/StandardNotes.png"
-	url="https://joplinapp.org/"
+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."
-	footer="OS: Windows, macOS, Linux, iOS, Android, Firefox/Chrome (Web Clipper)."
+website="https://standardnotes.org/"
-	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."
+github="https://github.com/standardnotes"
-	%}
+windows=""
+mac=""
+linux=""
+ios=""
+android=""
+web=""
+%}
 
-	{% include card.html color="primary"
+{% include cardv2.html
-	title="Standard Notes"
+title="Turtl"
-	image="/assets/img/tools/StandardNotes.png"
+image="/assets/img/tools/Turtl.png"
-	url="https://standardnotes.org/"
+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."
-	footer="OS: Windows, macOS, Linux, iOS, Android, Web."
+website="https://turtlapp.com/"
-	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."
+github="https://github.com/turtl"
-	%}
+windows=""
-
+mac=""
-	{% include card.html color="warning"
+linux=""
-	title="Turtl"
+android=""
-	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>
 
 <ul>
-	<li>Note: As of Dec 2018, Joplin does not support password/pin protection for the application itself or individual notes/notebooks. Data is still encrypted in transit and at sync location using your master key. See <a href='https://github.com/laurent22/joplin/issues/289'>open issue</a>.</li>
+  <li>Note: As of Dec 2018, Joplin does not support password/pin protection for the application itself or individual notes/notebooks. Data is still encrypted in transit and at sync location using your master key. See <a href='https://github.com/laurent22/joplin/issues/289'>open issue</a>.</li>
 </ul>
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li><a href="https://github.com/notable/notable">Notable</a> - The markdown-based note-taking app that doesn't suck.</li>
+  <li><a href="https://github.com/notable/notable">Notable</a> - The markdown-based note-taking app that doesn't suck.</li>
-	<li><a href="https://paperwork.cloud/">Paperwork</a> - Open source and self-hosted solution. For PHP / MySQL servers.</li>
+  <li><a href="https://paperwork.cloud/">Paperwork</a> - Open source and self-hosted solution. For PHP / MySQL servers.</li>
-	<li><a href="https://orgmode.org">Org-mode</a> - A major mode for GNU Emacs. Org-mode is for keeping notes, maintaining TODO lists, planning projects, and authoring documents with a fast and effective plain-text system. </li>
+  <li><a href="https://orgmode.org">Org-mode</a> - A major mode for GNU Emacs. Org-mode is for keeping notes, maintaining TODO lists, planning projects, and authoring documents with a fast and effective plain-text system. </li>
-</ul>
+</ul>

_includes/sections/operating-systems.html

@@ -1,49 +1,51 @@
 <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 Microsoft Windows or Apple macOS, you should pick an alternative here.</strong>
+  <strong>If you are currently using a operating system like Windows 10, you should pick an alternative here.</strong>
 </div>
 
-<div class="row mb-2">
+{% 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/"
+%}
 
-	{% include card.html color="success"
+{% include cardv2.html
-	title="Qubes OS"
+title="Debian"
-	labels="warning:contrib:This software may depend on or recommend non-free software."
+image="/assets/img/tools/Debian.png"
-	image="/assets/img/tools/Qubes-OS.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.'
-	url="https://www.qubes-os.org/"
+badges="info:GNU/Linux"
-	tor="http://qubesos4rrrrz6n4.onion"
+website="https://www.debian.org/"
-	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."
+git="https://salsa.debian.org/qa/debsources"
-	%}
+tor="http://sejnfjrq6szgca7v.onion"
+%}
 
-	{% include card.html color="primary"
+{% include cardv2.html
-	title="Debian"
+title="Trisquel"
-	image="/assets/img/tools/Debian.png"
+image="/assets/img/tools/Trisquel.png"
-	url="https://www.debian.org/"
+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.'
-	tor="http://sejnfjrq6szgca7v.onion"
+badges="info:GNU/Linux"
-	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."
+website="https://trisquel.info/"
-	%}
+git="https://devel.trisquel.info/groups/trisquel"
-
+%}
-	{% include card.html color="warning"
-	title="Trisquel"
-	image="/assets/img/tools/Trisquel.png"
-	url="https://trisquel.info/"
-	description="Trisquel is a Linux-based operating system derived from Ubuntu. The project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed."
-	%}
-
-</div>
 
 <h3>Warning</h3>
 
 <ul>
-	<li><a href="#win10"><i class="fas fa-link"></i> Don't use Windows 10 - It's a privacy nightmare</a></li>
+  <li><a href="#win10"><i class="fas fa-link"></i> Don't use Windows 10 - It's a privacy nightmare</a></li>
 </ul>
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<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.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> - 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.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
-		completely open source version of Arch Linux.</li>
+    completely open source version of Arch Linux.</li>
-	<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"
+  <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"
-		and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
+    and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
-</ul>
+</ul>

_includes/sections/participate.html

@@ -1,38 +1,38 @@
 <div class="page-header">
-	<h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> Participate with suggestions and constructive criticism</h1>
+  <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> Participate with suggestions and constructive criticism</h1>
 </div>
 
 <p>It's important for a website like privacytools.io to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a rel="me" href="https://social.privacytools.io/@privacytools">our own Mastodon instance</a> or on <a href="https://chat.privacytools.io">Matrix</a> at <code class="highlighter-rouge">#general:privacytools.io</code>.</p>
 
 <div class="row">
 
-	{% include card.html color="success"
+  {% include card.html color="success"
-	title="Discourse & Reddit"
+  title="Discourse & Reddit"
-	image="/assets/img/icons/discourse.png"
+  image="/assets/img/icons/discourse.png"
-	url="https://forum.privacytools.io/"
+  url="https://forum.privacytools.io/"
-	website="Discourse"
+  website="Discourse"
-	extra_button='<a class="btn btn-success mb-1" href="https://www.reddit.com/r/privacytoolsIO/">Reddit</a>'
+  extra_button='<a class="btn btn-success mb-1" href="https://www.reddit.com/r/privacytoolsIO/">Reddit</a>'
-	description='Join our Discourse community to stay up to date on privacy news or make suggestions!'
+  description='Join our Discourse community to stay up to date on privacy news or make suggestions!'
-	%}
+  %}
 
-	{% include card.html color="primary"
+  {% include card.html color="primary"
-	title="Follow on Mastodon & Twitter"
+  title="Follow on Mastodon & Twitter"
-	image="/assets/img/icons/mastodon.png"
+  image="/assets/img/icons/mastodon.png"
-	url="https://social.privacytools.io/"
+  url="https://social.privacytools.io/"
-	website="Mastodon"
+  website="Mastodon"
-	extra_button='<a class="btn btn-primary mb-1" href="https://twitter.com/privacytoolsIO">Twitter</a>'
+  extra_button='<a class="btn btn-primary mb-1" href="https://twitter.com/privacytoolsIO">Twitter</a>'
-	description="Get the latest privacy-related updates from our Mastodon Feed. Follow us today!"
+  description="Get the latest privacy-related updates from our Mastodon Feed. Follow us today!"
-	%}
+  %}
 
-	{% include card.html color="warning"
+  {% include card.html color="warning"
-	title="Develop on GitHub"
+  title="Develop on GitHub"
-	image="/assets/img/icons/github.png"
+  image="/assets/img/icons/github.png"
-	url="https://github.com/privacytoolsIO/privacytools.io"
+  url="https://github.com/privacytoolsIO/privacytools.io"
-	website="GitHub"
+  website="GitHub"
-	description="The complete website source code is available on GitHub. Join our developer team!"
+  description="The complete website source code is available on GitHub. Join our developer team!"
-	extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">Contributor List</a>'
+  extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">Contributor List</a>'
-	%}
+  %}
 
 </div>
 
-<p>This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you.</p>
+<p>This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you.</p>

_includes/sections/password-managers.html

@@ -1,58 +1,57 @@
 <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>
 
 <div class="row mb-2">
 
-	{% include card.html color="success"
+  {% include card.html color="success"
-	title="Bitwarden - Cloud/Self-host"
+  title="Bitwarden - Cloud/Self-host"
-	image="/assets/img/tools/bitwarden.png"
+  image="/assets/img/tools/bitwarden.png"
-	url="https://bitwarden.com/"
+  url="https://bitwarden.com/"
-	footer="OS: Windows, macOS, Linux, iOS, Android, Web."
+  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."
+  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 card.html color="primary"
+  {% include card.html color="primary"
-	title="KeePass / KeePassXC - Local"
+  title="KeePass / KeePassXC - Local"
-	image="/assets/img/tools/KeePass.png"
+  image="/assets/img/tools/KeePass.png"
-	url="https://keepass.info/download.html"
+  url="https://keepass.info/download.html"
-	website="keepass.info"
+  website="keepass.info"
-	footer="OS: Windows, macOS, Linux, iOS, Android, BSD."
+  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
+  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.'
+  master key or a key file. The databases are encrypted using the best and most secure encryption algorithms currently known: AES and Twofish. See also: <a href="https://keepassxc.org/">KeePassXC</a> with official native cross-platform support for Windows/macOS/Linux.'
-	%}
+  %}
-
+  {% include card.html color="warning"
-	{% include card.html color="warning"
+  title="LessPass - Browser"
-	title="LessPass - Browser"
+  image="/assets/img/tools/LessPass.png"
-	image="/assets/img/tools/LessPass.png"
+  url="https://lesspass.com/"
-	url="https://lesspass.com/"
+  footer="OS: Windows, macOS, Linux, Android."
-	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."
-	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>
+  <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>
 
-	<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>
 
-	<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 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 single "Master Password" of your choice in order to unlock and access your entire username/password list.
-	</li>
+  </li>
 </ul>
 
 <h3>Related Information</h3>
 
 <ul>
-	<li><a href="https://peertube.mastodon.host/videos/watch/4cdedd90-a5b4-4022-b93d-828e85ed58cd">Edward Snowden on Passwords on Peertube</a></li>
+  <li><a href="https://peertube.mastodon.host/videos/watch/4cdedd90-a5b4-4022-b93d-828e85ed58cd">Edward Snowden on Passwords on Peertube</a></li>
-</ul>
+</ul>

_includes/sections/paste-services.html

@@ -7,4 +7,14 @@ description="PrivateBin is a minimalist, open source online pastebin where the s
 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/privacy-resources.html

@@ -3,41 +3,41 @@
 <h3>Guides</h3>
 
 <ul>
-	<li><a href="https://ssd.eff.org/"><strong>Surveillance Self-Defense by EFF</strong></a> - Guide to defending yourself from surveillance by using secure technology and developing careful practices.</li>
+  <li><a href="https://ssd.eff.org/"><strong>Surveillance Self-Defense by EFF</strong></a> - Guide to defending yourself from surveillance by using secure technology and developing careful practices.</li>
-	<li><a href="https://github.com/cryptoseb/CryptoPaper"><strong>The Crypto Paper</strong></a> - Privacy, Security and Anonymity for Every Internet User.</li>
+  <li><a href="https://github.com/cryptoseb/CryptoPaper"><strong>The Crypto Paper</strong></a> - Privacy, Security and Anonymity for Every Internet User.</li>
-	<li><a href="https://emailselfdefense.fsf.org/en/"><strong>Email Self-Defense by FSF</strong></a> - A guide to fighting surveillance with GnuPG encryption.</li>
+  <li><a href="https://emailselfdefense.fsf.org/en/"><strong>Email Self-Defense by FSF</strong></a> - A guide to fighting surveillance with GnuPG encryption.</li>
-	<li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/"><strong>The Ultimate Privacy Guide</strong></a> - Excellent privacy guide written by the creators of the bestVPN.com website.</li>
+  <li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/"><strong>The Ultimate Privacy Guide</strong></a> - Excellent privacy guide written by the creators of the bestVPN.com website.</li>
-	<li><a href="https://www.ivpn.net/privacy-guides"><strong>IVPN Privacy Guides</strong></a> - These privacy guides explain how to obtain vastly greater freedom, privacy and anonymity through compartmentalization and isolation.</li>
+  <li><a href="https://www.ivpn.net/privacy-guides"><strong>IVPN Privacy Guides</strong></a> - These privacy guides explain how to obtain vastly greater freedom, privacy and anonymity through compartmentalization and isolation.</li>
-	<li><a href="https://fried.com/privacy"><strong>The Ultimate Guide to Online Privacy</strong></a> - Comprehensive "Ninja Privacy Tips" and 150+ tools.</li>
+  <li><a href="https://fried.com/privacy"><strong>The Ultimate Guide to Online Privacy</strong></a> - Comprehensive "Ninja Privacy Tips" and 150+ tools.</li>
 </ul>
 
 <h3>Information</h3>
 
 <ul>
-	<li><a href="https://www.reddit.com/r/privacytoolsIO/wiki/index"><strong>r/privacytoolsIO Wiki</strong></a> - Our Wiki on reddit.com.</li>
+  <li><a href="https://www.reddit.com/r/privacytoolsIO/wiki/index"><strong>r/privacytoolsIO Wiki</strong></a> - Our Wiki on reddit.com.</li>
-	<li><a href="https://www.grc.com/securitynow.htm"><strong>Security Now!</strong></a> - Weekly Internet Security Podcast by Steve Gibson and Leo Laporte.</li>
+  <li><a href="https://www.grc.com/securitynow.htm"><strong>Security Now!</strong></a> - Weekly Internet Security Podcast by Steve Gibson and Leo Laporte.</li>
-	<li><a href="https://www.jupiterbroadcasting.com/show/techsnap/"><strong>TechSNAP</strong></a> - Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry.</li>
+  <li><a href="https://www.jupiterbroadcasting.com/show/techsnap/"><strong>TechSNAP</strong></a> - Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry.</li>
-	<li><a href="https://keybase.io/"><strong>Keybase.io</strong></a> - Get a public key, safely, starting just with someone's social media username.</li>
+  <li><a href="https://keybase.io/"><strong>Keybase.io</strong></a> - Get a public key, safely, starting just with someone's social media username.</li>
-	<li><a href="https://freedom.press/"><strong>Freedom of the Press Foundation</strong></a> - Supporting and defending journalism dedicated to transparency and accountability since 2012.</li>
+  <li><a href="https://freedom.press/"><strong>Freedom of the Press Foundation</strong></a> - Supporting and defending journalism dedicated to transparency and accountability since 2012.</li>
-	<li><a href="https://www.erfahrungen.com/mit/anonymisierung/t/"><strong>Erfahrungen.com</strong></a> - German review aggregator website of privacy-related services.</li>
+  <li><a href="https://www.erfahrungen.com/mit/anonymisierung/t/"><strong>Erfahrungen.com</strong></a> - German review aggregator website of privacy-related services.</li>
-	<li><a href="https://tosdr.org/"><strong>Terms of Service; Didn't Read</strong></a> - "I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.</li>
+  <li><a href="https://tosdr.org/"><strong>Terms of Service; Didn't Read</strong></a> - "I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.</li>
-	<li><a href="https://privacy.net/us-government-surveillance-spying-data"><strong>privacy.net</strong></a> - What does the US government know about you?</li>
+  <li><a href="https://privacy.net/us-government-surveillance-spying-data"><strong>privacy.net</strong></a> - What does the US government know about you?</li>
 </ul>
 
 <h3>Tools</h3>
 
 <ul>
-	<li><a href="https://ipleak.net/"><strong>ipleak.net</strong></a> - IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites.</li>
+  <li><a href="https://ipleak.net/"><strong>ipleak.net</strong></a> - IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites.</li>
-	<li><a href="https://www.ghacks.net/2015/12/28/the-ultimate-online-privacy-test-resource-list/"><strong>The ultimate Online Privacy Test Resource List</strong></a> - A collection of Internet sites that check whether your web browser leaks information.</li>
+  <li><a href="https://www.ghacks.net/2015/12/28/the-ultimate-online-privacy-test-resource-list/"><strong>The ultimate Online Privacy Test Resource List</strong></a> - A collection of Internet sites that check whether your web browser leaks information.</li>
-	<li><a href="https://prism-break.org/"><strong>PRISM Break</strong></a> - We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services.</li>
+  <li><a href="https://prism-break.org/"><strong>PRISM Break</strong></a> - We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services.</li>
-	<li><a href="https://securityinabox.org/"><strong>Security in-a-Box</strong></a> - A guide to digital security for activists and human rights defenders throughout the world.</li>
+  <li><a href="https://securityinabox.org/"><strong>Security in-a-Box</strong></a> - A guide to digital security for activists and human rights defenders throughout the world.</li>
-	<li><a href="https://securedrop.org/"><strong>SecureDrop</strong></a> - An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created
+  <li><a href="https://securedrop.org/"><strong>SecureDrop</strong></a> - An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created
-		by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation.</li>
+    by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation.</li>
-	<li><a href="https://pack.resetthenet.org/"><strong>Reset The Net - Privacy Pack</strong></a> - Help fight to end mass surveillance. Get these tools to protect yourself and your friends.</li>
+  <li><a href="https://pack.resetthenet.org/"><strong>Reset The Net - Privacy Pack</strong></a> - Help fight to end mass surveillance. Get these tools to protect yourself and your friends.</li>
-	<li><a href="https://secfirst.org/"><strong>Security First</strong></a> - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.</li>
+  <li><a href="https://secfirst.org/"><strong>Security First</strong></a> - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.</li>
-	<li><a href="https://notabug.org/themusicgod1/cloudflare-tor"><strong>Block Cloudflare MiTM Attack</strong></a> - Firefox add-on to detect and block Cloudflare MITM attack.</li>
+  <li><a href="https://notabug.org/themusicgod1/cloudflare-tor"><strong>Block Cloudflare MiTM Attack</strong></a> - Firefox add-on to detect and block Cloudflare MITM attack.</li>
-	<li><a href="https://www.osalt.com/"><strong>Osalt</strong></a> - A directory to help you find open source alternatives to proprietary tools.</li>
+  <li><a href="https://www.osalt.com/"><strong>Osalt</strong></a> - A directory to help you find open source alternatives to proprietary tools.</li>
-	<li><a href="https://alternativeto.net/"><strong>AlternativeTo</strong></a> - A directory to help find alternatives to other software, with the option to only show open source software</li>
+  <li><a href="https://alternativeto.net/"><strong>AlternativeTo</strong></a> - A directory to help find alternatives to other software, with the option to only show open source software</li>
 </ul>
 
-<p>Note: Just being open source does not make software secure!</p>
+<p>Note: Just being open source does not make software secure!</p>

_includes/sections/productivity-tools.html

@@ -2,7 +2,7 @@
 
 <div class="row mb-2">
 
-	{% include card.html color="success"
+  {% include card.html color="success"
     title="CryptPad"
     image="/assets/img/provider/CryptPad.png"
 
@@ -12,7 +12,7 @@
     footer='OS: Linux, macOS, Windows, Web.'
   %}
 
-	{% include card.html color="primary"
+  {% include card.html color="primary"
   title="Etherpad"
   image="/assets/img/tools/Etherpad.png"
   url="https://etherpad.org/"
@@ -20,7 +20,7 @@
   description="Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc. <a href=https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad>Sites That Run Etherpad</a>"
   %}
 
-	{% include card.html color="warning"
+  {% include card.html color="warning"
   title="Write.as"
   image="/assets/img/tools/WriteAs.png"
   url="https://write.as/"
@@ -34,10 +34,10 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
+  <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
-	<li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
+  <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
-	<li><a href="https://disroot.org/">disroot.org</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
+  <li><a href="https://disroot.org/">disroot.org</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
-	<li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, which is free and OpenSource. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
+  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, which is free and OpenSource. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
-	<li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite</li>
+  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite</li>
-	<li><a href="https://vscodium.com/">VSCodium</a> - Fork of Visual Studio Code editor without Microsoft's tracking </li>
+  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Visual Studio Code editor without Microsoft's tracking </li>
-</ul>
+</ul>

_includes/sections/quotes.html

@@ -1,43 +1,43 @@
 <div class="page-header">
-	<h1>Privacy? I don't have anything to hide.</h1>
+  <h1>Privacy? I don't have anything to hide.</h1>
 </div>
 <blockquote class="blockquote">
-	<p><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - Why privacy matters - TED Talk"><img src="/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg" width="177" height="200" class="img-fluid float-right ml-2" alt="Glenn Greenwald: Why privacy matters"></a>
+  <p><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - Why privacy matters - TED Talk"><img src="/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg" width="177" height="200" class="img-fluid float-right ml-2" alt="Glenn Greenwald: Why privacy matters"></a>
-		Over the last 16 months, as I've debated this issue around the world, every single time somebody has said to me, "I don't really worry about invasions of privacy because I don't have anything to hide." I always say the same thing to them. I get out a
+  Over the last 16 months, as I've debated this issue around the world, every single time somebody has said to me, "I don't really worry about invasions of privacy because I don't have anything to hide." I always say the same thing to them. I get out a
-		pen, I write down my email address. I say, "Here's my email address. What I want you to do when you get home is email me the passwords to all of your email accounts, not just the nice, respectable work one in your name, but all of them, because I
+  pen, I write down my email address. I say, "Here's my email address. What I want you to do when you get home is email me the passwords to all of your email accounts, not just the nice, respectable work one in your name, but all of them, because I
-		want to be able to just troll through what it is you're doing online, read what I want to read and publish whatever I find interesting. After all, if you're not a bad person, if you're doing nothing wrong, you should have nothing to hide." <strong>Not a single person has taken me up on that offer.</strong></p>
+  want to be able to just troll through what it is you're doing online, read what I want to read and publish whatever I find interesting. After all, if you're not a bad person, if you're doing nothing wrong, you should have nothing to hide." <strong>Not a single person has taken me up on that offer.</strong></p>
-	<footer class="blockquote-footer">Glenn Greenwald in <cite title="Why privacy matters - TED Talk"><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters">Why privacy matters - TED Talk</a></cite></footer>
+  <footer class="blockquote-footer">Glenn Greenwald in <cite title="Why privacy matters - TED Talk"><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters">Why privacy matters - TED Talk</a></cite></footer>
 </blockquote>
 
 <blockquote class="blockquote">
-	<p>The primary reason for window curtains in our house, is to stop people from being able to see in. The reason we don’t want them to see in is because we consider much of what we do inside our homes to be private. Whether that be having dinner at the table, watching a movie with your kids, or even engaging in intimate or sexual acts with your partner. None of these things are illegal by any means but even knowing this, we still keep the curtains and blinds on our windows. We clearly have this strong desire for privacy when it comes to our personal life and the public.</p>
+  <p>The primary reason for window curtains in our house, is to stop people from being able to see in. The reason we don’t want them to see in is because we consider much of what we do inside our homes to be private. Whether that be having dinner at the table, watching a movie with your kids, or even engaging in intimate or sexual acts with your partner. None of these things are illegal by any means but even knowing this, we still keep the curtains and blinds on our windows. We clearly have this strong desire for privacy when it comes to our personal life and the public.</p>
-	<footer class="blockquote-footer">Joshua in <cite title="The Crypto Paper"><a href="https://github.com/cryptoseb/CryptoPaper#let-me-explain-further">The Crypto Paper</a></cite></footer>
+   <footer class="blockquote-footer">Joshua in <cite title="The Crypto Paper"><a href="https://github.com/cryptoseb/CryptoPaper#let-me-explain-further">The Crypto Paper</a></cite></footer>
 </blockquote>
 
 <h4>Read also:</h4>
 
 <ul>
-	<li><a href="https://en.wikipedia.org/wiki/Nothing_to_hide_argument">Nothing to hide argument (Wikipedia)</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Nothing_to_hide_argument">Nothing to hide argument (Wikipedia)</a></li>
-	<li><a href="https://www.reddit.com/r/privacy/comments/3hynvp/how_do_you_counter_the_i_have_nothing_to_hide/">How do you counter the "I have nothing to hide?" argument? (reddit.com)</a></li>
+  <li><a href="https://www.reddit.com/r/privacy/comments/3hynvp/how_do_you_counter_the_i_have_nothing_to_hide/">How do you counter the "I have nothing to hide?" argument? (reddit.com)</a></li>
-	<li><a href="https://papers.ssrn.com/sol3/papers.cfm?abstract_id=998565">'I've Got Nothing to Hide' and Other Misunderstandings of Privacy (Daniel J. Solove - San Diego Law Review)</a></li>
+  <li><a href="https://papers.ssrn.com/sol3/papers.cfm?abstract_id=998565">'I've Got Nothing to Hide' and Other Misunderstandings of Privacy (Daniel J. Solove - San Diego Law Review)</a></li>
 </ul>
 
 <h1 id="quotes" class="anchor"><a href="#quotes"><i class="fas fa-link anchor-icon"></i></a> Quotes</h1>
 
 <blockquote class="blockquote">
-	<p>Arguing that you don't care about the right to privacy because you have nothing to hide is no different than saying you don't care about free speech because you have nothing to say.</p>
+  <p>Arguing that you don't care about the right to privacy because you have nothing to hide is no different than saying you don't care about free speech because you have nothing to say.</p>
-	<footer class="blockquote-footer">Edward Snowden on <cite title="Just days left to kill mass surveillance under Section 215 of the Patriot Act. We are Edward Snowden and the ACLU's Jameel Jaffer. AUA."><a href="https://www.reddit.com/r/IAmA/comments/36ru89/just_days_left_to_kill_mass_surveillance_under/crglgh2">Reddit</a></cite></footer>
+  <footer class="blockquote-footer">Edward Snowden on <cite title="Just days left to kill mass surveillance under Section 215 of the Patriot Act. We are Edward Snowden and the ACLU's Jameel Jaffer. AUA."><a href="https://www.reddit.com/r/IAmA/comments/36ru89/just_days_left_to_kill_mass_surveillance_under/crglgh2">Reddit</a></cite></footer>
 </blockquote>
 
 <blockquote class="blockquote">
-	<p>The NSA has built an infrastructure that allows it to intercept almost everything. With this capability, the vast majority of human communications are automatically ingested without targeting. If I wanted to see your emails or your wife's phone, all
+  <p>The NSA has built an infrastructure that allows it to intercept almost everything. With this capability, the vast majority of human communications are automatically ingested without targeting. If I wanted to see your emails or your wife's phone, all
-		I have to do is use intercepts. I can get your emails, passwords, phone records, credit cards. I don't want to live in a society that does these sort of things... I do not want to live in a world where everything I do and say is recorded. That is
+  I have to do is use intercepts. I can get your emails, passwords, phone records, credit cards. I don't want to live in a society that does these sort of things... I do not want to live in a world where everything I do and say is recorded. That is
-		not something I am willing to support or live under. </p>
+  not something I am willing to support or live under. </p>
-	<footer class="blockquote-footer">Edward Snowden in <cite title="Edward Snowden, NSA files source: 'If they want to get you, in time they will"><a href="https://www.theguardian.com/world/2013/jun/09/nsa-whistleblower-edward-snowden-why">The Guardian</a></cite></footer>
+  <footer class="blockquote-footer">Edward Snowden in <cite title="Edward Snowden, NSA files source: 'If they want to get you, in time they will"><a href="https://www.theguardian.com/world/2013/jun/09/nsa-whistleblower-edward-snowden-why">The Guardian</a></cite></footer>
 </blockquote>
 
 <blockquote class="blockquote">
-	<p>We all need places where we can go to explore without the judgmental eyes of other people being cast upon us, only in a realm where we're not being watched can we really test the limits of who we want to be. It's really in the private realm where
+  <p>We all need places where we can go to explore without the judgmental eyes of other people being cast upon us, only in a realm where we're not being watched can we really test the limits of who we want to be. It's really in the private realm where
-		dissent, creativity and personal exploration lie.</p>
+  dissent, creativity and personal exploration lie.</p>
-	<footer class="blockquote-footer">Glenn Greenwald in <cite title="Glenn Greenwald On Why Privacy Is Vital, Even If You 'Have Nothing To Hide"><a href="https://www.huffingtonpost.com/2014/06/20/glenn-greenwald-privacy_n_5509704.html">Huffington Post</a></cite></footer>
+  <footer class="blockquote-footer">Glenn Greenwald in <cite title="Glenn Greenwald On Why Privacy Is Vital, Even If You 'Have Nothing To Hide"><a href="https://www.huffingtonpost.com/2014/06/20/glenn-greenwald-privacy_n_5509704.html">Huffington Post</a></cite></footer>
-</blockquote>
+</blockquote>

_includes/sections/resources.html

@@ -4,52 +4,52 @@
 
 <div class="row">
 
-	{% include card.html color="success"
+  {% include card.html color="success"
-	title="Providers"
+  title="Providers"
-	icon="fas fa-server"
+  icon="fas fa-server"
-	iconcolor="dark"
+  iconcolor="dark"
-	page="/providers/"
+  page="/providers/"
-	description="Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!"
+  description="Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!"
-	%}
+  %}
 
-	{% include card.html color="primary"
+  {% include card.html color="primary"
-	title="Web Browsers"
+  title="Web Browsers"
-	icon="far fa-compass"
+  icon="far fa-compass"
-	iconcolor="dark"
+  iconcolor="dark"
-	page="/browsers/"
+  page="/browsers/"
-	description="Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks."
+  description="Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks."
-	%}
+  %}
 
-	{% include card.html color="warning"
+  {% include card.html color="warning"
-	title="Software"
+  title="Software"
-	icon="far fa-window-restore"
+  icon="far fa-window-restore"
-	iconcolor="dark"
+  iconcolor="dark"
-	page="/software/"
+  page="/software/"
-	description="Discover a variety of open source software built to protect your privacy and keep your digital data secure."
+  description="Discover a variety of open source software built to protect your privacy and keep your digital data secure."
-	%}
+  %}
 
-	{% include card.html color="info"
+  {% include card.html color="info"
-	title="Operating Systems"
+  title="Operating Systems"
-	icon="fas fa-desktop"
+  icon="fas fa-desktop"
-	iconcolor="dark"
+  iconcolor="dark"
-	page="/operating-systems/"
+  page="/operating-systems/"
-	description="Find out how your operating system is comprimising your privacy, and what simple alternatives exist."
+  description="Find out how your operating system is comprimising your privacy, and what simple alternatives exist."
-	%}
+  %}
 
-	{% include card.html color="secondary"
+  {% include card.html color="secondary"
-	title="privacytoolsIO Services"
+  title="privacytoolsIO Services"
-	icon="far fa-eye-slash"
+  icon="far fa-eye-slash"
-	iconcolor="dark"
+  iconcolor="dark"
-	page="/services/"
+  page="/services/"
-	description="The privacytools.io team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!"
+  description="The privacytools.io team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!"
-	%}
+  %}
 
-	{% include card.html color="danger"
+  {% include card.html color="danger"
-	title="Donate"
+  title="Donate"
-	icon="fas fa-donate"
+  icon="fas fa-donate"
-	iconcolor="dark"
+  iconcolor="dark"
-	page="/donate/"
+  page="/donate/"
-	description="We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating."
+  description="We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating."
-	%}
+  %}
 
-</div>
+</div>

_includes/sections/router-firmware.html

@@ -1,35 +1,38 @@
 <h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> Open Source Router Firmware</h1>
 
-<div class="row mb-2">
+{% 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"
+%}
 
-	{% include card.html color="success"
+{% include cardv2.html
-	title="OpenWrt"
+title="pfSense"
-	labels="warning:contrib:This software may depend on or recommend non-free software."
+image="/assets/img/tools/pfSense.png"
-	image="/assets/img/tools/OpenWrt.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."
-	url="https://openwrt.org/"
+badges="info:BSD"
-	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."
+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="primary"
+{% include cardv2.html
-	title="pfSense"
+title="LibreCMC"
-	labels="warning:contrib:This software may depend on or recommend non-free software."
+image="/assets/img/tools/LibreCMC.png"
-	image="/assets/img/tools/pfSense.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)."
-	url="https://www.pfsense.org/"
+badges="info:GNU/Linux"
-	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."
+website="https://librecmc.org"
-	%}
+git="https://gogs.librecmc.org/libreCMC/libreCMC"
-
+%}
-	{% 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> - 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.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-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
+  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
-</ul>
+</ul>

_includes/sections/search-engines.html

@@ -1,7 +1,7 @@
 <h1 id="search" class="anchor"><a href="#search"><i class="fas fa-link anchor-icon"></i></a> Privacy Respecting Search Engines</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong> If you are currently using search engines like Google, Bing or Yahoo, you should pick an alternative here. </strong>
+  <strong> If you are currently using search engines like Google, Bing or Yahoo, you should pick an alternative here. </strong>
 </div>
 
 {% include cardv2.html
@@ -45,17 +45,17 @@ github="https://github.com/Qwant/"
 <h3>Firefox Addon</h3>
 
 <ul>
-	<li>
+  <li>
-		<a href="https://addons.mozilla.org/firefox/addon/google-search-link-fix/">Google search link fix</a> - Firefox extension that prevents Google and Yandex search pages from modifying search result links when you click them. This is useful when
+    <a href="https://addons.mozilla.org/firefox/addon/google-search-link-fix/">Google search link fix</a> - Firefox extension that prevents Google and Yandex search pages from modifying search result links when you click them. This is useful when
-		copying links but it also helps privacy by preventing the search engines from recording your clicks. (<a href="https://github.com/palant/searchlinkfix">Open Source</a>)
+    copying links but it also helps privacy by preventing the search engines from recording your clicks. (<a href="https://github.com/palant/searchlinkfix">Open Source</a>)
-	</li>
+  </li>
 </ul>
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li><a href="https://yacy.net/">YaCy</a> - A free software P2P search engine powered by its users.</a></li>
+  <li><a href="https://yacy.net/">YaCy</a> - A free software P2P search engine powered by its users.</a></li>
-	<li><a href="https://jivesearch.com/">Jive Search</a> - A free software search engine with a similar look and feel to Google.</a></li>
+  <li><a href="https://jivesearch.com/">Jive Search</a> - A free software search engine with a similar look and feel to Google.</a></li>
-	<li><a href="https://metager.de/en/">MetaGer</a> - An open source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>
+  <li><a href="https://metager.de/en/">MetaGer</a> - An open source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>
-	<li><a href="https://www.mojeek.com/">Mojeek</a> - Independent and unbiased search results with no user tracking.</li>
+  <li><a href="https://www.mojeek.com/">Mojeek</a> - Independent and unbiased search results with no user tracking.</li>
-</ul>
+</ul>

_includes/sections/self-contained-networks.html

@@ -1,21 +1,21 @@
 <h1 id="darknets" class="anchor"><a href="#darknets"><i class="fas fa-link anchor-icon"></i></a> Self-contained Networks</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong>If you are currently browsing <a href="https://en.wikipedia.org/wiki/Surface_Web">clearnet</a> and want to access the <a href="https://en.wikipedia.org/wiki/Dark_web">dark web</a>, this section is for you.</strong>
+  <strong>If you are currently browsing <a href="https://en.wikipedia.org/wiki/Surface_Web">clearnet</a> and want to access the <a href="https://en.wikipedia.org/wiki/Dark_web">dark web</a>, this section is for you.</strong>
 </div>
 
 <div class="row mb-2">
 
-	{% include card.html color="success"
+  {% include card.html color="success"
-  title="Tor Browser"
+  title="Tor"
   image="/assets/img/tools/Tor-Project.png"
   url="https://www.torproject.org/"
   tor="http://expyuzz4wqqyqhjn.onion"
-  footer='OS: Windows, macOS, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, <a href="https://www.torproject.org/docs/android.html.en">Android</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>, Android (<a href="https://www.torproject.org/download/#android">Tor Browser</a>, <a href="https://guardianproject.info/apps/orbot/">Proxy other apps with Orbot</a>), <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a>'
   description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool."
   %}
 
-	{% include card.html color="primary"
+  {% include card.html color="primary"
   title="I2P Anonymous Network"
   image="/assets/img/tools/I2P.png"
   url="https://geti2p.net/"
@@ -24,7 +24,7 @@
   Web surfing, chatting, blogging and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open source and is published under multiple licenses."
   %}
 
-	{% include card.html color="warning"
+  {% include card.html color="warning"
   title="The Freenet Project"
   image="/assets/img/tools/Freenet.png"
   url="https://freenetproject.org/"
@@ -39,15 +39,15 @@
 <h3>Related Information</h3>
 
 <ul>
-	<li><a href="https://darknetdiaries.com/">darknetdiaries.com</a> - True stories from the dark side of the Internet.</li>
+  <li><a href="https://darknetdiaries.com/">darknetdiaries.com</a> - True stories from the dark side of the Internet.</li>
 </ul>
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-	<li><a href="https://zeronet.io/">ZeroNet</a> - Open, free and uncensorable websites, using Bitcoin cryptography and BitTorrent network.</li>
+  <li><a href="https://zeronet.io/">ZeroNet</a> - Open, free and uncensorable websites, using Bitcoin cryptography and BitTorrent network.</li>
-	<li><a href="https://retroshare.cc/">RetroShare</a> - Open Source cross-platform, Friend-2-Friend and secure decentralized communication platform.</li>
+  <li><a href="https://retroshare.cc/">RetroShare</a> - Open Source cross-platform, Friend-2-Friend and secure decentralized communication platform.</li>
-	<li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
+  <li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
-	<li><a href="https://ipfs.io/">IPFS</a> - A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. (<a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">important privacy warning</a>)</li>
+  <li><a href="https://ipfs.io/">IPFS</a> - A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. (<a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">important privacy warning</a>)</li>
-	<li><a href="https://yggdrasil-network.github.io/">Yggdrasil</a> - An early-stage implementation of a fully end-to-end encrypted IPv6 network. It is lightweight, self-arranging, supported on multiple platforms and allows pretty much any IPv6-capable application to communicate securely with other Yggdrasil nodes. Yggdrasil does not require you to have IPv6 Internet connectivity - it also works over IPv4. <span class="badge badge-warning" data-toggle="tooltip" title="The project is currently in early stages but it is being actively developed.">experimental <i class=\"far fa-question-circle\"></i></span> <span class="badge badge-danger" data-toggle="tooltip" title="Yggdrasil doesn't have a goal of providing anonymity and your peers know your IP address unless you are only using Tor/I2P peers.">privacy warning <i class="far fa-question-circle"></i></span></li>
+  <li><a href="https://yggdrasil-network.github.io/">Yggdrasil</a> - An early-stage implementation of a fully end-to-end encrypted IPv6 network. It is lightweight, self-arranging, supported on multiple platforms and allows pretty much any IPv6-capable application to communicate securely with other Yggdrasil nodes. Yggdrasil does not require you to have IPv6 Internet connectivity - it also works over IPv4. <span class="badge badge-warning" data-toggle="tooltip" title="The project is currently in early stages but it is being actively developed.">experimental <i class=\"far fa-question-circle\"></i></span> <span class="badge badge-danger" data-toggle="tooltip" title="Yggdrasil doesn't have a goal of providing anonymity and your peers know your IP address unless you are only using Tor/I2P peers.">privacy warning <i class="far fa-question-circle"></i></span></li>
-</ul>
+</ul>

_includes/sections/selfhosted-cloud.html

@@ -1,12 +1,12 @@
 <h1 id="mycloud" class="anchor"><a href="#mycloud"><i class="fas fa-link anchor-icon"></i></a> Self-Hosted Cloud Server Software</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong>If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own.</strong>
+  <strong>If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own.</strong>
 </div>
 
 <div class="row mb-2">
 
-	{% include card.html color="success"
+  {% include card.html color="success"
   title="Pydio"
   image="/assets/img/tools/Pydio.png"
   url="https://pydio.com/"
@@ -15,7 +15,7 @@
   to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs."
   %}
 
-	{% include card.html color="primary"
+  {% include card.html color="primary"
   title="Tahoe-LAFS"
   image="/assets/img/tools/Tahoe-LAFS.png"
   url="https://www.tahoe-lafs.org/"
@@ -24,7 +24,7 @@
   taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
   %}
 
-	{% include card.html color="warning"
+  {% include card.html color="warning"
   title="Nextcloud"
   image="/assets/img/provider/Nextcloud.png"
   url="https://nextcloud.com/"
@@ -36,5 +36,5 @@
 
 <h3>Worth Mentioning</h3>
 <ul>
-	<li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - End-to-end encrypted real time collaboration sharing folders, media, and documents (open-source).</li>
+  <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - End-to-end encrypted real time collaboration sharing folders, media, and documents (open-source).</li>
-</ul>
+</ul>

_includes/sections/social-networks.html

@@ -1,7 +1,7 @@
 <h1 id="social" class="anchor"><a href="#social"><i class="fas fa-link anchor-icon"></i></a> Decentralized Social Networks</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong> If you are currently using Social Networks like Facebook or Twitter, you should pick an alternative here. </strong>
+  <strong> If you are currently using Social Networks like Facebook or Twitter, you should pick an alternative here. </strong>
 </div>
 
 {% include cardv2.html
@@ -66,21 +66,21 @@ web=""
 
 <h3>Worth Mentioning</h3>
 <ul>
-	<li><a href="https://www.minds.com/">Minds</a> - An <a href="https://gitlab.com/minds">open source</a> and distributed social networking service, integrating the blockchain to reward the community.</li>
+  <li><a href="https://www.minds.com/">Minds</a> - An <a href="https://gitlab.com/minds">open source</a> and distributed social networking service, integrating the blockchain to reward the community.</li>
-	<li><a href="https://movim.eu/">Movim</a> - Federated social platform that relies on the XMPP standard and therefore allows you to exchange with many other clients on all devices.</li>
+  <li><a href="https://movim.eu/">Movim</a> - Federated social platform that relies on the XMPP standard and therefore allows you to exchange with many other clients on all devices.</li>
 </ul>
 
 <h3>Related Information</h3>
 <ul>
-	<li><a href="https://addons.mozilla.org/firefox/addon/mastodon-simplified-federation/">Mastodon: Simplified Federation</a> - Firefox Extension to improve usability for remote Mastodon instances.</li>
+  <li><a href="https://addons.mozilla.org/firefox/addon/mastodon-simplified-federation/">Mastodon: Simplified Federation</a> - Firefox Extension to improve usability for remote Mastodon instances.</li>
-	<li><a href="https://justdeleteme.xyz/">JustDeleteMe</a> - A directory of direct links to delete your account from web services.</li>
+  <li><a href="https://justdeleteme.xyz/">JustDeleteMe</a> - A directory of direct links to delete your account from web services.</li>
-	<li><a href="https://forget.codl.fr/">Forget</a> - A service that automatically deletes your old posts on Twitter and Mastodon that everyone has forgotten about.</li>
+  <li><a href="https://forget.codl.fr/">Forget</a> - A service that automatically deletes your old posts on Twitter and Mastodon that everyone has forgotten about.</li>
 </ul>
 
 <h3>Facebook Related</h3>
 <ul>
-	<li><a href="https://www.facebook.com/help/delete_account">Delete your Facebook account</a> - Direct link to delete your Facebook account without being able to reactivate it again.</li>
+  <li><a href="https://www.facebook.com/help/delete_account">Delete your Facebook account</a> - Direct link to delete your Facebook account without being able to reactivate it again.</li>
-	<li><a href="https://deletefacebook.com/">How To Permanently Delete A Facebook Account</a> - This guide will take you through a smooth and successful Facebook account deletion.</li>
+  <li><a href="https://deletefacebook.com/">How To Permanently Delete A Facebook Account</a> - This guide will take you through a smooth and successful Facebook account deletion.</li>
-	<li><a href="https://addons.mozilla.org/firefox/addon/facebook-container/">Facebook Container by Mozilla</a> - Prevent Facebook from tracking you around the web.</li>
+  <li><a href="https://addons.mozilla.org/firefox/addon/facebook-container/">Facebook Container by Mozilla</a> - Prevent Facebook from tracking you around the web.</li>
-	<li><a href="https://www.stopusingfacebook.co/">Stop using Facebook</a> - A curated list of reasons to stop using Facebook and how to do it.</li>
+  <li><a href="https://www.stopusingfacebook.co/">Stop using Facebook</a> - A curated list of reasons to stop using Facebook and how to do it.</li>
-</ul>
+</ul>

_includes/sections/social-news-aggregator.html

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

@@ -0,0 +1,43 @@
+<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>Experimental</a>:The server side of Keybase runs on proprietary code and is centralized."
+website="https://keybase.io/"
+forum="https://forum.privacytools.io/t/discussion-keybase/1224"
+github="https://github.com/Keybase"
+android=""
+ios=""
+mac=""
+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,41 +1,9 @@
-<h1 id="voip" class="anchor"><a href="#voip"><i class="fas fa-link anchor-icon"></i></a> Encrypted Video & Voice Messenger</h1>
+<h1 id="voip" class="anchor"><a href="#voip"><i class="fas fa-link anchor-icon"></i></a> Video/Voice Calling</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong>If you are currently using a Video & Voice Messenger like Skype, Viber or Google Hangouts, you should pick an alternative here.</strong>
+  <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.
 </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"
@@ -51,20 +19,30 @@ 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</a> - Jitsi is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application.</li>
+  <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://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><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>More information about Mumble:</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>
-</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>
+</ul>

_includes/sections/vpn.html

@@ -1,337 +1,307 @@
 <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>All providers listed here are outside the US, use encryption, accept Bitcoin, support OpenVPN and have a no logging policy.</strong>
+  <strong>All providers listed here are outside the US, use encryption, accept Bitcoin, support OpenVPN and have a no logging policy.</strong>
 </div>
 
 {% assign eur_to_usd = 1.14 %}
 <div class="table-responsive">
-	<table class="table sortable-theme-bootstrap" data-sortable>
+  <table class="table sortable-theme-bootstrap" data-sortable>
-		<thead>
+    <thead>
-			<tr>
+      <tr>
-				<th data-sorted="true" data-sorted-direction="descending">VPN Provider</th>
+        <th data-sorted="true" data-sorted-direction="descending">VPN Provider</th>
-				<th data-sortable="false">Website</th>
+        <th data-sortable="false">Website</th>
-				<th data-sortable="true">Since</th>
+        <th data-sortable="true">Since</th>
-				<th data-sortable="true">Yearly Price</th>
+        <th data-sortable="true">Yearly Price</th>
-				<th data-sortable="true">Free Trial</th>
+        <th data-sortable="true">Free Trial</th>
-				<th data-sortable="true" title="Number of Servers"># Servers</th>
+        <th data-sortable="true" title="Number of Servers"># Servers</th>
-				<th data-sortable="true">WireGuard</th>
+        <th data-sortable="true">WireGuard</th>
-				<th data-sortable="true">Jurisdiction</th>
+        <th data-sortable="true">Jurisdiction</th>
-			</tr>
+      </tr>
-		</thead>
+    </thead>
-		<tbody>
+    <tbody>
-			<tr>
+      <tr>
-				<td data-value="AirVPN">
+        <td data-value="AirVPN">
-					<a href="https://airvpn.org/"><img alt="AirVPN" src="/assets/img/provider/AirVPN.png" width="200" height="70"></a></td>
+          <a href="https://airvpn.org/"><img alt="AirVPN" src="/assets/img/provider/AirVPN.png" width="200" height="70"></a></td>
-				<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>
+          <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>
-				<td data-value="2010">2010</td>
+        <td data-value="2010">2010</td>
-				<td data-value="{{ 54 | times: eur_to_usd }}">54 €</td>
+        <td data-value="{{ 54 | times: eur_to_usd }}">54 €</td>
-				<td><span class="label label-success">Yes</span></td>
+        <td><span class="label label-success">Yes</span></td>
-				<td>162</td>
+        <td>162</td>
-				<td><span class="label label-warning">No</span></td>
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="flag-icon flag-icon-it"></span> Italy</td>
+        <td><span class="flag-icon flag-icon-it"></span> Italy</td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="AzireVPN">
+        <td data-value="AzireVPN">
-					<a href="https://www.azirevpn.com/"><img alt="AzireVPN" src="/assets/img/provider/AzireVPN.png" width="200" height="70"></a>
+          <a href="https://www.azirevpn.com/"><img alt="AzireVPN" src="/assets/img/provider/AzireVPN.png" width="200" height="70"></a>
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2012">2012</td>
+        <td data-value="2012">2012</td>
-				<td data-value="{{ 45 | times: eur_to_usd }}">45 €</td>
+        <td data-value="{{ 45 | times: eur_to_usd }}">45 €</td>
-				<td><span class="label label-success">Yes</span></td>
+        <td><span class="label label-success">Yes</span></td>
-				<td>22</td>
+        <td>22</td>
-				<td><span class="label label-success">Yes</span></td>
+        <td><span class="label label-success">Yes</span></td>
-				<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="blackVPN">
+        <td data-value="blackVPN">
-					<a href="https://www.blackvpn.com/"><img alt="blackVPN" src="/assets/img/provider/blackVPN.png" width="200" height="70"></a>
+          <a href="https://www.blackvpn.com/"><img alt="blackVPN" src="/assets/img/provider/blackVPN.png" width="200" height="70"></a>
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2009">2009</td>
+        <td data-value="2009">2009</td>
-				<td data-value="{{ 49 | times: eur_to_usd }}">49 €</td>
+        <td data-value="{{ 49 | times: eur_to_usd }}">49 €</td>
-				<td><span class="label label-success">Yes</span></td>
+        <td><span class="label label-success">Yes</span></td>
-				<td>31</td>
+        <td>31</td>
-				<td><span class="label label-warning">No</span></td>
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
+        <td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="cryptostorm">
+        <td data-value="ExpressVPN">
-					<a href="https://cryptostorm.is/"><img alt="Cryptostorm" src="/assets/img/provider/Cryptostorm.png" width="200" height="70"></a>
+          <a href="https://www.expressvpn.com/"><img alt="ExpressVPN" src="/assets/img/provider/ExpressVPN.png" width="200" height="70"></a>
-				</td>
+        </td>
-				<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="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://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>
+          <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>
-				<td data-value="2006">2006</td>
+        <td data-value="2009">2009</td>
-				<td data-value="52">$ 52</td>
+        <td data-value="100">$ 99.95</td> <!-- USD on December 28, 2018 -->
-				<td><span class="label label-success">Yes</span></td>
+        <td><span class="label label-success">Yes</span></td>
-				<td>28</td>
+        <td>148</td>
-				<td><span class="label label-success">Yes</span></td>
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="flag-icon flag-icon-is"></span> Iceland</td>
+        <td><span class="flag-icon flag-icon-vg"></span> British Virgin Islands</td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="ExpressVPN">
+        <td data-value="FrootVPN">
-					<a href="https://www.expressvpn.com/"><img alt="ExpressVPN" src="/assets/img/provider/ExpressVPN.png" width="200" height="70"></a>
+          <a href="https://www.frootvpn.com/"><img alt="FrootVPN" src="/assets/img/provider/FrootVPN.png" width="200" height="70"></a>
-				</td>
+        </td>
-				<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="https://www.frootvpn.com/" href="https://www.frootvpn.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>
+        <td data-value="2014">2014</td>
-				<td data-value="2009">2009</td>
+        <td data-value="36">$ 35.88</td>
-				<td data-value="100">$ 99.95</td> <!-- USD on December 28, 2018 -->
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="label label-success">Yes</span></td>
+        <td>27</td>
-				<td>148</td>
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
-				<td><span class="flag-icon flag-icon-vg"></span> British Virgin Islands</td>
+      </tr>
-			</tr>
 
-			<tr>
+      <tr>
-				<td data-value="FrootVPN">
+        <td data-value="hide.me">
-					<a href="https://www.frootvpn.com/"><img alt="FrootVPN" src="/assets/img/provider/FrootVPN.png" width="200" height="70"></a>
+          <a href="https://hide.me/"><img alt="hide.me" src="/assets/img/provider/hide.me.png" width="200" height="70"></a>
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2014">2014</td>
+        <td data-value="2012">2012</td>
-				<td data-value="36">$ 35.88</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-warning">No</span></td>
+        <td><span class="label label-success">Yes</span></td>
-				<td>27</td>
+        <td>160+</td>
-				<td><span class="label label-warning">No</span></td>
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+        <td><span class="flag-icon flag-icon-my"></span> Malaysia</td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="hide.me">
+        <td data-value="IVPN">
-					<a href="https://hide.me/"><img alt="hide.me" src="/assets/img/provider/hide.me.png" width="200" height="70"></a>
+          <a href="https://www.ivpn.net/"><img alt="IVPN" src="/assets/img/provider/IVPN.png" width="200" height="70"></a>
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2012">2012</td>
+        <td data-value="2009">2009</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 data-value="100">$ 100</td>
-				<td><span class="label label-success">Yes</span></td>
+        <td><span class="label label-success">Yes</span></td>
-				<td>160+</td>
+        <td>38</td>
-				<td><span class="label label-warning">No</span></td>
+        <td><span class="label label-success">Yes</span></td>
-				<td><span class="flag-icon flag-icon-my"></span> Malaysia</td>
+        <td><span class="flag-icon flag-icon-gi"></span> Gibraltar</td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="IVPN">
+        <td data-value="Mullvad">
-					<a href="https://www.ivpn.net/"><img alt="IVPN" src="/assets/img/provider/IVPN.png" width="200" height="70"></a>
+          <a href="https://mullvad.net/"><img alt="Mullvad" src="/assets/img/provider/Mullvad.png" width="200" height="70"></a>
-				</td>
+        </td>
-				<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>
+          <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>
-				</td>
+          <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 data-value="2009">2009</td>
+        </td>
-				<td data-value="100">$ 100</td>
+        <td data-value="2009">2009</td>
-				<td><span class="label label-success">Yes</span></td>
+        <td data-value="{{ 60 | times: eur_to_usd }}">60 €</td>
-				<td>38</td>
+        <td><span class="label label-success">No</span></td>
-				<td><span class="label label-success">Yes</span></td>
+        <td>281</td>
-				<td><span class="flag-icon flag-icon-gi"></span> Gibraltar</td>
+        <td><span class="label label-success">Yes</span></td>
-			</tr>
+        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="Mullvad">
+        <td data-value="NordVPN">
-					<a href="https://mullvad.net/"><img alt="Mullvad" src="/assets/img/provider/Mullvad.png" width="200" height="70"></a>
+          <a href="https://nordvpn.com/"><img alt="NordVPN" src="/assets/img/provider/NordVPN.png" width="200" height="70"></a>
-				</td>
+        </td>
-				<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="https://nordvpn.com/" href="https://nordvpn.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://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>
+        <td data-value="2012">2012</td>
-				<td data-value="2009">2009</td>
+        <td data-value="84">$ 83.88</td>
-				<td data-value="{{ 60 | times: eur_to_usd }}">60 €</td>
+        <td><span class="label label-success">Yes</span></td>
-				<td><span class="label label-success">No</span></td>
+        <td>5200+</td>
-				<td>281</td>
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="label label-success">Yes</span></td>
+        <td><span class="flag-icon flag-icon-pa"></span> Panama</td>
-				<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+      </tr>
-			</tr>
 
-			<tr>
+      <tr>
-				<td data-value="NordVPN">
+        <td data-value="OVPN">
-					<a href="https://nordvpn.com/"><img alt="NordVPN" src="/assets/img/provider/NordVPN.png" width="200" height="70"></a>
+          <a href="https://www.ovpn.com/"><img alt="OVPN" src="/assets/img/provider/ovpn.png" width="200" height="70"></a>
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2012">2012</td>
+        <td data-value="2014">2014</td>
-				<td data-value="84">$ 83.88</td>
+        <td data-value="{{ 84 | times: eur_to_usd }}">84 €</td>
-				<td><span class="label label-success">Yes</span></td>
+        <td><span class="label label-success">Yes</span></td>
-				<td>5200+</td>
+        <td>67</td>
-				<td><span class="label label-warning">No</span></td>
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="flag-icon flag-icon-pa"></span> Panama</td>
+        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="OVPN">
+        <td data-value="Perfect Privacy">
-					<a href="https://www.ovpn.com/"><img alt="OVPN" src="/assets/img/provider/ovpn.png" width="200" height="70"></a>
+          <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>
-				<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>
+          <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>
-				<td data-value="2014">2014</td>
+        <td data-value="2008">2008</td>
-				<td data-value="{{ 84 | times: eur_to_usd }}">84 €</td>
+        <td data-value="{{ 119.99 | times: eur_to_usd }}">119.99 €</td>
-				<td><span class="label label-success">Yes</span></td>
+        <td><span class="label label-warning">No</span></td>
-				<td>67</td>
+        <td>54</td>
-				<td><span class="label label-warning">No</span></td>
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="Perfect Privacy">
+        <td data-value="ProtonVPN">
-					<a href="https://www.perfect-privacy.com/"><img alt="Perfect Privacy" src="/assets/img/provider/Perfect-Privacy.png" width="200" height="70"></a>
+          <a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a     >
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2008">2008</td>
+        <td data-value="2016">2016</td>
-				<td data-value="{{ 119.99 | times: eur_to_usd }}">119.99 €</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-warning">No</span></td>
+        <td><span class="label label-success">Yes</span></td>
-				<td>54</td>
+        <td>396</td>
-				<td><span class="label label-warning">No</span></td>
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="ProtonVPN">
+        <td data-value="Proxy.sh">
-					<a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a>
+          <a href="https://proxy.sh/"><img alt="Proxy.sh" src="/assets/img/provider/Proxy.sh.png" width="200" height="70"></a>
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2016">2016</td>
+        <td data-value="2012">2012</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 data-value="40">$ 40</td>
-				<td><span class="label label-success">Yes</span></td>
+        <td><span class="label label-warning">No</span></td>
-				<td>396</td>
+        <td>300+</td>
-				<td><span class="label label-warning">No</span></td>
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+        <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
-			</tr>
+      </tr>
 
-			<tr>
+      <tr>
-				<td data-value="Proxy.sh">
+        <td data-value="Trust.Zone">
-					<a href="https://proxy.sh/"><img alt="Proxy.sh" src="/assets/img/provider/Proxy.sh.png" width="200" height="70"></a>
+          <a href="https://trust.zone/"><img alt="Trust.Zone" src="/assets/img/provider/Trust.Zone.png" width="200" height="70"></a>
-				</td>
+        </td>
-				<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>
+          <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>
-				<td data-value="2012">2012</td>
+        <td data-value="2014">2014</td>
-				<td data-value="40">$ 40</td>
+        <td data-value="40">$ 39.95</td>
-				<td><span class="label label-warning">No</span></td>
+        <td><span class="label label-success">Yes</span></td>
-				<td>300+</td>
+        <td>164</td>
-				<td><span class="label label-warning">No</span></td>
+        <td><span class="label label-warning">No</span></td>
-				<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
+        <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
-			</tr>
+      </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>
 
-			<tr>
+    </tbody>
-				<td data-value="Trust.Zone">
+  </table>
-					<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 a better privacy. 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>
 
 <div class="container">
-	<div class="row">
+  <div class="row">
-		<div class="col-md-6">
+    <div class="col-md-6">
-			<h3>Our VPN Provider Criteria</h3>
+      <h3>Our VPN Provider Criteria</h3>
 
-			<ul>
+      <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>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>OpenVPN software support.</li>
-				<li>Accepts Bitcoin, cash, debit cards or cash cards as a payment method.</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>
+        <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>
+      </ul>
 
-			<p>We're not affiliated with any of the above-listed VPN providers. This way we can give you honest recommendations.</p>
+      <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>
+      <h3>More VPN Providers</h3>
-			<ul>
+      <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://www.reddit.com/r/privacytoolsIO/comments/43d4zs/you_guys_might_be_interested_in_this_a/">Guide to Choosing the Best VPN</a></li>
-				<li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
+        <li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
-			</ul>
+      </ul>
-		</div>
+    </div>
 
-		<div class="col-md-6">
+    <div class="col-md-6">
 
-			<h3>Related VPN information</h3>
+      <h3>Related VPN information</h3>
 
-			<ul>
+      <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://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://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://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://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://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://medium.com/@blackVPN/no-logs-6d65d95a3016">blackVPN announced to delete connection logs after disconnection</a></li>
-				<li><a href="https://gist.github.com/kennwhite/1f3bc4d889b02b35d8aa">Don't use LT2P IPSec, use other protocols.</a></li>
+        <li><a href="https://gist.github.com/kennwhite/1f3bc4d889b02b35d8aa">Don't use LT2P IPSec, use other protocols.</a></li>
-			</ul>
+      </ul>
 
-		</div>
+    </div>
-	</div>
+  </div>
-</div>
+</div>

_includes/sections/warrant-canary.html

@@ -7,16 +7,16 @@
 <h4>Warrant Canary Examples:</h4>
 
 <ol>
-	<li><a href="https://proxy.sh/canary">https://proxy.sh/canary</a></li>
+  <li><a href="https://proxy.sh/canary">https://proxy.sh/canary</a></li>
-	<li><a href="https://www.ivpn.net/resources/canary.txt">https://www.ivpn.net/resources/canary.txt</a></li>
+  <li><a href="https://www.ivpn.net/resources/canary.txt">https://www.ivpn.net/resources/canary.txt</a></li>
-	<li><a href="https://www.bolehvpn.net/canary.txt">https://www.bolehvpn.net/canary.txt</a></li>
+  <li><a href="https://www.bolehvpn.net/canary.txt">https://www.bolehvpn.net/canary.txt</a></li>
-	<li><a href="https://www.ipredator.se/static/downloads/canary.txt">https://www.ipredator.se/static/downloads/canary.txt</a></li>
+  <li><a href="https://www.ipredator.se/static/downloads/canary.txt">https://www.ipredator.se/static/downloads/canary.txt</a></li>
 </ol>
 
 <h4>Related Warrant Canary Information</h4>
 
 <ul>
-	<li><a href="https://www.eff.org/deeplinks/2014/04/warrant-canary-faq">Warrant Canary Frequently Asked Questions</a></li>
+  <li><a href="https://www.eff.org/deeplinks/2014/04/warrant-canary-faq">Warrant Canary Frequently Asked Questions</a></li>
-	<li><a href="https://en.wikipedia.org/wiki/Warrant_canary#Companies_and_organizations_with_warrant_canaries">Companies and organizations with warrant canaries</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Warrant_canary#Companies_and_organizations_with_warrant_canaries">Companies and organizations with warrant canaries</a></li>
-	<li><a href="https://www.schneier.com/blog/archives/2015/03/australia_outla.html">Warrant canary criticism by Bruce Schneier and an example of a law against warrant canaries.</a></li>
+  <li><a href="https://www.schneier.com/blog/archives/2015/03/australia_outla.html">Warrant canary criticism by Bruce Schneier and an example of a law against warrant canaries.</a></li>
-</ul>
+</ul>

_includes/sections/windows10.html

@@ -1,76 +1,76 @@
 <h1 id="win10" class="anchor"><a href="#win10"><i class="fas fa-link anchor-icon"></i></a> Don't use Windows 10 - It's a privacy nightmare</h1>
 
 <div class="alert alert-warning" role="alert">
-	<strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
+  <strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
 </div>
 
 <img src="/assets/img/layout/Windows-10-Privacy.jpg" width="367" height="369" class="img-fluid float-right" alt="Windows 10 Privacy" style="margin-left:10px;">
 
 <ol>
-	<li><strong>Data syncing is by default enabled.</strong>
+  <li><strong>Data syncing is by default enabled.</strong>
-		<ul>
+    <ul>
-			<li>Browsing history and open websites.</li>
+      <li>Browsing history and open websites.</li>
-			<li>Apps settings.</li>
+      <li>Apps settings.</li>
-			<li>WiFi hotspot names and passwords.</li>
+      <li>WiFi hotspot names and passwords.</li>
-		</ul>
+    </ul>
-	</li>
+  </li>
 
-	<li><strong>Your device is by default tagged with a unique advertising ID.</strong>
+  <li><strong>Your device is by default tagged with a unique advertising ID.</strong>
-		<ul>
+    <ul>
-			<li>Used to serve you with personalized advertisements by third-party advertisers and ad networks.</li>
+      <li>Used to serve you with personalized advertisements by third-party advertisers and ad networks.</li>
-		</ul>
+    </ul>
-	</li>
+  </li>
 
-	<li><strong>Cortana can collect any of your data.</strong>
+  <li><strong>Cortana can collect any of your data.</strong>
-		<ul>
+    <ul>
-			<li>Your keystrokes, searches and mic input.</li>
+      <li>Your keystrokes, searches and mic input.</li>
-		</ul>
+    </ul>
-		<ul>
+    <ul>
-			<li>Calendar data.</li>
+      <li>Calendar data.</li>
-		</ul>
+    </ul>
-		<ul>
+    <ul>
-			<li>Music you listen to.</li>
+      <li>Music you listen to.</li>
-		</ul>
+    </ul>
-		<ul>
+    <ul>
-			<li>Credit Card information.</li>
+      <li>Credit Card information.</li>
-		</ul>
+    </ul>
-		<ul>
+    <ul>
-			<li>Purchases.</li>
+      <li>Purchases.</li>
-		</ul>
+    </ul>
-	</li>
+  </li>
 
-	<li><strong>Microsoft can collect any personal data.</strong>
+  <li><strong>Microsoft can collect any personal data.</strong>
-		<ul>
+    <ul>
-			<li>Your identity.</li>
+      <li>Your identity.</li>
-		</ul>
+    </ul>
-		<ul>
+    <ul>
-			<li>Passwords.</li>
+      <li>Passwords.</li>
-		</ul>
+    </ul>
-		<ul>
+    <ul>
-			<li>Demographics.</li>
+      <li>Demographics.</li>
-		</ul>
+    </ul>
-		<ul>
+    <ul>
-			<li>Interests and habits.</li>
+      <li>Interests and habits.</li>
-		</ul>
+    </ul>
-		<ul>
+    <ul>
-			<li>Usage data.</li>
+      <li>Usage data.</li>
-		</ul>
+    </ul>
-		<ul>
+    <ul>
-			<li>Contacts and relationships.</li>
+      <li>Contacts and relationships.</li>
-		</ul>
+    </ul>
-		<ul>
+    <ul>
-			<li>Location data.</li>
+      <li>Location data.</li>
-		</ul>
+    </ul>
-		<ul>
+    <ul>
-			<li>Content like emails, instant messages, caller list, audio and video recordings.</li>
+      <li>Content like emails, instant messages, caller list, audio and video recordings.</li>
-		</ul>
+    </ul>
-	</li>
+  </li>
 
-	<li><strong>Your data can be shared.</strong>
+  <li><strong>Your data can be shared.</strong>
-		<ul>
+    <ul>
-			<li>When downloading Windows 10, you are authorizing Microsoft to share any of above-mentioned data with any third-party, with or without your consent.</li>
+      <li>When downloading Windows 10, you are authorizing Microsoft to share any of above-mentioned data with any third-party, with or without your consent.</li>
-		</ul>
+    </ul>
-	</li>
+  </li>
 </ol>
 
 <p><a class="btn btn-warning" href="https://www.winprivacy.de/english-home/">Download: W10Privacy</a></p>
@@ -80,28 +80,28 @@
 <h3>Related Information</h3>
 
 <ul>
-	<li><a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement</a> - Microsoft collects, uses and discloses personal information as described here. This allows One Drive data, Cortana searches and MS browser history to be sold to third parties.</li>
+  <li><a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement</a> - Microsoft collects, uses and discloses personal information as described here. This allows One Drive data, Cortana searches and MS browser history to be sold to third parties.</li>
-	<li><a href="https://support.microsoft.com/en-us/help/4468233/cortana-and-privacy-microsoft-privacy">Cortana and privacy</a> - To personalize your experience and provide the best possible suggestions, Cortana accesses your email and other communications and collects data about your contacts (People), like their title, suffix, first name, last name, middle name, nicknames, and company name. If you call, email, or text someone or they call, email, or text you, Cortana collects that person’s email address or phone number.</li>
+  <li><a href="https://support.microsoft.com/en-us/help/4468233/cortana-and-privacy-microsoft-privacy">Cortana and privacy</a> - To personalize your experience and provide the best possible suggestions, Cortana accesses your email and other communications and collects data about your contacts (People), like their title, suffix, first name, last name, middle name, nicknames, and company name. If you call, email, or text someone or they call, email, or text you, Cortana collects that person’s email address or phone number.</li>
 </ul>
 
 <div class="container">
-	<div class="row">
+  <div class="row">
-		<div class="col-md-6">
+    <div class="col-md-6">
-			<h3>Some good news</h3>
+      <h3>Some good news</h3>
-			<ul>
+      <ul>
-				<li><a href="https://github.com/crazy-max/WindowsSpyBlocker/releases">WindowsSpyBlocker</a> - Open source tool that blocks data collection.</li>
+        <li><a href="https://github.com/crazy-max/WindowsSpyBlocker/releases">WindowsSpyBlocker</a> - Open source tool that blocks data collection.</li>
-				<li><a href="https://www.ghacks.net/2015/08/14/comparison-of-windows-10-privacy-tools/">Comparison of Windows 10 Privacy tools</a> - ghacks.net</li>
+        <li><a href="https://www.ghacks.net/2015/08/14/comparison-of-windows-10-privacy-tools/">Comparison of Windows 10 Privacy tools</a> - ghacks.net</li>
-			</ul>
+      </ul>
-		</div>
+    </div>
 
-		<div class="col-md-6">
+    <div class="col-md-6">
-			<h3>More bad news</h3>
+      <h3>More bad news</h3>
-			<ul>
+      <ul>
-				<li><a href="https://thehackernews.com/2016/02/microsoft-windows10-privacy.html">
+        <li><a href="https://thehackernews.com/2016/02/microsoft-windows10-privacy.html">
-						Windows 10 Sends Your Data 5500 Times Every Day Even After Tweaking Privacy Settings</a> - The Hacker News.</li>
+            Windows 10 Sends Your Data 5500 Times Every Day Even After Tweaking Privacy Settings</a> - The Hacker News.</li>
-				<li><a href="https://arstechnica.com/information-technology/2015/08/even-when-told-not-to-windows-10-just-cant-stop-talking-to-microsoft/">Even when told not to, Windows 10 just can't stop talking to Microsoft. It's no wonder that privacy activists are up in arms.</a> - Ars Technica.</li>
+        <li><a href="https://arstechnica.com/information-technology/2015/08/even-when-told-not-to-windows-10-just-cant-stop-talking-to-microsoft/">Even when told not to, Windows 10 just can't stop talking to Microsoft. It's no wonder that privacy activists are up in arms.</a> - Ars Technica.</li>
-				<li><a href="https://www.techdirt.com/articles/20150820/06171332012/windows-10-reserves-right-to-block-pirated-games-unauthorized-hardware.shtml">Windows 10 Reserves The Right To Block Pirated Games And 'Unauthorized' Hardware.</a> - Techdirt.</li>
+        <li><a href="https://www.techdirt.com/articles/20150820/06171332012/windows-10-reserves-right-to-block-pirated-games-unauthorized-hardware.shtml">Windows 10 Reserves The Right To Block Pirated Games And 'Unauthorized' Hardware.</a> - Techdirt.</li>
-			</ul>
+      </ul>
-		</div>
+    </div>
-	</div>
+  </div>
-</div>
+</div>

_layouts/default.html

@@ -2,10 +2,10 @@
 layout: minimal
 ---
 <div class="container" role="main">
-	<main>
+  <main>
-		{{ content }}
+  {{ content }}
-	</main>
+  </main>
-	<footer>
+  <footer>
-		{% include footer.html %}
+  {% include footer.html %}
-	</footer>
+  </footer>
 </div>

_layouts/minimal.html

@@ -1,14 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
 {% include head.html %}
-
 <body data-spy="scroll" data-target="#navbar">
-	<header>
+  <header>
-		{% include nav.html %}
+  {% include nav.html %}
-		<div id="top" class="py-4"></div>
+  <div id="top" class="py-4"></div>
-	</header>
+  </header>
-	{{ content }}
+  {{ content }}
-	{% include scripts.html %}
+  {% include scripts.html %}
 </body>
-
+</html>
-</html>

_layouts/page.html

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

assets/css/style.scss

@@ -182,4 +182,4 @@ footer {
   i {
     margin-right: 1rem;
   }
-}
+}

bin/get-html-ls.js

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

bin/html-beautify-check.sh

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

build.sh

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

donate.html

@@ -4,287 +4,301 @@ active_page: donate
 permalink: /donate/
 ---
 <div class="col-12">
-	<div class="row">
+  <div class="row">
-		<div class="mx-auto text-center">
+    <div class="mx-auto text-center">
-			<div class="mt-4 mb-4">
+      <div class="mt-4 mb-4">
-				<a href="https://www.privacytools.io/"><img src="/assets/img/layout/logo.png" class="img-fluid" alt="privacytools.io"></a>
+        <a href="https://www.privacytools.io/"><img src="/assets/img/layout/logo.png" class="img-fluid" alt="privacytools.io"></a>
-			</div>
+      </div>
-			<h1>Please Donate</h1>
+      <h1>Please Donate</h1>
-			<p>Our website is free of advertisements and not affiliated with any listed providers.<br>Your donation will cover our costs for servers, domains, coffee, beer, and pizza.</p>
+      <p>Our website is free of advertisements and not affiliated with any listed providers.<br>Your donation will cover our costs for servers, domains, coffee, beer, and pizza.</p>
 
-			<p>
+      <p>
-				<a class="btn btn-warning mb-1" href="https://liberapay.com/privacytools.io/donate"><i class="fas fa-donate fa-lg fa-fw"></i> Liberapay</a>
+      	<a class="btn btn-warning mb-1" href="https://liberapay.com/privacytools.io/donate"><i class="fas fa-donate fa-lg fa-fw"></i> Liberapay</a>
-				<a class="btn btn-danger mb-1" href="https://www.patreon.com/privacytools"><i class="fab fa-patreon fa-lg fa-fw"></i> Patreon</a>
+      	<a class="btn btn-danger mb-1" href="https://www.patreon.com/privacytools"><i class="fab fa-patreon fa-lg fa-fw"></i> Patreon</a>
-				<a class="btn btn-primary mb-1" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5G9CBU8P6F4K2"><i class="fab fa-paypal fa-lg fa-fw"></i> PayPal</a>
+      	<a class="btn btn-primary mb-1" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5G9CBU8P6F4K2"><i class="fab fa-paypal fa-lg fa-fw"></i> PayPal</a>
-			</p>
+      </p>
 
-		</div>
+    </div>
-	</div>
+  </div>
-	<div class="row">
+  <div class="row">
-		<div class="col-md-12 col-lg-8 offset-lg-2 text-right">
+    <div class="col-md-12 col-lg-8 offset-lg-2 text-right">
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="BTC" class="col-sm-4 col-form-label"><strong>Bitcoin (BTC)</strong> <a href="/assets/img/qr/BTC.png"><i class="fa fa-qrcode"></i></a></label>
+        <label for="BTC" class="col-sm-4 col-form-label"><strong>Bitcoin (BTC)</strong> <a href="/assets/img/qr/BTC.png"><i class="fa fa-qrcode"></i></a></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="BTC" type="text" value="1C3MVvvJwfEiS5KQmZzJkiVq7obYi2zRqb" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="BTC" type="text" value="1C3MVvvJwfEiS5KQmZzJkiVq7obYi2zRqb" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="BCH" class="col-sm-4 col-form-label"><strong>Bitcoin Cash (BCH)</strong> <a href="/assets/img/qr/BCH.png"><i class="fa fa-qrcode"></i></a></label>
+        <label for="BCH" class="col-sm-4 col-form-label"><strong>Bitcoin Cash (BCH)</strong> <a href="/assets/img/qr/BCH.png"><i class="fa fa-qrcode"></i></a></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="BCH" type="text" value="bitcoincash:qzs5eh484cc7gq2frw4y0ygdg33uv6ucrq48ewgqqf" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="BCH" type="text" value="bitcoincash:qzs5eh484cc7gq2frw4y0ygdg33uv6ucrq48ewgqqf" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="ETH" class="col-sm-4 col-form-label"><strong>Ethereum (ETH)</strong> <a href="/assets/img/qr/ETH.png"><i class="fa fa-qrcode"></i></a></label>
+        <label for="ETH" class="col-sm-4 col-form-label"><strong>Ethereum (ETH)</strong> <a href="/assets/img/qr/ETH.png"><i class="fa fa-qrcode"></i></a></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="ETH" type="text" value="0x1DdD9c188aaf9198b664CeBce9a9cD03E75FdD49" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="ETH" type="text" value="0x1DdD9c188aaf9198b664CeBce9a9cD03E75FdD49" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="ZEC" class="col-sm-4 col-form-label"><strong>Zcash (ZEC)</strong> <a href="/assets/img/qr/ZEC.png"><i class="fa fa-qrcode"></i></a></label>
+        <label for="ZEC" class="col-sm-4 col-form-label"><strong>Zcash (ZEC)</strong> <a href="/assets/img/qr/ZEC.png"><i class="fa fa-qrcode"></i></a></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="ZEC" type="text" value="t1Sv6rSRchWUXkWNz7PkeYixTs9M2aAs4wX" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="ZEC" type="text" value="t1Sv6rSRchWUXkWNz7PkeYixTs9M2aAs4wX" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="LTC" class="col-sm-4 col-form-label"><strong>Litecoin (LTC)</strong> <a href="/assets/img/qr/LTC.png"><i class="fa fa-qrcode"></i></a></label>
+        <label for="LTC" class="col-sm-4 col-form-label"><strong>Litecoin (LTC)</strong> <a href="/assets/img/qr/LTC.png"><i class="fa fa-qrcode"></i></a></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="LTC" type="text" value="LSccXrCDm7zu4Gc6PiiW6sBaKjADfFGQSQ" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="LTC" type="text" value="LSccXrCDm7zu4Gc6PiiW6sBaKjADfFGQSQ" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="XLM" class="col-sm-4 col-form-label"><strong>Stellar (XLM)</strong> <a href="/assets/img/qr/XLM.png"><i class="fa fa-qrcode"></i></a></label>
+        <label for="XLM" class="col-sm-4 col-form-label"><strong>Stellar (XLM)</strong> <a href="/assets/img/qr/XLM.png"><i class="fa fa-qrcode"></i></a></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="XLM" type="text" value="GA3GFFRS2PEZHFYOKYO5FSK5GAMW44AOGI4RY5ISXOWMD3PWAARFVAA4" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XLM" type="text" value="GA3GFFRS2PEZHFYOKYO5FSK5GAMW44AOGI4RY5ISXOWMD3PWAARFVAA4" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="XMR" class="col-sm-4 col-form-label"><strong>Monero (XMR)</strong> <a href="/assets/img/qr/XMR.png"><i class="fa fa-qrcode"></i></a></label>
+        <label for="XMR" class="col-sm-4 col-form-label"><strong>Monero (XMR)</strong> <a href="/assets/img/qr/XMR.png"><i class="fa fa-qrcode"></i></a></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="XMR" type="text" value="45yJ8LkShLt2f9gCqbBQUcDw7um9XxD2vZ8h2Rt3GoLq9kMrznB3UAHBS1chJk9KjugpBbbJFGtdAeXE5j99wuGxDcbYUri" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XMR" type="text" value="45yJ8LkShLt2f9gCqbBQUcDw7um9XxD2vZ8h2Rt3GoLq9kMrznB3UAHBS1chJk9KjugpBbbJFGtdAeXE5j99wuGxDcbYUri" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="text-center">
+    <div class="text-center">
-				<p>We prefer Bitcoin donations to be above $5 due to the state of the network's transaction fees. You are welcome to donate any smaller or larger amount on any other cryptocurrency, such as Bitcoin Cash, Ethereum, or Stellar.</p>
+      <p>We prefer Bitcoin donations to be above $5 due to the state of the network's transaction fees. You are welcome to donate any smaller or larger amount on any other cryptocurrency, such as Bitcoin Cash, Ethereum, or Stellar.</p>
 
-				<h2>More Cryptocurrencies</h2>
+      <h2>More Cryptocurrencies</h2>
 
-			</div>
+    </div>
 
-		</div>
+    </div>
-	</div>
+  </div>
 
 
-	<div class="row">
+  <div class="row">
 
-		<div class="col-md-12 col-lg-8 offset-lg-2 text-right">
+<div class="col-md-12 col-lg-8 offset-lg-2 text-right">
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="BAT" class="col-sm-4 col-form-label"><strong>Brave BAT</strong></label>
+        <label for="BNB" class="col-sm-4 col-form-label"><strong>Binance Coin (BNB)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="BAT" type="text" value="0x13DA8c6176a9bd171B8285067Ae38420B39eC11E" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="BNB" type="text" value="bnb17zlv4xnkjsujks80cclx46uhm9h8txms82htwj" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="XRP" class="col-sm-4 col-form-label"><strong>Ripple (XRP)</strong></label>
+        <label for="EOS" class="col-sm-4 col-form-label"><strong>EOS</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="XRP" type="text" value="r3EPSFMZNoHPKKhWUBfobtxck5UVR2T8mF" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="EOS" type="text" value="privacytools" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="DOGE" class="col-sm-4 col-form-label"><strong>Dogecoin (DOGE)</strong></label>
+        <label for="BAT" class="col-sm-4 col-form-label"><strong>Brave (BAT)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="DOGE" type="text" value="DHHPUaDq562BzET6QxhudJepXNDoG7yP12" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="BAT" type="text" value="0x13DA8c6176a9bd171B8285067Ae38420B39eC11E" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="ETC" class="col-sm-4 col-form-label"><strong>Ethereum Classic (ETC)</strong></label>
+        <label for="XRP" class="col-sm-4 col-form-label"><strong>Ripple (XRP)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="ETC" type="text" value="0x6807739f23B74AE07F8902aBDA03cF854678dc7e" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XRP" type="text" value="r3EPSFMZNoHPKKhWUBfobtxck5UVR2T8mF" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="BSV" class="col-sm-4 col-form-label"><strong>Bitcoin SV (BSV)</strong></label>
+        <label for="DOGE" class="col-sm-4 col-form-label"><strong>Dogecoin (DOGE)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="BSV" type="text" value="1GamahbRfa4EBDBSN3ufEhJaE8xnH7kLim" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="DOGE" type="text" value="DHHPUaDq562BzET6QxhudJepXNDoG7yP12" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="DASH" class="col-sm-4 col-form-label"><strong>Dash (DASH)</strong></label>
+        <label for="ETC" class="col-sm-4 col-form-label"><strong>Ethereum Classic (ETC)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="DASH" type="text" value="Xb62GojDghypwwwZj96kAiPwktjrxWMqf9" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="ETC" type="text" value="0x6807739f23B74AE07F8902aBDA03cF854678dc7e" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="ADA" class="col-sm-4 col-form-label"><strong>Cardano (ADA)</strong></label>
+        <label for="BSV" class="col-sm-4 col-form-label"><strong>Bitcoin SV (BSV)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="ADA" type="text" value="DdzFFzCqrht9wMYGwijaPDVocdpoJHXSE6MMr6L44QtxTBfSoBycXMtnrbTKzpqcRG88LZcUvJd3zXWADfgxX8K3errkhn9oB9ZuwBYe" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="BSV" type="text" value="1GamahbRfa4EBDBSN3ufEhJaE8xnH7kLim" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="CLO" class="col-sm-4 col-form-label"><strong>Callisto (CLO)</strong></label>
+        <label for="DASH" class="col-sm-4 col-form-label"><strong>Dash (DASH)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="CLO" type="text" value="0xfAE4cd989afADc4ad2Cef6d33f3C50fd1F216846" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="DASH" type="text" value="Xb62GojDghypwwwZj96kAiPwktjrxWMqf9" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="DCR" class="col-sm-4 col-form-label"><strong>Decred (DCR)</strong></label>
+        <label for="ADA" class="col-sm-4 col-form-label"><strong>Cardano (ADA)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="DCR" type="text" value="DsbNyFxiKssCA4Sa2yEa4wiWrLD1EFnivFG" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="ADA" type="text" value="DdzFFzCqrht9wMYGwijaPDVocdpoJHXSE6MMr6L44QtxTBfSoBycXMtnrbTKzpqcRG88LZcUvJd3zXWADfgxX8K3errkhn9oB9ZuwBYe" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="DGB" class="col-sm-4 col-form-label"><strong>DigiByte (DGB)</strong></label>
+        <label for="CLO" class="col-sm-4 col-form-label"><strong>Callisto (CLO)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="DGB" type="text" value="DGsMoXne1VrSd7YuA6EaKh9ca7HUCnxi7Y" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="CLO" type="text" value="0xfAE4cd989afADc4ad2Cef6d33f3C50fd1F216846" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="EXP" class="col-sm-4 col-form-label"><strong>Expanse (EXP)</strong></label>
+        <label for="DCR" class="col-sm-4 col-form-label"><strong>Decred (DCR)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="EXP" type="text" value="0x131b777EcdD546dfecCCC4f72642Ee4570c5B9f9" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="DCR" type="text" value="DsbNyFxiKssCA4Sa2yEa4wiWrLD1EFnivFG" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="GRS" class="col-sm-4 col-form-label"><strong>Groestlcoin (GRS)</strong></label>
+        <label for="DGB" class="col-sm-4 col-form-label"><strong>DigiByte (DGB)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="GRS" type="text" value="Ffjva2xhmoUmt1Xmc1LR3tHHJVuQfTDAPz" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="DGB" type="text" value="DGsMoXne1VrSd7YuA6EaKh9ca7HUCnxi7Y" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="KIN" class="col-sm-4 col-form-label"><strong>Kin (KIN)</strong></label>
+        <label for="EXP" class="col-sm-4 col-form-label"><strong>Expanse (EXP)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="KIN" type="text" value="GBQT5R43PLKWLUOPFKDZFIXCIOG3QXU3KIJ432UQQALWSZIBW2QR43B2" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="EXP" type="text" value="0x131b777EcdD546dfecCCC4f72642Ee4570c5B9f9" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="KMD" class="col-sm-4 col-form-label"><strong>Komodo (KMD)</strong></label>
+        <label for="GRS" class="col-sm-4 col-form-label"><strong>Groestlcoin (GRS)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="KMD" type="text" value="RDMncz9ddWUY1PQ6D9PDqkeJBLEwYvwSHC" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="GRS" type="text" value="Ffjva2xhmoUmt1Xmc1LR3tHHJVuQfTDAPz" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="LSK" class="col-sm-4 col-form-label"><strong>Lisk (LSK)</strong></label>
+        <label for="KIN" class="col-sm-4 col-form-label"><strong>Kin (KIN)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="LSK" type="text" value="15983493180249602776L" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="KIN" type="text" value="GBQT5R43PLKWLUOPFKDZFIXCIOG3QXU3KIJ432UQQALWSZIBW2QR43B2" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="NGL" class="col-sm-4 col-form-label"><strong>Gulden (NGL)</strong></label>
+        <label for="KMD" class="col-sm-4 col-form-label"><strong>Komodo (KMD)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="NGL" type="text" value="GRCpgMzWfFk1GveSrYP7FpH7BYwpt2hLQz" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="KMD" type="text" value="RDMncz9ddWUY1PQ6D9PDqkeJBLEwYvwSHC" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="QTUM" class="col-sm-4 col-form-label"><strong>Qtum (QTUM)</strong></label>
+        <label for="LSK" class="col-sm-4 col-form-label"><strong>Lisk (LSK)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="QTUM" type="text" value="QYwvS7gongbRhyG2khg2wh1LymxVGRA8Rs" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="LSK" type="text" value="15983493180249602776L" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="RDD" class="col-sm-4 col-form-label"><strong>Reddcoin (RDD)</strong></label>
+        <label for="NGL" class="col-sm-4 col-form-label"><strong>Gulden (NGL)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="RDD" type="text" value="RmoLdW9DVXkxHjoFZyiDu1xzVtvckRf2Mn" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="NGL" type="text" value="GRCpgMzWfFk1GveSrYP7FpH7BYwpt2hLQz" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="TRX" class="col-sm-4 col-form-label"><strong>Tron (TRX)</strong></label>
+        <label for="QTUM" class="col-sm-4 col-form-label"><strong>Qtum (QTUM)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="TRX" type="text" value="TVjrf7S4C2ATcejmL4Z1BnH8us4QC24Gdq" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="QTUM" type="text" value="QYwvS7gongbRhyG2khg2wh1LymxVGRA8Rs" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="UBQ" class="col-sm-4 col-form-label"><strong>Ubiq (UBQ)</strong></label>
+        <label for="RDD" class="col-sm-4 col-form-label"><strong>Reddcoin (RDD)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="UBQ" type="text" value="0x2Aa4EfF8C9f8877fC733FA54d459B68840303707" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="RDD" type="text" value="RmoLdW9DVXkxHjoFZyiDu1xzVtvckRf2Mn" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="VTC" class="col-sm-4 col-form-label"><strong>Vertcoin (VTC)</strong></label>
+        <label for="TRX" class="col-sm-4 col-form-label"><strong>Tron (TRX)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="VTC" type="text" value="VgCf1Fwks8yaKMcDTzu5wkQTc5QLVMCwPd" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="TRX" type="text" value="TVjrf7S4C2ATcejmL4Z1BnH8us4QC24Gdq" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="WAVES" class="col-sm-4 col-form-label"><strong>Waves (WAVES)</strong></label>
+        <label for="UBQ" class="col-sm-4 col-form-label"><strong>Ubiq (UBQ)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="WAVES" type="text" value="3PES6AF194L56BuhRwrLF41eAsGzcGDARCi" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="UBQ" type="text" value="0x2Aa4EfF8C9f8877fC733FA54d459B68840303707" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="XEM" class="col-sm-4 col-form-label"><strong>NEM (XEM)</strong></label>
+        <label for="VTC" class="col-sm-4 col-form-label"><strong>Vertcoin (VTC)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="XEM" type="text" value="NC7KTVGV7MH2EJMDM4YHAJ2AECQEBE2AXJSFACG6" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="VTC" type="text" value="VgCf1Fwks8yaKMcDTzu5wkQTc5QLVMCwPd" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="XTZ" class="col-sm-4 col-form-label"><strong>Tezos (XTZ)</strong></label>
+        <label for="WAVES" class="col-sm-4 col-form-label"><strong>Waves (WAVES)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="XTZ" type="text" value="tz1SUiszXUx8njTueLdnwqahYRM4QTEQ2wT3" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="WAVES" type="text" value="3PES6AF194L56BuhRwrLF41eAsGzcGDARCi" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="XVG" class="col-sm-4 col-form-label"><strong>Verge (XVG)</strong></label>
+        <label for="XEM" class="col-sm-4 col-form-label"><strong>NEM (XEM)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="XVG" type="text" value="D5vWPfcSbwdc55amx4Z2kVvXuHa6kiaGUH" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XEM" type="text" value="NC7KTVGV7MH2EJMDM4YHAJ2AECQEBE2AXJSFACG6" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="XZC" class="col-sm-4 col-form-label"><strong>ZCoin (XZC)</strong></label>
+        <label for="XTZ" class="col-sm-4 col-form-label"><strong>Tezos (XTZ)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="XZC" type="text" value="a2sHJ3A2mo1yggmkhj4Ki6nqAT5ZnVE42n" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XTZ" type="text" value="tz1SUiszXUx8njTueLdnwqahYRM4QTEQ2wT3" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="form-group row">
+      <div class="form-group row">
-				<label for="ZEN" class="col-sm-4 col-form-label"><strong>Horizen (ZEN)</strong></label>
+        <label for="XVG" class="col-sm-4 col-form-label"><strong>Verge (XVG)</strong></label>
-				<div class="col-sm-8">
+        <div class="col-sm-8">
-					<input id="ZEN" type="text" value="znSwHaaYhPr2Uu6MTi5T7QCW3qP5UWmWDuY" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+          <input id="XVG" type="text" value="D5vWPfcSbwdc55amx4Z2kVvXuHa6kiaGUH" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-				</div>
+        </div>
-			</div>
+      </div>
 
-			<div class="text-center">
+      <div class="form-group row">
-				<p>The <a href="/contact/">privacytools.io team</a> does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies.</p>
+        <label for="XZC" class="col-sm-4 col-form-label"><strong>ZCoin (XZC)</strong></label>
-				<h3>Thanks for your support. You are awesome!</h3>
+        <div class="col-sm-8">
-				<p>
+          <input id="XZC" type="text" value="a2sHJ3A2mo1yggmkhj4Ki6nqAT5ZnVE42n" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
-					<img src="/assets/img/misc/smile.png" class="img-fluid" alt="Smile">
+        </div>
-				</p>
+      </div>
-			</div>
 
-		</div>
+      <div class="form-group row">
-	</div>
+        <label for="ZEN" class="col-sm-4 col-form-label"><strong>Horizen (ZEN)</strong></label>
+        <div class="col-sm-8">
+          <input id="ZEN" type="text" value="znSwHaaYhPr2Uu6MTi5T7QCW3qP5UWmWDuY" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+        </div>
+      </div>
 
-</div>
+    <div class="text-center">
+      <p>The <a href="/contact/">privacytools.io team</a> does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies.</p>
+      <h3>Thanks for your support. You are awesome!</h3>
+      <p>
+      <img src="/assets/img/misc/smile.png" class="img-fluid" alt="Smile">
+      </p>
+    </div>
+
+    </div>
+  </div>
+
+</div>

index.html

@@ -7,4 +7,4 @@ layout: default
 {% include sections/resources.html %}
 {% include sections/quotes.html %}
 {% include sections/privacy-resources.html %}
-{% include sections/participate.html %}
+{% include sections/participate.html %}

nginx/000-includes.conf

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

nginx/010-headers.conf

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

nginx/020-redirects.conf

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

package.json

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

pages/browsers.html

@@ -13,4 +13,4 @@ description: "These are our current web browser recommendations and some tweaks
 
 {% include sections/browser-addons.html %}
 
-{% include sections/browser-tweaks.html %}
+{% include sections/browser-tweaks.html %}

pages/old.html

@@ -4,7 +4,7 @@ permalink: /classic/
 ---
 
 <div class="alert alert-warning" role="alert">
-	We will try and keep this page up-to-date with added sections and other content, but to be guaranteed the latest recommendations, we recommend you check out our new Providers, Browsers, Software, and OS pages in the navbar above :)
+  We will try and keep this page up-to-date with added sections and other content, but to be guaranteed the latest recommendations, we recommend you check out our new Providers, Browsers, Software, and OS pages in the navbar above :)
 </div>
 
 {% include sections/header.html %}
@@ -61,6 +61,8 @@ permalink: /classic/
 
 {% include sections/social-networks.html %}
 
+{% include sections/social-news-aggregator.html %}
+
 {% include sections/dns.html %}
 
 {% include sections/notebooks.html %}
@@ -83,4 +85,4 @@ permalink: /classic/
 
 {% include sections/privacy-resources.html %}
 
-{% include sections/participate.html %}
+{% include sections/participate.html %}

pages/os.html

@@ -15,4 +15,4 @@ description: "Even your own computer could be compromising your privacy. Discove
 
 {% include sections/router-firmware.html %}
 
-{% include sections/windows10.html %}
+{% include sections/windows10.html %}

pages/providers.html

@@ -10,15 +10,15 @@ description: "There's a ton of people providing services online. Discover which
 <p>Click on whatever service you need to view our recommendations.</p>
 
 <div class="card card-list">
-	<ul class="list-group list-group-flush">
+  <ul class="list-group list-group-flush">
-		<li class="list-group-item"><a href="/providers/vpn/"><i class="far fa-eye-slash"></i> Virtual Private Network (VPN)</a></li>
+    <li class="list-group-item"><a href="/providers/vpn/"><i class="far fa-eye-slash"></i> Virtual Private Network (VPN)</a></li>
-		<li class="list-group-item"><a href="/providers/email/"><i class="fas fa-mail-bulk"></i> Privacy Email</a></li>
+    <li class="list-group-item"><a href="/providers/email/"><i class="fas fa-mail-bulk"></i> Privacy Email</a></li>
-		<li class="list-group-item"><a href="/providers/cloud-storage/"><i class="fas fa-cloud"></i> Encrypted Cloud Storage Services</a></li>
+    <li class="list-group-item"><a href="/providers/cloud-storage/"><i class="fas fa-cloud"></i> Encrypted Cloud Storage Services</a></li>
-		<li class="list-group-item"><a href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt"></i> Decentralized Social Networks</a></li>
+    <li class="list-group-item"><a href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt"></i> Decentralized Social Networks</a></li>
-		<li class="list-group-item"><a href="/providers/dns/"><i class="fa fa-tasks"></i> Domain Name System (DNS)</a></li>
+    <li class="list-group-item"><a href="/providers/dns/"><i class="fa fa-tasks"></i> Domain Name System (DNS)</a></li>
-		<li class="list-group-item"><a href="/providers/search-engines/"><i class="fab fa-searchengin"></i> Privacy Respecting Search Engines</a></li>
+    <li class="list-group-item"><a href="/providers/search-engines/"><i class="fab fa-searchengin"></i> Privacy Respecting Search Engines</a></li>
-		<li class="list-group-item"><a href="/providers/hosting/"><i class="fas fa-database"></i> Secure Hosting Providers</a></li>
+    <li class="list-group-item"><a href="/providers/hosting/"><i class="fas fa-database"></i> Secure Hosting Providers</a></li>
-	</ul>
+  </ul>
 </div>
 
 {% include sections/fourteen-eyes.html %}

pages/providers/dns.html

@@ -5,4 +5,4 @@ title: "DNS / Domain Providers"
 description: "Don't let Google see all your DNS traffic. Discover privacy-centric alternatives to the traditional DNS providers."
 ---
 
-{% include sections/dns.html %}
+{% include sections/dns.html %}

pages/providers/email.html

@@ -5,4 +5,4 @@ title: "Best Secure Email Providers for Privacy"
 description: "Find a secure email provider that will keep your privacy in mind. Don't settle for ad-supported platforms. Never trust any company with your privacy, always encrypt."
 ---
 
-{% include sections/email-providers.html %}
+{% include sections/email-providers.html %}

pages/providers/hosting.html

@@ -5,4 +5,4 @@ title: "Web Hosting"
 description: "Find a web hosting provider that won't track your visitors or give into government data requests."
 ---
 
-{% include sections/hosting-provider.html %}
+{% include sections/hosting-provider.html %}

pages/providers/paste.html

@@ -5,4 +5,4 @@ title: "Pastebin hosting services"
 description: "Find a pastebin provider that won't read your content to share sensitive code or other information."
 ---
 
-{% include sections/paste-services.html %}
+{% include sections/paste-services.html %}

pages/providers/search-engines.html

@@ -5,4 +5,4 @@ title: "Search Engines"
 description: "Find a search engine that doesn't track your queries or build an advertising profile based on your searches."
 ---
 
-{% include sections/search-engines.html %}
+{% include sections/search-engines.html %}

pages/providers/social-networks.html

@@ -5,4 +5,4 @@ title: "Social Networks"
 description: "Find a social network that doesn't pry into your data or monetize your profile."
 ---
 
-{% include sections/social-networks.html %}
+{% include sections/social-networks.html %}

pages/providers/social-news-aggregator.html

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

pages/providers/storage.html

@@ -5,4 +5,4 @@ title: "Cloud Storage"
 description: "Find a cloud storage provider that won't look through your files."
 ---
 
-{% include sections/cloud-storage.html %}
+{% include sections/cloud-storage.html %}

pages/providers/vpn.html

@@ -6,16 +6,16 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your
 ---
 
 <div class="card border-danger">
-	<div class="card-header text-danger"><i class="fas fa-exclamation-circle fa-fw"></i> Warning</div>
+  <div class="card-header text-danger"><i class="fas fa-exclamation-circle fa-fw"></i> Warning</div>
-	<div class="card-body">
+  <div class="card-body">
-		<p class="card-text text-danger">Using a VPN will <strong>not</strong> keep your browsing habits anonymous, nor will it add additional security to non-secure (HTTP) traffic.</p>
+    <p class="card-text text-danger">Using a VPN will <strong>not</strong> keep your browsing habits anonymous, nor will it add additional security to non-secure (HTTP) traffic.</p>
-		<p class="card-text text-danger">If you are looking for <strong>anonymity</strong>, you should use the Tor Browser <strong>instead</strong> of a VPN.</p>
+    <p class="card-text text-danger">If you are looking for <strong>anonymity</strong>, you should use the Tor Browser <strong>instead</strong> of a VPN.</p>
-		<p class="card-text text-danger">If you're looking for added <strong>security</strong>, you should always ensure you're connecting to websites using HTTPS. A VPN is not a replacement for good security practices.</p>
+    <p class="card-text text-danger">If you're looking for added <strong>security</strong>, you should always ensure you're connecting to websites using HTTPS. A VPN is not a replacement for good security practices.</p>
-		<p class="card-text text-secondary">If you're looking for additional <strong>privacy</strong> from your ISP, on a public Wi-Fi network, or while torrenting files, a VPN may be the solution for you as long as you understand <a href="#info">the risks involved</a>.</p>
+    <p class="card-text text-secondary">If you're looking for additional <strong>privacy</strong> from your ISP, on a public Wi-Fi network, or while torrenting files, a VPN may be the solution for you as long as you understand <a href="#info">the risks involved</a>.</p>
-		<a href="https://www.torproject.org/" class="btn btn-danger">Download Tor</a>
+    <a href="https://www.torproject.org/" class="btn btn-danger">Download Tor</a>
-		<a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor" class="btn btn-outline-danger">Tor Myths &amp; FAQ</a>
+    <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor" class="btn btn-outline-danger">Tor Myths &amp; FAQ</a>
-		<a href="#info" class="btn btn-outline-secondary">More Info</a>
+    <a href="#info" class="btn btn-outline-secondary">More Info</a>
-	</div>
+  </div>
 </div>
 
 {% include sections/vpn.html %}
@@ -23,42 +23,41 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your
 <h1 id="info" class="anchor"><a href="#info"><i class="fas fa-link anchor-icon"></i></a> Further Information and Dangers</h1>
 
 <div class="container">
-	<div class="row">
+  <div class="row">
-		<div class="col-md-6">
+    <div class="col-md-6">
-			<h3>Should I use a VPN?</h3>
+      <h3>Should I use a VPN?</h3>
-			<p>The answer to this question is not a particularly helpful one: <strong>It depends.</strong> It depends on what you're expecting a VPN to do for you, who you're trying to hide your traffic from, and what applications you're using.</p>
+      <p>The answer to this question is not a particularly helpful one: <strong>It depends.</strong> It depends on what you're expecting a VPN to do for you, who you're trying to hide your traffic from, and what applications you're using.</p>
-			<p><strong>In most cases, VPNs do little to protect your privacy or enhance your security</strong>, unless paired with other changes.</p>
+      <p><strong>In most cases, VPNs do little to protect your privacy or enhance your security</strong>, unless paired with other changes.</p>
-			<p>VPNs cannot encrypt data outside of the connection between your device and the VPN server. VPN providers can see and modify your traffic the same way your ISP could. And there is no way to verify a VPN provider's "no logging" policies in any way.</p>
+      <p>VPNs cannot encrypt data outside of the connection between your device and the VPN server. VPN providers can see and modify your traffic the same way your ISP could. And there is no way to verify a VPN provider's "no logging" policies in any way.</p>
-			<h3>What if I need encryption?</h3>
+      <h3>What if I need encryption?</h3>
-			<p>In most cases, your traffic is already encrypted! Over 98% of the top 3000 websites offer <strong>HTTPS</strong>, meaning your traffic is safe regardless of using a VPN. It is incredibly rare for applications that handle personal data to not support HTTPS in 2019, especially with services like Let's Encrypt offering free HTTPS certificates to any website operator.</p>
+      <p>In most cases, your traffic is already encrypted! Over 98% of the top 3000 websites offer <strong>HTTPS</strong>, meaning your traffic is safe regardless of using a VPN. It is incredibly rare for applications that handle personal data to not support HTTPS in 2019, especially with services like Let's Encrypt offering free HTTPS certificates to any website operator.</p>
-			<p>Even if a site you visit doesn't support HTTPS, a VPN will not protect you, because a VPN cannot magically encrypt the traffic between the VPN's servers and the website's servers. Installing an extension like <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> and making sure every site you visit uses HTTPS is far more helpful than using a VPN.</p>
+      <p>Even if a site you visit doesn't support HTTPS, a VPN will not protect you, because a VPN cannot magically encrypt the traffic between the VPN's servers and the website's servers. Installing an extension like <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> and making sure every site you visit uses HTTPS is far more helpful than using a VPN.</p>
-			<h3>What if I need anonymity?</h3>
+      <h3>What if I need anonymity?</h3>
-			<p>VPNs cannot provide strong anonymity. Your VPN provider will still see your real IP address, and often has a money trail that can be linked directly back to you. You cannot rely on "no logging" policies to protect your data.</p>
+      <p>VPNs cannot provide strong anonymity. Your VPN provider will still see your real IP address, and often has a money trail that can be linked directly back to you. You cannot rely on "no logging" policies to protect your data.</p>
-		</div>
+    </div>
-		<div class="col-md-6">
+    <div class="col-md-6">
-			<h3>Shouldn't I hide my IP address?</h3>
+      <h3>Shouldn't I hide my IP address?</h3>
-			<p>The idea that your IP address is sensitive information, or that your location is given away with all your internet traffic is <strong>fearmongering</strong> on the part of VPN providers and their marketing. Your IP address is an insignificant amount of personal data tracking companies use to identify you, because many users' IP addresses change very frequently (Dynamic IP addresses, switching networks, switching devices, etc.). Your IP address also does not give away more than the very generalized location of your Internet Service Provider. It does not give away your home address, for example, despite common perception.</p>
+      <p>The idea that your IP address is sensitive information, or that your location is given away with all your internet traffic is <strong>fearmongering</strong> on the part of VPN providers and their marketing. Your IP address is an insignificant amount of personal data tracking companies use to identify you, because many users' IP addresses change very frequently (Dynamic IP addresses, switching networks, switching devices, etc.). Your IP address also does not give away more than the very generalized location of your Internet Service Provider. It does not give away your home address, for example, despite common perception.</p>
-			<h3>Should I use Tor <em>and</em> a VPN?</h3>
+      <h3>Should I use Tor <em>and</em> a VPN?</h3>
-			<p>By using a VPN with Tor, you're creating essentially a permanent entry node, often with a money trail attached. This provides 0 additional benefit to you, while increasing the attack surface of your connection dramatically. If you wish to hide your Tor usage from your ISP or your government, Tor has a built-in solution for that: Tor bridges. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-2-onion-recipes-vpn-not-required">Read more about Tor bridges and why using a VPN is not necessary</a>.</p>
+      <p>By using a VPN with Tor, you're creating essentially a permanent entry node, often with a money trail attached. This provides 0 additional benefit to you, while increasing the attack surface of your connection dramatically. If you wish to hide your Tor usage from your ISP or your government, Tor has a built-in solution for that: Tor bridges. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-2-onion-recipes-vpn-not-required">Read more about Tor bridges and why using a VPN is not necessary</a>.</p>
-			<h3>Are VPNs ever useful?</h3>
+      <h3>Are VPNs ever useful?</h3>
-			<p>A VPN may still be useful to you in a variety of scenarios, such as:</p>
+      <p>A VPN may still be useful to you in a variety of scenarios, such as:</p>
-			<ol>
+      <ol>
-				<li>Hiding your traffic from <strong>only</strong> your Internet Service Provider.</li>
+        <li>Hiding your traffic from <strong>only</strong> your Internet Service Provider.</li>
-				<li>Hiding your downloads (such as Torrents) from your ISP and anti-piracy organizations.</li>
+        <li>Hiding your downloads (such as Torrents) from your ISP and anti-piracy organizations.</li>
-			</ol>
+      </ol>
-			<p>For use-cases like these, or if you have another compelling reason, the VPN providers we listed above are who we think are the most trustworthy. However, using a VPN provider still means you're <em>trusting</em> the provider. In pretty much any other scenario you should be using a secure<strong>-by-design</strong> tool such as Tor.</p>
+      <p>For use-cases like these, or if you have another compelling reason, the VPN providers we listed above are who we think are the most trustworthy. However, using a VPN provider still means you're <em>trusting</em> the provider. In pretty much any other scenario you should be using a secure<strong>-by-design</strong> tool such as Tor.</p>
-		</div>
+    </div>
-	</div>
+  </div>
-	<div class="row">
+  <div class="row">
-		<div class="col">
+    <div class="col">
-			<p><strong>Sources and Further Reading</strong>:
+      <p><strong>Sources and Further Reading</strong>:
-				<ol>
+        <ol>
-					<li><a href="https://schub.io/blog/2019/04/08/very-precarious-narrative.html">VPN - a Very Precarious Narrative</a> by Dennis Schubert</li>
+          <li><a href="https://schub.io/blog/2019/04/08/very-precarious-narrative.html">VPN - a Very Precarious Narrative</a> by Dennis Schubert</li>
-					<li><a href="https://gist.github.com/joepie91/5a9909939e6ce7d09e29">Don't use VPN services</a> by Sven Slootweg</li>
+          <li><a href="https://gist.github.com/joepie91/5a9909939e6ce7d09e29">Don't use VPN services</a> by Sven Slootweg</li>
-					<li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">Slicing Onions: Part 1 – Myth-busting Tor</a> by blacklight447</li>
+          <li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">Slicing Onions: Part 1 – Myth-busting Tor</a> by blacklight447</li>
-					<li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-2-onion-recipes-vpn-not-required">Slicing Onions: Part 2 – Onion recipes; VPN not required</a> by blacklight447</li>
+          <li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-2-onion-recipes-vpn-not-required">Slicing Onions: Part 2 – Onion recipes; VPN not required</a> by blacklight447</li>
-				</ol>
+        </ol>
-			</p>
+      <p>
-		</div>
+    </div>
-	</div>
+  </div>
-</div>

pages/services.html

@@ -8,15 +8,15 @@ description: "The privacytools.io team is proud to introduce a suite of privacy-
 <p>We currently have the following free-to-use services online now.</p>
 
 <div class="card card-list">
-	<ul class="list-group list-group-flush">
+  <ul class="list-group list-group-flush">
-		<li class="list-group-item"><a href="https://search.privacytools.io/"><i class="fas fa-search fa-lg fa-fw"></i> Searx - Privacy Friendly Search at search.privacytools.io</a></li>
+  	<li class="list-group-item"><a href="https://search.privacytools.io/"><i class="fas fa-search fa-lg fa-fw"></i> Searx - Privacy Friendly Search at search.privacytools.io</a></li>
-		<li class="list-group-item"><a href="https://social.privacytools.io/"><i class="fas fa-retweet fa-lg fa-fw"></i> Mastodon - Tracker Free Social Networking at social.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://social.privacytools.io/"><i class="fas fa-retweet fa-lg fa-fw"></i> Mastodon - Tracker Free Social Networking at social.privacytools.io</a></li>
-		<li class="list-group-item"><a href="https://chat.privacytools.io/"><i class="fas fa-comment fa-lg fa-fw"></i> Matrix - Federated private chat at chat.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://chat.privacytools.io/"><i class="fas fa-comment fa-lg fa-fw"></i> Matrix - Federated private chat at chat.privacytools.io</a></li>
-		<li class="list-group-item"><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Discourse - Forum at forum.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Discourse - Forum at forum.privacytools.io</a></li>
-		<li class="list-group-item"><a href="https://git.privacytools.io/"><i class="fab fa-git fa-lg fa-fw"></i> Gitea - Git-Repository Manager at git.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://git.privacytools.io/"><i class="fab fa-git fa-lg fa-fw"></i> Gitea - Git-Repository Manager at git.privacytools.io</a></li>
-		<li class="list-group-item"><a href="https://write.privacytools.io/"><i class="fas fa-pen-alt fa-lg fa-fw"></i> Write Freely - Federated minimalist blog at write.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://write.privacytools.io/"><i class="fas fa-pen-alt fa-lg fa-fw"></i> Write Freely - Federated minimalist blog at write.privacytools.io</a></li>
-		<li class="list-group-item"><a href="https://bin.privacytools.io/"><i class="fas fa-clipboard fa-lg fa-fw"></i> PrivateBin - Encrypted Pastebin at bin.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://bin.privacytools.io/"><i class="fas fa-clipboard fa-lg fa-fw"></i> PrivateBin - Encrypted Pastebin at bin.privacytools.io</a></li>
-	</ul>
+  </ul>
 </div>
 
-<p>More services are on the way. If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask. And of course, if you like our services, please consider <a href="/donate/">donating to support our server costs</a>, <em>any donation helps!</em></p>
+<p>More services are on the way. If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask. And of course, if you like our services, please consider <a href="/donate/">donating to support our server costs</a>, <em>any donation helps!</em></p>

pages/software.html

@@ -8,19 +8,19 @@ description: "Discover a variety of open source software built to protect your p
 <p>Click on whatever software you need to view our recommendations.</p>
 
 <div class="card card-list">
-	<ul class="list-group list-group-flush">
+  <ul class="list-group list-group-flush">
-		<li class="list-group-item"><a href="/software/email/"><i class="fas fa-envelope"></i> Email Clients</a></li>
+    <li class="list-group-item"><a href="/software/email/"><i class="fas fa-envelope"></i> Email Clients</a></li>
-		<li class="list-group-item"><a href="/software/email/#messaging"><i class="fas fa-random"></i> Email Alternatives</a></li>
+    <li class="list-group-item"><a href="/software/email/#messaging"><i class="fas fa-random"></i> Email Alternatives</a></li>
-		<li class="list-group-item"><a href="/software/im/"><i class="fab fa-telegram-plane"></i> Instant Messenger</a></li>
+    <li class="list-group-item"><a href="/software/im/"><i class="fab fa-telegram-plane"></i> Instant Messenger</a></li>
-		<li class="list-group-item"><a href="/software/voip/"><i class="fas fa-phone"></i> Video & Voice Messenger</a></li>
+    <li class="list-group-item"><a href="/software/voip/"><i class="fas fa-phone"></i> Video & Voice Messenger</a></li>
-		<li class="list-group-item"><a href="/software/file-sharing/"><i class="fas fa-file-export"></i> File Sharing</a></li>
+    <li class="list-group-item"><a href="/software/file-sharing/"><i class="fas fa-file-export"></i> File Sharing</a></li>
-		<li class="list-group-item"><a href="/software/cloud/"><i class="fas fa-hdd"></i> Self-Hosted Cloud Server</a></li>
+    <li class="list-group-item"><a href="/software/cloud/"><i class="fas fa-hdd"></i> Self-Hosted Cloud Server</a></li>
-		<li class="list-group-item"><a href="/software/file-sync/"><i class="fas fa-copy"></i> Secure File Sync</a></li>
+    <li class="list-group-item"><a href="/software/file-sync/"><i class="fas fa-copy"></i> Secure File Sync</a></li>
-		<li class="list-group-item"><a href="/software/passwords/"><i class="fas fa-user-lock"></i> Password Manager</a></li>
+    <li class="list-group-item"><a href="/software/passwords/"><i class="fas fa-user-lock"></i> Password Manager</a></li>
-		<li class="list-group-item"><a href="/software/calendar-contacts/"><i class="far fa-calendar-alt"></i> Calendar and Contacts Sync</a></li>
+    <li class="list-group-item"><a href="/software/calendar-contacts/"><i class="far fa-calendar-alt"></i> Calendar and Contacts Sync</a></li>
-		<li class="list-group-item"><a href="/software/encryption-tools/"><i class="fas fa-lock"></i> File Encryption</a></li>
+    <li class="list-group-item"><a href="/software/encryption-tools/"><i class="fas fa-lock"></i> File Encryption</a></li>
-		<li class="list-group-item"><a href="/software/networks/"><i class="fas fa-user-secret"></i> Self-contained Networks</a></li>
+    <li class="list-group-item"><a href="/software/networks/"><i class="fas fa-user-secret"></i> Self-contained Networks</a></li>
-		<li class="list-group-item"><a href="/software/notebooks/"><i class="far fa-sticky-note"></i> Digital Notebook</a></li>
+    <li class="list-group-item"><a href="/software/notebooks/"><i class="far fa-sticky-note"></i> Digital Notebook</a></li>
-		<li class="list-group-item"><a href="/software/productivity/"><i class="fas fa-briefcase"></i> Productivity Tools</a></li>
+    <li class="list-group-item"><a href="/software/productivity/"><i class="fas fa-briefcase"></i> Productivity Tools</a></li>
-	</ul>
+  </ul>
-</div>
+</div>

pages/software/cal-card.html

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

pages/software/cloud.html

@@ -5,4 +5,4 @@ title: "Self Hosted \"Cloud\""
 description: "Discover how to securely and privately self-host your cloud with open source software."
 ---
 
-{% include sections/selfhosted-cloud.html %}
+{% include sections/selfhosted-cloud.html %}

pages/software/email.html

@@ -7,4 +7,4 @@ description: "Discover free, open source, and secure ways email clients, and som
 
 {% include sections/email-clients.html %}
 
-{% include sections/email-alternatives.html %}
+{% include sections/email-alternatives.html %}