Remove Windows icons

Discourages Windows usage.
2019-08-17 11:18:42 -07:00
208 changed files with 478 additions and 1730 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -1,19 +1,17 @@
-<!-- PLEASE READ OUR CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
+<!-- PLEASE READ OUR [CONTRIBUTING GUIDELINES](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->

 ## Description

-Resolves: #none <!-- The number of the issue that is resolved by this pull request. If there is none, feel free to delete this line -->
+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] -->

- [ ] I have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
+- [ ] I have read and understand [CONTRIBUTING.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).

- [ ] I have [listed the source code](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md).
+- [ ] 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).

-* Netlify preview for the mainly edited page: <!-- link or Non Applicable? Edit this in afterwards -->
-
-* Code Repository (if applicable): 
+Code Repository (if applicable): 
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,5 @@
 _site/
+Gemfile
+Gemfile.lock
 .sass-cache/
 .DS_Store
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,249 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
-    colorator (1.1.0)
-    commonmarker (0.17.13)
-      ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.5)
-    dnsruby (1.61.3)
-      addressable (~> 2.5)
-    em-websocket (0.5.1)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    eventmachine (1.2.7)
-    execjs (2.7.0)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
-    forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (198)
-      activesupport (= 4.2.11.1)
-      github-pages-health-check (= 1.16.1)
-      jekyll (= 3.8.5)
-      jekyll-avatar (= 0.6.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.1.5)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.11.0)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.12.1)
-      jekyll-mentions (= 1.4.1)
-      jekyll-optional-front-matter (= 0.3.0)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.2.0)
-      jekyll-redirect-from (= 0.14.0)
-      jekyll-relative-links (= 0.6.0)
-      jekyll-remote-theme (= 0.3.1)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.5.0)
-      jekyll-sitemap (= 1.2.0)
-      jekyll-swiss (= 0.4.0)
-      jekyll-theme-architect (= 0.1.1)
-      jekyll-theme-cayman (= 0.1.1)
-      jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.1)
-      jekyll-theme-leap-day (= 0.1.1)
-      jekyll-theme-merlot (= 0.1.1)
-      jekyll-theme-midnight (= 0.1.1)
-      jekyll-theme-minimal (= 0.1.1)
-      jekyll-theme-modernist (= 0.1.1)
-      jekyll-theme-primer (= 0.5.3)
-      jekyll-theme-slate (= 0.1.1)
-      jekyll-theme-tactile (= 0.1.1)
-      jekyll-theme-time-machine (= 0.1.1)
-      jekyll-titles-from-headings (= 0.5.1)
-      jemoji (= 0.10.2)
-      kramdown (= 1.17.0)
-      liquid (= 4.0.0)
-      listen (= 3.1.5)
-      mercenary (~> 0.3)
-      minima (= 2.5.0)
-      nokogiri (>= 1.8.5, < 2.0)
-      rouge (= 2.2.1)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.16.1)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (~> 3.0)
-      typhoeus (~> 1.3)
-    html-pipeline (2.12.0)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
-    http_parser.rb (0.6.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
-      addressable (~> 2.4)
-      colorator (~> 1.0)
-      em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
-      liquid (~> 4.0)
-      mercenary (~> 0.3.3)
-      pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
-      safe_yaml (~> 1.0)
-    jekyll-avatar (0.6.0)
-      jekyll (~> 3.0)
-    jekyll-coffeescript (1.1.1)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.3.1)
-      commonmarker (~> 0.14)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-commonmark-ghpages (0.1.5)
-      commonmarker (~> 0.17.6)
-      jekyll-commonmark (~> 1)
-      rouge (~> 2)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.11.0)
-      jekyll (~> 3.3)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.12.1)
-      jekyll (~> 3.4)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.4.1)
-      html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
-    jekyll-optional-front-matter (0.3.0)
-      jekyll (~> 3.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.2.0)
-      jekyll (~> 3.0)
-    jekyll-redirect-from (0.14.0)
-      jekyll (~> 3.3)
-    jekyll-relative-links (0.6.0)
-      jekyll (~> 3.3)
-    jekyll-remote-theme (0.3.1)
-      jekyll (~> 3.5)
-      rubyzip (>= 1.2.1, < 3.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-seo-tag (2.5.0)
-      jekyll (~> 3.3)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
-    jekyll-swiss (0.4.0)
-    jekyll-theme-architect (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.3)
-      jekyll (~> 3.5)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.1)
-      jekyll (~> 3.3)
-    jekyll-watch (2.2.1)
-      listen (~> 3.0)
-    jemoji (0.10.2)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
-    kramdown (1.17.0)
-    liquid (4.0.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mercenary (0.3.6)
-    mini_portile2 (2.4.0)
-    minima (2.5.0)
-      jekyll (~> 3.5)
-      jekyll-feed (~> 0.9)
-      jekyll-seo-tag (~> 2.1)
-    minitest (5.11.3)
-    multipart-post (2.1.1)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    pathutil (0.16.2)
-      forwardable-extended (~> 2.6)
-    public_suffix (3.1.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    rouge (2.2.1)
-    ruby-enum (0.7.2)
-      i18n
-    ruby_dep (1.5.0)
-    rubyzip (1.2.3)
-    safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    typhoeus (1.3.1)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  github-pages
-  tzinfo-data
-
-BUNDLED WITH
-   2.0.1
--- a/_includes/cardv2.html
+++ b/_includes/cardv2.html
@ -3,19 +3,15 @@
    <h3 class="h5">
      {% if include.badges %}
      <span class="mr-2">{{include.title}}</span>
-      {% assign badges = include.badges | split:"|" %}
+      {% assign badges = include.badges | replace:", ", "," | split:"," %}
          {% for badge in badges %}
              {% assign badge_data = badge | split:":" %}
              {% assign color = badge_data[0] %}
              {% assign text = badge_data[1] %}
              {% assign tooltip = badge_data[2] | default: false %}
              {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
-          <span
-            class="badge badge-{{color}}"
-            {% if tooltip %}
-              data-toggle="tooltip"
-              title="{{ tooltip }}"
-              > {{text}} {{ help_icon }}
+              <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
+                  }}
                  {% else %}
                  >{{text}}
                  {% endif %}
@ -28,28 +24,18 @@
  </div>
  <div class="card-body">
    <p class="card-text">
-      <img
-        src="{{include.image}}"
-        height="120"
-        width="120"
-        class="panel-pic"
-        alt="{{include.title}}"
-      >
+      <img src="{{include.image}}" height="120" width="120" class="panel-pic" alt="{{include.title}}">
      {{include.description}}
      {% if include.labels %}
-      {% assign labels = include.labels | split:"|" %}
+      {% 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 }}
+              <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
+                  }}
                  {% else %}
                  >{{text}}
                  {% endif %}
@ -59,197 +45,45 @@
    </p>
    <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
      <div class="flex-shrink-0 mr-2">
-        <a
-          href="{{include.website}}"
-          class="btn btn-primary mt-1">
-          <i class="fas fa-external-link-alt fa-fw"></i>
-          Website
-        </a>
+        <a href="{{include.website}}" class="btn btn-primary 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>
+        <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>
+        <a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: torproject.org" href="{{include.tor}}"><img class="mt-2" alt="Tor" src="/assets/img/layout/tor.png" width="35" height="35"></a>
        {% endif %}
      </div>

      <div class="mt-2">
-          {% if include.windows %}
-            {% if include.windows != "" %}
-              <a href="{{ include.windows }}">
-                <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
+          {% if include.windows %}{% if include.windows != "" %}<a href="{{ include.windows }}"><i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+          {% if include.mac %}{% if include.mac != "" %}<a href="{{ include.mac }}"><i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+          {% if include.linux %}{% if include.linux != "" %}<a href="{{ include.linux }}"><i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+          {% if include.bsd %}{% if include.bsd != "" %}<a href="{{ include.bsd }}"><i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}

-          {% if include.mac %}
-            {% if include.mac != "" %}
-              <a href="{{ include.mac }}">
-                <i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
+          {% if include.firefox %}{% if include.firefox != "" %}<a href="{{ include.firefox }}"><i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+          {% if include.chrome %}{% if include.chrome != "" %}<a href="{{ include.chrome }}"><i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+          {% if include.safari %}{% if include.safari != "" %}<a href="{{ include.safari }}"><i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+          {% if include.opera %}{% if include.opera != "" %}<a href="{{ include.opera }}"><i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+          {% if include.edge %}{% if include.edge != "" %}<a href="{{ include.edge }}"><i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}

-          {% if include.linux %}
-            {% if include.linux != "" %}
-              <a href="{{ include.linux }}">
-                <i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
+          {% if include.android %}{% if include.android != "" %}<a href="{{ include.android }}"><i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+          {% if include.ios %}{% if include.ios != "" %}<a href="{{ include.ios }}"><i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
+          {% if include.fire %}{% if include.fire != "" %}<a href="{{ include.fire }}"><i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}

-          {% if include.bsd %}
-            {% if include.bsd != "" %}
-              <a href="{{ include.bsd }}">
-                <i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.firefox %}
-            {% if include.firefox != "" %}
-              <a href="{{ include.firefox }}">
-                <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.chrome %}
-            {% if include.chrome != "" %}
-              <a href="{{ include.chrome }}">
-                <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.safari %}
-            {% if include.safari != "" %}
-              <a href="{{ include.safari }}">
-                <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.opera %}
-            {% if include.opera != "" %}
-              <a href="{{ include.opera }}">
-                <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.edge %}
-            {% if include.edge != "" %}
-              <a href="{{ include.edge }}">
-                <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.android %}
-            {% if include.android != "" %}
-              <a href="{{ include.android }}">
-                <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.ios %}
-            {% if include.ios != "" %}
-              <a href="{{ include.ios }}">
-                <i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.fire %}
-            {% if include.fire != "" %}
-              <a href="{{ include.fire }}">
-                <i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
-
-          {% if include.web %}
-            {% if include.web != "" %}
-              <a href="{{ include.web }}">
-                <i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>
-              </a>
-            {% else %}
-              <i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>
-            {% endif %}
-          {% endif %}
+          {% if include.web %}{% if include.web != "" %}<a href="{{ include.web }}"><i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}

          {{include.icon1}}
          {{include.icon2}}
          {{include.icon3}}

-          {% if include.github %}
-            <a href="{{include.github}}">
-              <i class="fab fa-github fa-2x fa-fw d-inline"></i>
-            </a>
-          {% endif %}
-
-          {% if include.gitlab %}
-            <a href="{{include.gitlab}}">
-              <i class="fab fa-gitlab fa-2x fa-fw d-inline"></i>
-            </a>
-          {% endif %}
-
-          {% if include.git %}
-            <a href="{{include.git}}">
-              <i class="fab fa-git-square fa-2x fa-fw d-inline"></i>
-            </a>
-          {% endif %}
-
-          {% if include.source %}
-            <a href="{{include.source}}">
-              <i class="fas fa-code-branch fa-2x fa-fw d-inline"></i>
-            </a>
-          {% endif %}
+          {% if include.github %}<a href="{{include.github}}"><i class="fab fa-github fa-2x fa-fw d-inline"></i></a>{% endif %}
+          {% if include.gitlab %}<a href="{{include.gitlab}}"><i class="fab fa-gitlab fa-2x fa-fw d-inline"></i></a>{% endif %}
+          {% if include.git %}<a href="{{include.git}}"><i class="fab fa-git-square fa-2x fa-fw d-inline"></i></a>{% endif %}
+          {% if include.source %}<a href="{{include.source}}"><i class="fas fa-code-branch fa-2x fa-fw d-inline"></i></a>{% endif %}

      </div>
    </div>
+
  </div>
 </div>
 <br>
--- a/_includes/footer.html
+++ b/_includes/footer.html
@ -71,19 +71,8 @@
  </div>

  <div class="copyright-text">
-    <a href="/about/javascript" data-jslicense="1">
-      <span class="fab fa-js fa-lg"></span>
-      JavaScript Licenses
-    </a>
-    <p class="mt-2">
-      <strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong>
-      <em>privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em>
-      <a href="/privacy-policy/">View our privacy policy</a>.
-    </p>
-    <p class="text-left">
-      Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong>
-      (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</a>)
-    </p>
-
+    <p><strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong> <em>privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em> <a href="/privacy-policy/">View our privacy policy</a>.</p>
+    <p class="text-left">Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong> (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</a>)</p>
  </div>
+
 </footer>
--- a/_includes/head.html
+++ b/_includes/head.html
@ -44,5 +44,4 @@

  <!-- CSS stylesheets -->
  <link href="/assets/css/style.css?v=5" rel="stylesheet">
-  <link id="dark-css" href="/assets/css/dark.css?v=2" rel="stylesheet" media="(prefers-color-scheme: dark)">
 </head>
--- a/_includes/nav.html
+++ b/_includes/nav.html
@ -1,115 +1,85 @@
-<div class="fixed-top bg-dark">
-  <nav id="navbar">
+<nav id="navbar" class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark">
+  <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">
+      <span class="navbar-toggler-icon"></span>
+    </button>

-    <input type="checkbox" id="nav-toggle" checked />
-    <label for="nav-toggle" id="nav-toggle-label" class="fas fa-bars fa-lg"></label>
-    <a id="nav-home-mobile" class="nav-anchor" href="/index.html">
-      <img src="/assets/img/layout/logo_smaller.png" width="148px" height="22px" />
-    </a>
-
-    <div class="menu">
-
-      <div id="nav-left" class="position-relative flex-col">
-        <a class="nav-anchor" href="/index.html">
-          <span id="nav-home" class="fas fa-home fa-fw"></span>
-        </a>
-
-        <!-- Provider -->
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+      <ul class="navbar-nav mr-auto">
+        <li class="nav-item">
+          <a class="nav-link" href="/index.html"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a>
+        </li>
+        <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">
            Provider
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a class="dropdown-item" href="/providers/#ukusa"><span class="fas fa-user-secret fa-fw"></span> Avoid US & UK services</a>
-            <a class="dropdown-item" href="/providers/cloud-storage/"><span class="fas fa-cloud fa-fw"></span> Cloud Storage</a>
-            <a class="dropdown-item" href="/providers/dns/"><span class="fa fa-tasks fa-fw"></span> DNS</a>
-            <a class="dropdown-item" href="/providers/email/"><span class="fas fa-mail-bulk fa-fw"></span> Email</a>
-            <a class="dropdown-item" href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> Hosting</a>
-            <a class="dropdown-item" href="/providers/paste/"><span class="fas fa-paste fa-fw"></span> Pastebins</a>
-            <a class="dropdown-item" href="/providers/search-engines/"><span class="fas fa-search fa-fw"></span> Search Engines</a>
-            <a class="dropdown-item" href="/providers/social-networks/"><span class="fas fa-expand-arrows-alt fa-fw"></span> Social Networks</a>
-            <a class="dropdown-item" href="/providers/social-news-aggregator/"><span class="far fa-newspaper fa-fw"></span> Social News Aggregators</a>
-            <a class="dropdown-item" href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> VPN</a>
-          </span>
-        </details>
-
-        <!-- Browser -->
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              Browser
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a class="dropdown-item" href="/browsers/#browser"><span class="fas fa-check fa-fw"></span> Recommendation</a>
-            <a class="dropdown-item" href="/browsers/#fingerprint"><span class="fas fa-fingerprint fa-fw"></span> Fingerprinting Info</a>
-            <a class="dropdown-item" href="/browsers/#webrtc"><span class="far fa-eye fa-fw"></span> WebRTC IP Leak</a>
-            <a class="dropdown-item" href="/browsers/#addons"><span class="far fa-list-alt fa-fw"></span> Browser Add-ons</a>
-            <a class="dropdown-item" href="/browsers/#about_config"><span class="fas fa-wrench fa-fw"></span> Firefox Tweaks</a>
-          </span>
-        </details>
-
-        <!-- Software -->
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              Software
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a class="dropdown-item" href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> Calendar/Contacts Sync Tools</a>
-            <a class="dropdown-item" href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebook</a>
-            <a class="dropdown-item" href="/software/email/#messaging"><span class="fas fa-random fa-fw"></span> Email Alternatives</a>
-            <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a>
-            <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a>
-            <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a>
-            <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> Password Manager</a>
-            <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> Productivity Tools</a>
-            <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> Real-Time Communication</a>
-            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> Secure File Sync</a>
-            <a class="dropdown-item" href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> Self-contained Networks</a>
-            <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> Self-Hosted Cloud Server</a>
-          </span>
-        </details>
-
-        <!-- OS -->
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              OS
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a class="dropdown-item" href="/operating-systems/#os"><span class="fas fa-th-large fa-fw"></span> PC OS</a>
-            <a class="dropdown-item" href="/operating-systems/#live_os"><span class="fas fa-compact-disc fa-fw"></span> Live CD OS</a>
-            <a class="dropdown-item" href="/operating-systems/#mobile_os"><span class="fas fa-mobile-alt fa-fw"></span> Mobile OS</a>
-            <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> Android Privacy Add-ons</a>
-            <a class="dropdown-item" href="/operating-systems/#firmware"><span class="fas fa-signal fa-fw"></span> Router Firmware</a>
-            <a class="dropdown-item" href="/operating-systems/#win10"><span class="far fa-thumbs-down fa-fw"></span> Don't use Windows 10</a>
-          </span>
-        </details>
-
-        <a class="nav-anchor" href="/index.html#participate">Participate</a>
+          </a>
+          <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/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/email/"><i class="fas fa-mail-bulk fa-fw"></i> Email</a>
+            <a class="dropdown-item" href="/providers/hosting/"><i class="fas fa-database fa-fw"></i> Hosting</a>
+            <a class="dropdown-item" href="/providers/paste/"><i class="fas fa-paste fa-fw"></i> Pastebins</a>
+            <a class="dropdown-item" href="/providers/search-engines/"><i class="fab fa-searchengin fa-fw"></i> Search Engines</a>
+            <a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt fa-fw"></i> Social Networks</a>
+            <a class="dropdown-item" href="/providers/social-news-aggregator/"><i class="far fa-newspaper fa-fw"></i> Social News Aggregators</a>
+            <a class="dropdown-item" href="/providers/vpn/"><i class="far fa-eye-slash fa-fw"></i> VPN</a>
          </div>
-
-      <!-- Language -->
-      <div id="nav-right">
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              <span class="fas fa-language text-danger fa-fw"></span>
+        </li>
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="/browsers/" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            Browser
+          </a>
+          <div class="dropdown-menu" aria-labelledby="browserDropdown">
+            <a class="dropdown-item" href="/browsers/#browser"><i class="fas fa-check fa-fw"></i> Recommendations</a>
+            <a class="dropdown-item" href="/browsers/#fingerprint"><i class="fas fa-fingerprint fa-fw"></i> Fingerprinting Info</a>
+            <a class="dropdown-item" href="/browsers/#webrtc"><i class="far fa-eye fa-fw"></i> WebRTC IP Leak Test</a>
+            <a class="dropdown-item" href="/browsers/#addons"><i class="far fa-list-alt fa-fw"></i> Browser Add-ons</a>
+            <a class="dropdown-item" href="/browsers/#about_config"><i class="fas fa-wrench fa-fw"></i> Firefox Tweaks</a>
+          </div>
+        </li>
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="/software/" id="softwareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            Software
+          </a>
+          <div class="dropdown-menu" aria-labelledby="softwareDropdown">
+            <a class="dropdown-item" href="/software/calendar-contacts/"><i class="fas fa-calendar fa-fw"></i> Calendar/Contacts Sync Tools</a>
+            <a class="dropdown-item" href="/software/notebooks/"><i class="far fa-sticky-note fa-fw"></i> Digital Notebook</a>
+            <a class="dropdown-item" href="/software/email/#messaging"><i class="fas fa-random fa-fw"></i> Email Alternatives</a>
+            <a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> Email Clients</a>
+            <a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> File Encryption</a>
+            <a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> File Sharing</a>
+            <a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> Password Manager</a>
+            <a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> Productivity Tools</a>
+            <a class="dropdown-item" href="/software/real-time-communication/"><i class="fas fa-comments fa-fw"></i> Real-Time Communication</a>
+            <a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</a>
+            <a class="dropdown-item" href="/software/networks/"><i class="fas fa-user-secret fa-fw"></i> Self-contained Networks</a>
+            <a class="dropdown-item" href="/software/cloud/"><i class="fas fa-hdd fa-fw"></i> Self-Hosted Cloud Server</a>
+          </div>
+        </li>
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="/operating-systems/" id="osDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            OS
+          </a>
+          <div class="dropdown-menu" aria-labelledby="osDropdown">
+            <a class="dropdown-item" href="/operating-systems/#os"><i class="fas fa-th-large fa-fw"></i> PC OS Recommendations</a>
+            <a class="dropdown-item" href="/operating-systems/#live_os"><i class="fas fa-compact-disc fa-fw"></i> Live CD Operating Systems</a>
+            <a class="dropdown-item" href="/operating-systems/#mobile_os"><i class="fas fa-mobile-alt fa-fw"></i> Mobile Operating Systems</a>
+            <a class="dropdown-item" href="/operating-systems/#aaddons"><i class="fas fa-th fa-fw"></i> Android Privacy Add-ons</a>
+            <a class="dropdown-item" href="/operating-systems/#firmware"><i class="fas fa-signal fa-fw"></i> Router Firmware</a>
+            <a class="dropdown-item" href="/operating-systems/#win10"><i class="far fa-thumbs-down fa-fw"></i> Don't use Windows 10</a>
+          </div>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="/index.html#participate">Participate</a>
+        </li>
+      </ul>
+      <ul class="navbar-nav">
+        <li class="nav-item dropdown">
+          <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>
            Language
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a href="https://privacytools.io/" class="dropdown-item">English</a>
+          </a>
+          <div class="dropdown-menu" aria-labelledby="servicesDropdown">
            <a href="https://privacytools.twngo.xyz/" class="dropdown-item">繁體中文</a>
            <a href="https://victorhck.gitlab.io/privacytools-es/" class="dropdown-item">Español</a>
            <a href="https://pl.privacytools.io/" class="dropdown-item">Polski</a>
@ -117,36 +87,27 @@
            <a href="https://privacytools.it-sec.rocks/" class="dropdown-item">Deutsch</a>
            <a href="https://privacytools-it.github.io/" class="dropdown-item">Italiano</a>
            <a href="https://privacytools.ru" class="dropdown-item">Русский</a>
-          </span>
-        </details>
-
-        <!-- Services -->
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
+            <a href="https://privacytools.dreads-unlock.fr" class="dropdown-item">Français</a>
+          </div>
+        </li>
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="/services/" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
            Services
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a class="dropdown-item" href="https://forum.privacytools.io/"><span class="fab fa-discourse fa-fw"></span> Discourse - Forum</a>
-            <a class="dropdown-item" href="https://git.privacytools.io/"><span class="fab fa-git fa-fw"></span> Gitea - Git-Repository Manager</a>
-            <a class="dropdown-item" href="https://social.privacytools.io/"><span class="fas fa-retweet fa-fw"></span> Mastodon - Social Network</a>
-            <a class="dropdown-item" href="https://chat.privacytools.io/"><span class="fas fa-comment fa-fw"></span> Matrix - Federated Chat</a>
-            <a class="dropdown-item" href="https://bin.privacytools.io/"><span class="fas fa-clipboard fa-fw"></span> PrivateBin - Encrypted Pastebin</a>
-            <a class="dropdown-item" href="https://search.privacytools.io/"><span class="fas fa-search fa-fw"></span> Searx - Privacy Friendly Search</a>
-            <a class="dropdown-item" href="https://write.privacytools.io/"><span class="fas fa-pen-alt fa-fw"></span> Write Freely - Federated Blog</a>
-          </span>
-        </details>
-
-        <a href="https://blog.privacytools.io/" class="nav-anchor">Blog </a>
-        <a href="/donate/" class="nav-anchor">
-          Donate <span class="fas fa-heart text-danger fa-fw"></span>
-        </a>
-        <a id="nav-switch-theme" class="nav-anchor" href="javascript:void(0)" onClick="changeColorScheme()">
-          Theme <span class="nav-theme-icon fas fa-fw"></span>
          </a>
+          <div class="dropdown-menu" aria-labelledby="servicesDropdown">
+            <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://git.privacytools.io/"><i class="fab fa-git fa-fw"></i> Gitea - Git-Repository Manager</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://chat.privacytools.io/"><i class="fas fa-comment fa-fw"></i> Matrix - Federated Chat</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://search.privacytools.io/"><i class="fas fa-search fa-fw"></i> Searx - Privacy Friendly Search</a>
+            <a class="dropdown-item" href="https://write.privacytools.io/"><i class="fas fa-pen-alt fa-fw"></i> Write Freely - Federated Blog</a>
+          </div>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="/donate/">Donate <i class="fas fa-heart text-danger"></i></a>
+        </li>
+      </ul>
    </div>
  </div>
 </nav>
-</div>
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@ -2,7 +2,17 @@
 <script src="/assets/js/popper.min.js?v=4"></script>
 <script src="/assets/js/bootstrap.min.js?v=4"></script>
 <script src="/assets/js/sortable.min.js?v=4"></script>
-<script src="/assets/js/main.js?v=3"></script>
+<script>
+  $(function () {
+    $("[data-toggle='tooltip']").tooltip();
+  });
+
+  $('.navbar a').not(".dropdown-toggle").click(function (e) {
+    if ($(".navbar-toggler").is(":visible")) {
+      $('.navbar-collapse').collapse('toggle');
+    }
+  });
+</script>

 <!--
  Matomo is the leading open-source analytics platform:
@ -11,4 +21,17 @@
  - User privacy protection
 -->

+<script type="text/javascript">
+  var _paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://stats.privacytools.io/";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '1']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
 <noscript><img src="https://stats.privacytools.io/matomo.php?idsite=1&amp;rec=1" style="border:0" alt=""/></noscript>
--- a/_includes/sections/browser-addons.html
+++ b/_includes/sections/browser-addons.html
@ -94,7 +94,7 @@ chrome=""
 %}


-<h2>For Power Users Only</h2>
+<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>
--- a/_includes/sections/browser-fingerprint.html
+++ b/_includes/sections/browser-fingerprint.html
@ -4,7 +4,7 @@
  <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.png" width="439" height="350" class="img-fluid float-right" alt="Fingerprint image" style="margin-left:20px;">
+<img src="/assets/img/layout/browser-fingerprint.jpg" width="439" height="350" class="img-fluid float-right" alt="Fingerprint image" style="margin-left:20px;">

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

--- a/_includes/sections/browser-recommendation.html
+++ b/_includes/sections/browser-recommendation.html
@ -8,7 +8,6 @@ recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a
 website="https://www.firefox.com/"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
 github="https://github.com/mozilla"
-windows=""
 mac=""
 linux=""
 android=""
@ -23,10 +22,22 @@ description='Tor Browser is your choice if you need an extra layer of anonymity.
 website="https://www.torproject.org/"
 forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
 git="https://trac.torproject.org/projects/tor"
-windows=""
 mac=""
 linux=""
 android=""
 ios=""
 bsd=""
 %}
+
+{% include cardv2.html
+title="Brave Browser - Chromium Based"
+image="/assets/img/tools/Brave.png"
+description="The new open source browser Brave automatically blocks ads and trackers, making it faster and safer than your current browser. Brave is based on Chromium. <span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"Brave is a good choice if you want to use a Chromium-based browser. But at this point in Brave's development&comma; it's not as good as Firefox with privacy addons.\">experimental <i class=\"far fa-question-circle\"></i></span>"
+website="https://brave.com/"
+forum="https://forum.privacytools.io/t/discussion-brave-browser/280"
+github="https://github.com/brave"
+mac=""
+linux=""
+android=""
+ios=""
+%}
--- a/_includes/sections/browser-tweaks.html
+++ b/_includes/sections/browser-tweaks.html
@ -52,6 +52,9 @@
  <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>

+  <dt>geo.enabled = false</dt>
+  <dd>Disables geolocation.</dd>
+
  <dt>media.eme.enabled = false</dt>
  <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>
@ -115,8 +118,23 @@
  </ul>
  </dd>

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

  <dt>webgl.disabled = true</dt>
  <dd>WebGL is a potential security risk. <a href="https://security.stackexchange.com/questions/13799/is-webgl-a-security-concern">Source</a></dd>
@ -144,9 +162,10 @@
  </dd>
 </dl>

-<h3 id="user.js">Firefox user.js Templates</h3>
+<h3>Firefox user.js Templates</h3>
 <ul>
 	<li><a href="https://github.com/ghacksuserjs/ghacks-user.js">ghacks-user.js</a> - An ongoing comprehensive user.js template for configuring and hardening Firefox privacy, security and anti-fingerprinting.</li>
+	<li><a href="https://github.com/pyllyukko/user.js">pyllyukko/user.js</a> - This is a user.js configuration file to harden Firefox's settings and make it more secure.</li>
 </ul>


--- a/_includes/sections/cloud-storage.html
+++ b/_includes/sections/cloud-storage.html
@ -11,7 +11,6 @@ description="Similar functionally to the widely used Dropbox, with the differenc
 website="https://nextcloud.com/"
 forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
 github="https://github.com/nextcloud"
-windows=""
 mac=""
 linux=""
 bsd=""
@ -22,12 +21,11 @@ fire=""

 {% include cardv2.html
 title="Least Authority S4 - For Experts"
-image="/assets/img/provider/S4.png"
+image="/assets/img/provider/S4.jpg"
 description="S4 (Simple Secure Storage Service) is Least Authority's verifiably secure off-site backup system for individuals and businesses. 100% client-side encryption and open source transparency. 250GB for $9.95/month or 5TB for $25.95/month. Servers are hosted with Amazon S3 in the US."
 website="https://leastauthority.com/"
 forum="https://forum.privacytools.io/t/discussion-least-authority-s4/288"
 github="https://github.com/LeastAuthority"
-windows=""
 mac=""
 linux=""
 bsd=""
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@ -37,7 +37,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
  <table class="table sortable-theme-bootstrap" data-sortable>
    <thead>
      <tr>
-        <th data-sorted="true" data-sorted-direction="ascending">ICANN DNS Provider</th>
+        <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>
@ -54,12 +54,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        <td data-value="AdGuard">
          <a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard</a>
        </td>
-        <td>Anycast (based in
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-cy"></span>
-              Cyprus)
-          </span>
-        </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">
@ -82,20 +77,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        <td data-value="BlahDNS">
          <a href="https://blahdns.com/">BlahDNS</a>
        </td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-ch"></span>
-            Switzerland,
-          </span>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-jp"></span>
-            Japan,
-          </span>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span>
-            Germany
-          </span>
-        </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">
@ -103,15 +85,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        </td>
        <td>Hobby Project</td>
        <td>No</td>
-        <td data-value="dot/443">
-          <span class="no-text-wrap">
-            DoH,
-            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
-              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
-            </span>
-          </span>
-          DNSCrypt
-        </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>
@ -126,12 +100,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        <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="no-text-wrap">
-            <span class="flag-icon flag-icon-us"></span>
-            US)
-          </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">
@ -154,12 +123,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        <td data-value="CZ.NIC">
          <a href="https://www.nic.cz/odvr/">CZ.NIC</a>
        </td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-cz"></span>
-            Czech Republic
-          </span>
-        </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">
@ -178,12 +142,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        <td data-value="dnswarden">
          <a href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md">dnswarden</a>
        </td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span>
-            Germany
-          </span>
-        </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">
@ -191,15 +150,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        </td>
        <td>Hobby Project</td>
        <td>No</td>
-        <td data-value="dot/443">
-          <span class="no-text-wrap">
-            DoH,
-            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
-              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
-            </span>
-          </span>
-          DNSCrypt
-        </td>
+        <td>DoH, DoT, DNSCrypt</td>
        <td>Yes</td>
        <td>Yes</td>
        <td>Based on server choice</td>
@ -210,12 +161,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        <td data-value="Foundation for Applied Privacy">
          <a href="https://appliedprivacy.net/services/dns/">Foundation for Applied Privacy</a>
        </td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-at"></span>
-            Austria
-          </span>
-        </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">
@ -223,14 +169,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        </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 data-value="dot/443">
-          <span class="no-text-wrap">
-            DoH,
-            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
-              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>
-            </span>
-          </span>
-        </td>
+        <td>DoH, DoT</td>
        <td>Yes</td>
        <td>Yes</td>
        <td>No</td>
@ -241,12 +180,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        <td data-value="nextdns">
          <a href="https://www.nextdns.io/">nextdns</a>
        </td>
-        <td>Anycast (based in
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-us"></span>
-            US)
-          </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.nextdns.io/privacy" href="https://www.nextdns.io/privacy">
            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
@ -261,57 +195,11 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        <td>?</td>
      </tr>

-      <tr>
-        <td data-value="NixNet">
-          <a href="https://nixnet.xyz/dns/">NixNet</a>
-        </td>
-        <td>
-          <span class="no-text-wrap">
-            Anycast (based in
-            <span class="flag-icon flag-icon-us"></span>
-            US),
-          </span>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-us"></span>
-            US,
-          </span>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-lu"></span>
-            Luxembourg
-          </span>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://nixnet.xyz/privacy/" href="https://nixnet.xyz/privacy/">
-            <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='Part of LibreHosters, "a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms."' href="https://libreho.st/">
-            Informal collective
-          </a>
-        </td>
-        <td>No</td>
-        <td>DoT</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>Based on server choice</td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://git.nixnet.xyz/NixNet/dns" href="https://git.nixnet.xyz/NixNet/dns">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-      </tr>
-
      <tr>
        <td data-value="PowerDNS">
          <a href="https://powerdns.org/">PowerDNS</a>
        </td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span>
-            The Netherlands
-          </span>
-        </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">
@ -334,12 +222,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        <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="no-text-wrap">
-            <span class="flag-icon flag-icon-us"></span>
-            US)
-          </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">
@ -358,12 +241,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        <td data-value="SecureDNS">
          <a href="https://securedns.eu/">SecureDNS</a>
        </td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span>
-            The Netherlands
-          </span>
-        </td>
+        <td><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">
@ -382,12 +260,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
        <td data-value="UncensoredDNS">
          <a href="https://blog.uncensoreddns.org/">UncensoredDNS</a>
        </td>
-        <td>Anycast (based in
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-dk"></span>
-            Denmark)
-          </span>
-        </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">
@ -403,81 +276,26 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
      </tr>
    </tbody>
  </table>
-</div>

  <h4>Terms</h4>

  <ul>
-  <li>DNS-over-TLS (DoT) - A security protocol for encrypted DNS on a dedicated port 853. Some providers support port 443 which generally works everywhere while port 853 is often blocked by restrictive firewalls. DoT has two modes:</li>
-    <ul>
-        <li>Oppurtunistic mode: the client attempts to form a DNS-over-TLS connection to the server on port 853 without performing certificate validation. If it fails, it will use unencrypted DNS. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="In other words automatic mode leaves your DNS traffic vulnerable to SSL strip and MITM attacks"><i class="fas fa-exclamation-triangle"></i></span></li>
-        <li>Strict mode: the client connects to a specific hostname and performs certificate validation for it. If it fails, no DNS queries are made until it succeeds.</li>
-    </ul>
-  <li>DNS-over-HTTPS (DoH) - Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="DoH contains metadata such as user-agent (which may include system information) that is sent to the DNS server."><a href="https://tools.ietf.org/html/rfc8484#section-8.2"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+    <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>

-<h4>How to verify DNS is encrypted</h4>
-
-<ul>
-  <li>DoH / DoT
-    <ul>
-      <li>Check <a href="https://www.dnsleaktest.com/">DNSLeakTest.com</a>. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title="Your DNS provider may not appear with their own name, so compare the responses to what you know or can find about your DNS provider. Just ensure you don't see your ISP or old unencrypted DNS provider."><i class="fas fa-exclamation-triangle"></i></span></li>
-      <li>Check the website of your DNS provider. They may have a page for telling "you are using our DNS." Examples include <a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard</a> and <a href="https://1.1.1.1/help">Cloudflare</a>.</li>
-      <li>If using Firefox's trusted recursive resolver (TRR), navigate to <code>about:networking#dns</code>. If the TRR column says "true" for some fields, you are using DoH. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title='Some fields will say "false" depending on the the value of network.trr.mode in about:config'><a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver"><i class="fas fa-exclamation-triangle"></i></a></span></li>
-    </ul>
-  </li>
-  <li>dnscrypt-proxy - Check <a href="https://github.com/jedisct1/dnscrypt-proxy/wiki/Checking">dnscrypt-proxy's wiki on how to verify that your DNS is encrypted</a>.
-  </li>
-  <li>DNSSEC - Check <a href="https://dnssec.vs.uni-due.de/">DNSSEC Resolver Test by Matthäus Wander</a>.</li>
-  <li>QNAME Minimization - Run <code><a href="https://en.wikipedia.org/wiki/Dig_(command)">dig</a> +short txt qnamemintest.internet.nl</code> from the command-line (taken from <a href="https://nlnetlabs.nl/downloads/presentations/unbound_qnamemin_oarc24.pdf">this NLnet Labs presentation</a>). You should see this display: <code>"HOORAY - QNAME minimisation is enabled on your resolver :)!"</code></li>
-</ul>
-
  <h3>Worth Mentioning and Additional Information</h3>

  <ul>
-  <li><strong>Encrypted DNS clients for desktop:</strong>
-    <ul>
-      <li><em>Firefox</em> 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>
-          <ul>
-              <li>DNS over HTTPS can be enabled in Menu -> Preferences (<code>about:preferences</code>) -> Network Settings -> Enable DNS over HTTPS. Set "Use Provider" to "Custom", and enter your DoH provider's address.</li>
-              <li>Advanced users may enable it in <code>about:config</code> by setting <code>network.trr.custom_uri</code> and <code>network.trr.uri</code> as the address you find from the documentation of your DoH provider and <code>network.trr.mode</code> as <code>2</code>. It may also be desirable to set <code>network.security.esni.enabled</code> to <code>True</code> in order to enable encrypted SNI and make sites supporting ESNI a bit more difficult to track.</li>
-          </ul>
-    </ul>
-  </li>
-  <li><strong>Encrypted DNS clients for mobile:</strong>
-    <ul>
-      <li><em>Android 9</em> 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>
-        <ul>
-          <li>We recommend selecting <em>Private DNS provider hostname</em> and entering the DoT address from documentation of your DoT provider to enable strict mode (see Terms above). <span class="badge badge-warning" data-toggle="tooltip" data-original-title="If you are on a network blocking access to port 853, Android will error about the network not having internet connectivity."><i class="fas fa-exclamation-triangle"></i></span></li>
-        </ul>
-      <li><em><a href="https://apps.apple.com/app/id1452162351">DNSCloak</a></em> - 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><em><a href="https://git.frostnerd.com/PublicAndroidApps/smokescreen/blob/master/README.md">Nebulo</a></em> - An open-source application for Android supporting DoH and DoT. It also supports caching DNS responses and locally logging DNS queries.</li>
-    </ul>
-  </li>
-  <li><strong>Local DNS servers:</strong>
-    <ul>
-      <li><em><a href="https://namecoin.info/">Namecoin</a></em> - A decentralized DNS open-source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
-      <li><em><a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby">Stubby</a></em> - An open-source application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.</li>
-    </ul>
-  </li>
-  <li><strong>Network wide DNS servers:</strong>
-    <ul>
-      <li><em><a href="https://pi-hole.net/">Pi-hole</a></em> - A network-wide DNS server mainly for the Raspberry Pi. Blocks ads, tracking, and malicious domains for all devices on your network.</li>
-      <li><em><a href="https://gitlab.com/quidsup/notrack">NoTrack</a></em> - A network-wide DNS server like Pi-hole for blocking ads, tracking, and malicious domains.</li>
-    </ul>
-  </li>
-  <li><strong>Further reading:</strong>
-    <ul>
-      <li>On Firefox, DoH and ESNI</li>
-          <ul>
-              <li><a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver">Trusted Recursive Resolver (DoH) on MozillaWiki</a></li>
-              <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1500289">Firefox bug report requesting the ability to use ESNI without DoH</a></li>
-              <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1542754">Firefox bug report requesting the ability to use Android 9+'s Private DNS (DoT) and benefit from encrypted SNI without having to enable DoH</a></li>
-              <li><a href="https://blog.cloudflare.com/encrypted-sni/">Encrypt it or lose it: how encrypted SNI works on Cloudflare blog</a></li>
-          </ul>
+    <li>Firefox comes with built-in DoH support with Cloudflare set as the default resolver, but can be configured to use any DoH resolver. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title='"Cloudflare has agreed to collect only a limited amount of data about the DNS requests that are sent to the Cloudflare Resolver for Firefox via the Firefox browser."'><a href="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/firefox/"><i class="fas fa-exclamation-triangle"></i></a></span> Currently Mozilla is <a href="https://blog.mozilla.org/futurereleases/2019/07/31/dns-over-https-doh-update-detecting-managed-networks-and-user-choice/">conducting studies</a> before enabling DoH by default for all US-based Firefox users.</li>
+    <li>Android 9 comes with a DoT client by <a href="https://support.google.com/android/answer/9089903">default</a>. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="...but with some caveats"><a href="https://www.quad9.net/private-dns-quad9-android9/"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+    <li><a href="https://apps.apple.com/app/id1452162351">DNSCloak</a> - An <a href="https://github.com/s-s/dnscloak">open-source</a> DNSCrypt and DoH client for iOS by <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"A charitable non-profit host organization for international Free Software projects."' href="https://techcultivation.org/">the Center for the Cultivation of Technology gemeinnuetzige GmbH</a>.</li>
+      <li><a href="https://pi-hole.net/">Pi-hole</a> - A network-wide DNS server mainly for the Raspberry Pi. Blocks ads, tracking, and malicious domains for all devices on your network.</li>
+      <li><a href="https://gitlab.com/quidsup/notrack">NoTrack</a> - A network-wide DNS server like Pi-hole for blocking ads, tracking, and malicious domains.</li>
+    <li><a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby">Stubby</a> - An open-source application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.</li>
+    <li><a href="https://namecoin.info/">Namecoin</a> - A decentralized DNS open-source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
    <li><a href="https://www.isc.org/blogs/qname-minimization-and-privacy/">QNAME Minimization and Your Privacy</a> by the Internet Systems Consortium (ISC)</li>
    <li><a href="https://www.isc.org/dnssec/">DNSSEC and BIND 9</a> by the ISC</li>
  </ul>
-  </li>
-</ul>
+</div>
--- a/_includes/sections/email-alternatives.html
+++ b/_includes/sections/email-alternatives.html
@ -8,7 +8,6 @@ meaning that you need-not inherently trust any entities like root certificate au
 website="https://bitmessage.org/"
 forum="https://forum.privacytools.io/t/discussion-bitmessage/661"
 github="https://github.com/Bitmessage/PyBitmessage"
-windows=""
 mac=""
 linux=""
 %}
@ -20,7 +19,6 @@ description="Retroshare creates encrypted connections to your friends. Nobody ca
 website="https://retroshare.cc/"
 forum="https://forum.privacytools.io/t/discussion-retroshare/662"
 github="https://github.com/RetroShare/RetroShare"
-windows=""
 mac=""
 linux=""
 %}
--- a/_includes/sections/email-clients.html
+++ b/_includes/sections/email-clients.html
@ -7,7 +7,6 @@ description="Thunderbird is a free, open source, cross-platform email, newsgroup
 website="https://www.thunderbird.net/"
 forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
 source="https://hg.mozilla.org/comm-central/"
-windows=""
 mac=""
 linux=""
 bsd=""
@ -20,7 +19,6 @@ description="Claws Mail is a free and open source, GTK-based email and news clie
 website="https://www.claws-mail.org/"
 forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
 git="https://git.claws-mail.org/"
-windows=""
 mac=""
 linux=""
 bsd=""
--- a/_includes/sections/file-encryption.html
+++ b/_includes/sections/file-encryption.html
@ -44,5 +44,5 @@
  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
  <li><a href="https://diskcryptor.net/">DiskCryptor</a> - A full disk and partition encryption system for Windows including the ability to encrypt the partition and disk on which the OS is installed.</li>
  <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
-  <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</a></li>
+  <li><a href="https://hat.sh/">Hat.sh is a cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</a></li>
 </ul>
--- a/_includes/sections/file-sharing.html
+++ b/_includes/sections/file-sharing.html
@ -19,7 +19,6 @@ tor="http://elx57ue5uyfplgva.onion/"
 description="OnionShare is an open source tool that lets you securely and anonymously share a file of any size. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable URL to access and download the files."
 forum="https://forum.privacytools.io/t/discussion-onionshare/754"
 github="https://github.com/micahflee/onionshare"
-windows=""
 mac=""
 linux=""
 %}
@ -31,7 +30,6 @@ website="https://github.com/warner/magic-wormhole"
 description="Get things from one computer to another, safely. This package provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another."
 forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756"
 github="https://github.com/warner/magic-wormhole"
-windows=""
 mac=""
 linux=""
 %}
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@ -23,14 +23,13 @@ ios=""
 title="Wire"
 image="/assets/img/tools/wire.png"
 description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
-labels="warning:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text>Warning</a>:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.|success:VoIP"
+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/"
 android=""
 ios=""
 mac=""
-windows=""
 linux=""
 web=""
 %}
--- a/_includes/sections/notebooks.html
+++ b/_includes/sections/notebooks.html
@ -10,7 +10,6 @@ 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=""
@ -25,7 +24,6 @@ image="/assets/img/tools/StandardNotes.png"
 description="Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors."
 website="https://standardnotes.org/"
 github="https://github.com/standardnotes"
-windows=""
 mac=""
 linux=""
 ios=""
@ -39,7 +37,6 @@ image="/assets/img/tools/Turtl.png"
 description="Turtl lets you take notes, bookmark websites, and store documents for sensitive projects. From sharing passwords with your coworkers to tracking research on an article you're writing, Turtl keeps it all safe from everyone but you and those you share with."
 website="https://turtlapp.com/"
 github="https://github.com/turtl"
-windows=""
 mac=""
 linux=""
 android=""
--- a/_includes/sections/operating-systems.html
+++ b/_includes/sections/operating-systems.html
@ -41,38 +41,11 @@ tor="http://sejnfjrq6szgca7v.onion"
  <li><a href="#win10"><i class="fas fa-link"></i> Don't use Windows 10 - It's a privacy nightmare</a></li>
 </ul>

-<h4 id="cpuvulns">Remember to check CPU vulnerability mitigations</h4>
-
-<p><em><a href="https://support.microsoft.com/en-us/help/4073757/protect-windows-devices-from-speculative-execution-side-channel-attack">This also affects Windows 10</a>, but it doesn't expose this information or mitigation instructions as easily. MacOS users check <a href="https://support.apple.com/en-us/HT210108">How to enable full mitigation for Microarchitectural Data Sampling (MDS) vulnerabilities on Apple Support</a>.</em></p>
-
-<p>When running a enough recent kernel, you can check the CPU vulnerabilities it detects by <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code>. By using <code>tail -n +1</code> instead of <code>cat</code>, the file names are also visible.</p>
-
-<p>
-    In case you have an Intel CPU, you may notice "SMT vulnerable" display after running the <code>tail</code> command. To mitigate this, disable <a href="https://en.wikipedia.org/wiki/Hyper-threading">hyper-threading</a> from the UEFI/BIOS. You can also take the following mitigation steps below if your system/distribution uses GRUB and supports <code>/etc/default/grub.d/</code>:
-</p>
-
-<ol>
-  <li><code>sudo mkdir /etc/default/grub.d/</code> to create a directory for additional grub configuration</li>
-  <li><code>echo GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT mds=full,nosmt" | sudo tee /etc/default/grub.d/mds.conf</code> to create a new grub config file source with the echoed content</li>
-  <li><code>sudo grub-mkconfig -o /boot/grub/grub.cfg</code> to generate a new grub config file including this new kernel boot flag</li>
-  <li><code>sudo reboot</code> to reboot</li>
-  <li>after the reboot, check <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code> again to see that MDS now says "SMT disabled."</li>
-</ol>
-
-<h5>Further reading</h5>
-
-<ul>
-  <li><a href="https://cpu.fail/">CPU.fail</a></li>
-  <li><a href="https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html">MDS - Microarchitectural Data Sampling on The Linux kernel user's and administrator's guide</a></li>
-  <li><a href="https://mdsattacks.com/">RIDL and Fallout: MDS attacks on mdsattacks.com</a></li>
-  <li><a href="https://en.wikipedia.org/wiki/Simultaneous_multithreading">Simultaneous multithreading on Wikipedia</a></li>
-</ul>
-
 <h3>Worth Mentioning</h3>

 <ul>
  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
-  <li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
+  <li><a href="https://www.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>
  <li><a href="https://trisquel.info/">Trisquel</a> <span class="badge badge-info">GNU/Linux</span> - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.</li>
  <li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
--- a/_includes/sections/password-managers.html
+++ b/_includes/sections/password-managers.html
@ -1,68 +1,52 @@
 <h1 id="pw" class="anchor"><a href="#pw"><i class="fas fa-link anchor-icon"></i></a> Password Manager Software</h1>

 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a password manager software like 1Password, LastPass, Roboform, or iCloud Keychain, you should pick an alternative here.</strong>
+  <strong>If you are currently using a password manager software like 1Password, LastPass, Roboform or iCloud Keychain, you should pick an alternative here.</strong>
 </div>

-{%
-  include cardv2.html
+<div class="row mb-2">
+
+  {% include card.html color="success"
  title="Bitwarden - Cloud/Self-host"
  image="/assets/img/tools/bitwarden.png"
-  description="<strong>Bitwarden</strong> is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
-  website="https://bitwarden.com/"
-  forum="https://forum.privacytools.io/t/discussion-bitwarden/1343"
-  github="https://github.com/bitwarden"
-  web="https://vault.bitwarden.com/#/"
-  linux="https://vault.bitwarden.com/download/?app=desktop&platform=linux"
-  mac="https://vault.bitwarden.com/download/?app=desktop&platform=macos"
-  firefox="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/"
-  chrome="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb"
-  safari="https://safari-extensions.apple.com/details/?id=com.bitwarden.safari-LTZ2PFU5D6"
-  opera="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/"
-  edge="https://www.microsoft.com/store/apps/9P6KXL0SVNNL"
-  android="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
-  ios="https://itunes.apple.com/app/bitwarden-free-password-manager/id1137397744?mt=8"
+  url="https://bitwarden.com/"
+  footer="OS: Windows, macOS, Linux, iOS, Android, Web."
+  description="Bitwarden is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
  %}

-{%
-  include cardv2.html
-  title="KeePassXC - Local"
-  image="/assets/img/tools/keepassxc.png"
-  description="<strong>KeePassXC</strong> is a community fork of KeePassX, a native cross-platform port of KeePass Password Safe, with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager."
-  website="https://keepassxc.org/"
-  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
-  github="https://github.com/keepassxreboot/keepassxc"
-  web="https://keepassxc.org/"
-  linux="https://keepassxc.org/download/#linux"
-  mac="https://keepassxc.org/download/#mac"
+  {% include card.html color="primary"
+  title="KeePass / KeePassXC - Local"
+  image="/assets/img/tools/KeePass.png"
+  url="https://keepass.info/download.html"
+  website="keepass.info"
+  footer="OS: Windows, macOS, Linux, iOS, Android, BSD."
+  description='KeePass is a free open source password manager, which helps you to manage your passwords in a secure way. All passwords in one database, which is locked with one
+  master key or a key file. The databases are encrypted using the best and most secure encryption algorithms currently known: AES and Twofish. See also: <a href="https://keepassxc.org/">KeePassXC</a> with official native cross-platform support for Windows/macOS/Linux.'
  %}
-
-{%
-  include cardv2.html
+  {% include card.html color="warning"
  title="LessPass - Browser"
  image="/assets/img/tools/LessPass.png"
-  description="<strong>LessPass</strong> is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
-  website="https://lesspass.com/"
-  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
-  github="https://github.com/lesspass/lesspass"
-  firefox="https://addons.mozilla.org/en-US/firefox/addon/lesspass/"
-  chrome="https://chrome.google.com/webstore/detail/lesspass/lcmbpoclaodbgkbjafnkbbinogcbnjih"
-  android="https://play.google.com/store/apps/details?id=com.lesspass.android&hl=en"
+  url="https://lesspass.com/"
+  footer="OS: Windows, macOS, Linux, Android."
+  description="LessPass is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
  %}

+</div>
+
 <h3>Worth Mentioning</h3>

 <ul>
  <li>
-    <a href="https://masterpassword.app">Master Password</a> - Master Password is based on an ingenious password generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site, and your master password. No syncing, backups, or internet access needed.
+    <a href="https://masterpassword.app">Master Password</a> - Master Password is based on an ingenious password generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site and your master password. No syncing, backups or internet access needed.
  </li>

  <li>
-    <a href="https://psono.com/">Psono</a> - Free and open source password manager for teams with client side encryption and secure sharing of passwords, files, bookmarks, emails. All secrets are protected by a master password. Uses <a href="https://nacl.cr.yp.to/">NACL Crypto</a>, a combination of Curve25519, Salsa20 and Poly1305.
+    <a href="https://psono.com/">Psono</a> - Free and open source password manager for teams with client side encryption and secure sharing of passwords, files, bookmarks, emails... All secrets are protected by a master password. Uses <a href="https://nacl.cr.yp.to/">NACL Crypto</a>, a combination of Curve25519, Salsa20 and Poly1305.
  </li>

  <li>
-    <a href="https://pwsafe.org/">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted username/password list. With Password Safe all you have to do is create and remember a single "Master Password" of your choice in order to unlock and access your entire username/password list.
+    <a href="https://pwsafe.org/">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted username/password list. With Password Safe all you have to do is create and remember
+    a single "Master Password" of your choice in order to unlock and access your entire username/password list.
  </li>
 </ul>

--- a/_includes/sections/paste-services.html
+++ b/_includes/sections/paste-services.html
@ -4,7 +4,7 @@
 title="PrivateBin"
 image="/assets/img/tools/PrivateBin.png"
 description="PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256bit AES. It is the improved version of ZeroBin."
-website="https://privatebin.info/"
+website="https://bin.privacytools.io/"
 forum="https://forum.privacytools.io/t/discussion-privatebin/296"
 github="https://github.com/PrivateBin/PrivateBin"
 %}
--- a/_includes/sections/privacy-resources.html
+++ b/_includes/sections/privacy-resources.html
@ -14,15 +14,14 @@
 <h3>Information</h3>

 <ul>
-  <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://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://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://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.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://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://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://codeberg.org/crimeflare/cloudflare-tor"><strong>The Great Cloudwall</strong></a> - Critique and information on why to avoid Cloudflare, a big company with a huge portion of the internet behind it.</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>
@ -36,6 +35,7 @@
    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://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://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>
 </ul>
--- a/_includes/sections/search-engines.html
+++ b/_includes/sections/search-engines.html
@ -6,7 +6,7 @@

 {% include cardv2.html
 title="searx - Decentral"
-image="/assets/img/provider/searx.png"
+image="/assets/img/provider/searx.jpg"
 description='An <a href="https://github.com/asciimoo/searx">open source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">List of Instances</a> or try <a href="https://search.privacytools.io/">search.privacytools.io</a>'
 website="https://searx.me/"
 tor="http://ulrn6sryqaifefld.onion"
@ -24,7 +24,7 @@ forum="https://forum.privacytools.io/t/discussion-startpage/284"

 {% include cardv2.html
 title="DuckDuckGo - USA"
-image="/assets/img/provider/DuckDuckGo.png"
+image="/assets/img/provider/DuckDuckGo.jpg"
 description='The search engine that doesn\'t track you. Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="../../providers/#ukusa">The company is based in the USA.</a>'
 website="https://duckduckgo.com/"
 tor="http://3g2upl4pq6kufc4m.onion"
@ -34,7 +34,7 @@ github="https://github.com/duckduckgo"

 {% include cardv2.html
 title="Qwant - France"
-image="/assets/img/provider/Qwant.png"
+image="/assets/img/provider/qwant.jpg"
 description='Qwants philosophy is based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013. <a href="https://www.qwant.com/privacy">Privacy Policy.</a>'
 website="https://www.qwant.com/"
 forum="https://forum.privacytools.io/t/discussion-qwant/286"
--- a/_includes/sections/social-networks.html
+++ b/_includes/sections/social-networks.html
@ -34,7 +34,6 @@ description="Friendica has an emphasis on extensive privacy settings and easy se
 website="https://friendi.ca/"
 forum="https://forum.privacytools.io/t/discussion-friendica/291"
 github="https://github.com/friendica/friendica"
-windows=""
 linux=""
 android=""
 web=""
@ -60,7 +59,6 @@ github="https://github.com/foocorp/gnu-social"
 android=""
 ios=""
 linux=""
-windows=""
 web=""
 %}

--- a/_includes/sections/social-news-aggregator.html
+++ b/_includes/sections/social-news-aggregator.html
@ -11,7 +11,6 @@ description='<a href="https://github.com/nehbit/aether/blob/master/LICENSE.md">F
 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=""
@ -26,7 +25,6 @@ description='Tildes is a web-based self-hostable online bulletin board. It is li
 website="https://tildes.net"
 forum="https://forum.privacytools.io/t/discussion-tildes/1257"
 git="https://gitlab.com/tildes/"
-windows=""
 mac=""
 linux=""
 android=""
@ -41,7 +39,6 @@ description="Raddle is a public Postmill instance focused on privacy and anti-ce
 website="https://raddle.me"
 forum="https://forum.privacytools.io/t/discussion-raddle/1258"
 git="https://gitlab.com/postmill/"
-windows=""
 mac=""
 linux=""
 android=""
--- a/_includes/sections/teamchat.html
+++ b/_includes/sections/teamchat.html
@ -4,8 +4,7 @@
        <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
+{% 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."
@ -16,24 +15,20 @@
 android=""
 ios=""
 mac=""
-  windows=""
 linux=""
 %}

-{%
-  include cardv2.html
+{% include cardv2.html
 title="Keybase"
 image="/assets/img/tools/keybase.png"
 description='Keybase provides a hosted team chat with end-to-end encryption. It has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>.'
-  labels="warning:<a href=//github.com/keybase/client/issues/6374>Warning</a>:The server side of Keybase runs on proprietary code and is centralized."
+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"
-  tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
 github="https://github.com/Keybase"
 android=""
 ios=""
 mac=""
-  windows=""
 linux=""
 web=""
 %}
--- a/_includes/sections/voice-video-messenger.html
+++ b/_includes/sections/voice-video-messenger.html
@ -13,7 +13,6 @@ forum="https://forum.privacytools.io/t/discussion-linphone/751"
 github="https://github.com/BelledonneCommunications"
 ios=""
 android=""
-windows=""
 linux=""
 mac=""
 web=""
@ -26,7 +25,6 @@ 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=""
 %}
--- a/_includes/sections/vpn.html
+++ b/_includes/sections/vpn.html
@ -1,90 +1,128 @@
-<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Recommended VPN Service</h1>
+<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Privacy VPN Services</h1>

 <div class="alert alert-success" role="alert">
-  <strong>Our recommended provider is outside the US, uses encryption, accepts Bitcoin, supports OpenVPN, and has a no logging policy. <a href="/providers/vpn/#criteria">Read our full list of criteria for more information</a>.</strong>
+  <strong>All providers listed here are outside the US, use encryption, accept Bitcoin, support OpenVPN and have a no logging policy.</strong>
 </div>

-<div class="container-fluid">
+{% assign eur_to_usd = 1.14 %}
+<div class="table-responsive">
+  <table class="table sortable-theme-bootstrap" data-sortable>
+    <thead>
+      <tr>
+        <th data-sorted="true" data-sorted-direction="descending">VPN Provider</th>
+        <th data-sortable="false">Website</th>
+        <th data-sortable="true">Since</th>
+        <th data-sortable="true">Yearly Price</th>
+        <th data-sortable="true">Free Trial</th>
+        <th data-sortable="true" title="Number of Servers"># Servers</th>
+        <th data-sortable="true">WireGuard</th>
+        <th data-sortable="true">Jurisdiction</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td data-value="IVPN">
+          <a href="https://www.ivpn.net/"><img alt="IVPN" src="/assets/img/provider/IVPN.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ivpn.net/" href="https://www.ivpn.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2009">2009</td>
+        <td data-value="100">$ 100</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>38</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td><span class="flag-icon flag-icon-gi"></span> Gibraltar</td>
+      </tr>

-  <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/provider/Mullvad.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Mullvad">
-    </div>
-    <div class="col">
-    <h2>Mullvad <span class="badge badge-info">EUR €60/Year</span></h2>
-    <p><strong>Mullvad</strong> is a fast and inexpensive VPN with a serious focus on transparency and security, they have been in operation since <strong>2009</strong>. It is the only VPN provider that currently meets our criteria for recommendation. Mullvad is based in <span class="flag-icon flag-icon-se"></span> Sweden and does not have a free trial. Visit <a href="https://mullvad.net/">mullvad.net</a> to create an account.</p>
-    <h5><span class="badge badge-success">409+ Servers</span></h5>
-    <p>Mullvad has 409 servers in 38 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</p>
-    <h5><span class="badge badge-success">WireGuard Support</span></h5>
-    <p>In addition to standard OpenVPN connections, Mullvad supports Wireguard. Wireguard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.</p>
-    <h5><span class="badge badge-success">Independently Audited</span></h5>
-    <p>Mullvad's VPN clients have been audited by Cure53 and Assured AB in a pentest report <a href="https://cure53.de/pentest-report_mullvad_v2.pdf">published at cure53.de</a>. The security researchers concluded:</p>
-    <blockquote class="blockquote">
-      <p class="mb-0">...Cure53 and Assured AB are happy with the results of the audit and the software leaves an overall positive impression. With security dedication of the in-house team at the Mullvad VPN compound, the testers have no doubts about the project being on the right track from a security standpoint.</p>
-    </blockquote>
-    <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
-    <p>Mullvad in addition to accepting credit/debit cards and PayPal, accepts <strong>Bitcoin</strong>, <strong>Bitcoin Cash</strong>, and <strong>cash/local currency</strong> as anonymous forms of payment. They also accept Swish and bank wire transfers.</p>
-    <h5><span class="badge badge-warning">No Mobile Clients</span></h5>
-    <p>While iOS and Android clients are reportedly in the works, mobile users will need to use a traditional OpenVPN client and configuration files, which are a bit more difficult to configure.</p>
-    <h5><span class="badge badge-info">Extra Functionality</span></h5>
-    <p>The Mullvad VPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. The Mullvad website is also accessible via Tor at <a href="http://xcln5hkbriyklr6n.onion/">xcln5hkbriyklr6n.onion</a>.</p>
-    </div>
-  </div>
+      <tr>
+        <td data-value="Mullvad">
+          <a href="https://mullvad.net/"><img alt="Mullvad" src="/assets/img/provider/Mullvad.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mullvad.net/" href="https://mullvad.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="http://xcln5hkbriyklr6n.onion. Requires specific software to access: torproject.org" href="http://xcln5hkbriyklr6n.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
+        </td>
+        <td data-value="2009">2009</td>
+        <td data-value="{{ 60 | times: eur_to_usd }}">60 €</td>
+        <td><span class="label label-success">No</span></td>
+        <td>281</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
+      </tr>

+      <tr>
+        <td data-value="NordVPN">
+          <a href="https://nordvpn.com/"><img alt="NordVPN" src="/assets/img/provider/NordVPN.png" width="200" height="70"></a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://nordvpn.com/" href="https://nordvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2012">2012</td>
+        <td data-value="84">$ 83.88</td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>5200+</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-pa"></span> Panama</td>
+      </tr>
+
+      <tr>
+        <td data-value="ProtonVPN">
+          <a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a     >
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonvpn.com/" href="https://protonvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2016">2016</td>
+        <td data-value="0"><a data-toggle="tooltip" data-placement="bottom" data-original-title="3 countries, 1 device, speed: low" href="https://protonvpn.com/pricing">Free</a></td>
+        <td><span class="label label-success">Yes</span></td>
+        <td>396</td>
+        <td><span class="label label-warning">No</span></td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+      </tr>
+    </tbody>
+  </table>
 </div>

 <div class="alert alert-warning" role="alert">
-  <strong>Note: Using a VPN provider will not make you anonymous, but it will give you better privacy in certain situations. A VPN is not a tool for illegal activities. Don't rely on a "no log" policy.</strong>
+  <strong>Note: Using a VPN provider will not make you anonymous. But it will give you a better privacy. A VPN is not a tool for illegal activities. Don't rely on a "no log" policy.</strong>
 </div>

-<h1 id="vpn" class="anchor"><a href="#worth-mentioning"><i class="fas fa-link anchor-icon"></i></a> Other Providers Worth Mentioning</h1>
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+      <h3>Our VPN Provider Criteria</h3>

-<div class="container-fluid">
+      <ul>
+        <li>Operating outside the USA or other Five Eyes countries.<br>More: <a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus">Avoid all US and UK based services.</a></li>
+        <li>OpenVPN software support.</li>
+        <li>Accepts Bitcoin, cash, debit cards or cash cards as a payment method.</li>
+        <li>No personal information is required to create an account. Only username, password and <a href="/providers/email/"><i class="fas fa-link"></i> Email.</a></li>
+      </ul>

-  <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/provider/ProtonVPN.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="ProtonVPN">
-    </div>
-    <div class="col">
-    <h2>ProtonVPN <span class="badge badge-info">Free</span> <span class="badge badge-info">USD $96/year</span></h2>
-    <p><strong>ProtonVPN</strong> is a strong contender in the VPN space, and they have been in operation since <strong>2016</strong>. ProtonVPN is based in <span class="flag-icon flag-icon-ch"></span> Switzerland and offers a limited free pricing tier, as well as premium options. Unfortunately due to its lack of an independent security audit it does not meet the complete criteria for recommendation, see our notes below.</p>
-    <h5><span class="badge badge-danger">Not Audited</span></h5>
-    <p>ProtonVPN has not undergone a security audit by an independent third party, and therefore cannot be strongly recommended at this time. We have still chosen to list it on this page with the assumption that an audit will be published soon:</p>
-    <blockquote class="blockquote">
-      <p class="mb-0">We are currently undergoing a complete security audit of our VPN applications by a reputable Swiss security company. The results of the audit will be summarized in a public report for cases like this.</p>
-      <footer class="blockquote-footer">Marc Loebekken, ProtonVPN AG Legal counsel</footer>
-    </blockquote>
-    <p>We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner.
-    <h5><span class="badge badge-success">442+ Servers</span></h5>
-    <p>ProtonVPN has 442 servers in 33 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</p>
-    <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
-    <p>ProtonVPN does technically accept Bitcoin payments, however you either need to have an existing account, or contact their support team in advance to register with Bitcoin.</p>
-    <h5><span class="badge badge-success">Mobile Clients</span></h5>
-    <p>In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for iOS or Android allowing for easy connections to their servers.</p>
-    <h5><span class="badge badge-info">Extra Functionality</span></h5>
-    <p>The ProtonVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. ProtonVPN also offers "Tor" servers allowing you to easily connect to onion sites, but we still strongly recommend using the official Tor Browser for this purpose.</p>
-    </div>
+      <p>We're not affiliated with any of the above-listed VPN providers. This way we can give you honest recommendations.</p>
+
+      <h3>More VPN Providers</h3>
+      <ul>
+        <li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
+        <li><a href="https://thewirecutter.com/reviews/best-vpn-service/">In-depth research on 53 popular VPN providers.</a></li>
+      </ul>
    </div>

-  <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/provider/IVPN.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="IVPN">
-    </div>
-    <div class="col">
-    <h2>IVPN <span class="badge badge-info">USD $100/Year</span></h2>
-    <p><strong>IVPN</strong> is another strong premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar and offers a 3 day free trial. Unfortunately due to its lack of an independent security audit it does not meet the complete criteria for recommendation, see our notes below.</p>
-    <h5><span class="badge badge-danger">No Security Audit</span></h5>
-    <p>IVPN has undergone a <a href="https://cure53.de/audit-report_ivpn.pdf">no-logging audit from Cure53</a> which concluded in agreement with IVPN's no-logging claim. However, IVPN has not undergone a more comprehensive security audit by an independent third party, and therefore cannot be strongly recommended at this time. We have still chosen to list it on this page with the assumption that an audit will be published soon: The IVPN team <a href="https://twitter.com/yaelwrites/status/1161796418220089344">reportedly plans to begin the process in September</a>.</p>
-    <p>We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner.
-    <h5><span class="badge badge-success">70+ Servers</span></h5>
-    <p>IVPN has 70 servers in 29 countries at the time of writing this page. Typically the more servers a provider offers, the better. IVPN has a decent (but not exceptional) server count that will most likely provide adequate coverage to most users.</p>
-    <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
-    <p>In addition to accepting credit/debit cards and PayPal, IVPN accepts <strong>Bitcoin</strong> and <strong>cash/local currency</strong> (on annual plans) as anonymous forms of payment.</p>
-    <h5><span class="badge badge-success">Mobile Clients</span></h5>
-    <p>In addition to providing standard OpenVPN configuration files, IVPN has mobile clients for iOS or Android allowing for easy connections to their servers.</p>
-    <h5><span class="badge badge-info">Extra Functionality</span></h5>
-    <p>The IVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. IVPN also provides "AntiTracker" functionality, which blocks advertising networks and trackers from the network level.</p>
-    </div>
-  </div>
+    <div class="col-md-6">
+
+      <h3>Related VPN information</h3>
+
+      <ul>
+        <li><a href="https://vikingvpn.com/blogs/off-topic/beware-of-vpn-marketing-and-affiliate-programs">Beware of False Reviews - VPN Marketing and Affiliate Programs</a></li>
+        <li><a href="https://www.goldenfrog.com/take-back-your-internet/articles/7-myths-about-vpn-logging-and-anonymity">I am Anonymous When I Use a VPN - 7 Myths Debunked</a><br />(<strong>Note:</strong> While this is a good read, they also use the article for self-promotion)</li>
+        <li><a href="https://torrentfreak.com/proxy-sh-vpn-provider-monitored-traffic-to-catch-hacker-130930/">Proxy.sh VPN Provider Sniffed Server Traffic to Catch Hacker</a></li>
+        <li><a href="https://proxy.sh/panel/knowledgebase.php?action=displayarticle&id=5">Ethical policy - All of the reasons why Proxy.sh might enable logging</a></li>
+        <li><a href="https://www.ivpn.net/privacy">IVPN.net will collect your email and IP address after sign up</a><br />Read the <a data-toggle="tooltip" data-placement="top" data-original-title="The IP collected at signup is only used for a few seconds by our fraud module and then discarded, it is not stored. Storing them would significantly increase our own liability and certainly would not be in our interest. You're absolutely welcome to signup using Tor or a VPN.">Email statement</a> from IVPN.</li>
+        <li><a href="https://medium.com/@blackVPN/no-logs-6d65d95a3016">blackVPN announced to delete connection logs after disconnection</a></li>
+        <li><a href="https://gist.github.com/kennwhite/1f3bc4d889b02b35d8aa">Don't use LT2P IPSec, use other protocols.</a></li>
+      </ul>

    </div>
+  </div>
+</div>
--- a/_includes/sections/windows10.html
+++ b/_includes/sections/windows10.html
@ -4,7 +4,7 @@
  <strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
 </div>

-<img src="/assets/img/layout/Windows-10-Privacy.png" width="367" height="369" class="img-fluid float-right" alt="Windows 10 Privacy" style="margin-left:10px;">
+<img src="/assets/img/layout/Windows-10-Privacy.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>
--- a/_layouts/minimal.html
+++ b/_layouts/minimal.html
@ -2,7 +2,6 @@
 <html lang="en">
 {% include head.html %}
 <body data-spy="scroll" data-target="#navbar">
-  <script src="/assets/js/applytheme.js?v=1"></script>
  <header>
  {% include nav.html %}
  <div id="top" class="py-4"></div>
--- a/about/javascript/index.html
+++ b/about/javascript/index.html
@ -1,27 +0,0 @@
-<h3>JavaScript Licenses</h3>
-<table id="jslicense-labels1" border="1">
-  <tr>
-    <td><a href="/assets/js/main.js">main.js</a></td>
-    <td><a href="https://creativecommons.org/publicdomain/zero/1.0/legalcode">CC0-1.0-only</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/redirects.js">redirects.js</a></td>
-    <td><a href="https://creativecommons.org/publicdomain/zero/1.0/legalcode">CC0-1.0-only</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/bootstrap.min.js">bootstrap.min.js</a></td>
-    <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/jquery-3.3.1.min.js">jquery-3.3.1.min.js</a></td>
-    <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/popper.min.js">popper.min.js</a></td>
-    <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/sortable.min.js">sortable.min.js</a></td>
-    <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
-  </tr>
-</table>
--- a/assets/css/dark.scss
+++ b/assets/css/dark.scss
@ -1,179 +0,0 @@
---
---
-$dark-400: #181b21;
-$dark-300: #22262e;
-$dark-200: #343a46;
-$dark-100: #464f60;
-$light: #d8d8d8;
-$primary: #345e8e;
-$danger: #b63f4a;
-$secondary: $dark-100;
-$success: #2c7f40;
-$warning: #c6a339;
-$info: #218899;
-
-
-/*
- * HTML
- */
-
-body {
-  background: $dark-400;
-  color: $light;
-}
-a {
-  color: lighten($primary, 25%);
-}
-a:hover {
-  color: lighten($primary, 10%);
-}
-img {
-  filter: saturate(80%);
-}
-
-
-/*
- * Bootstrap
- */
-
-.alert a {
-  color: #214D97;
-}
-
-.bg-secondary, .btn-secondary, .badge-secondary { background-color: $secondary !important; }
-.btn-secondary, .card-secondary .card-header { border-color: $secondary !important; }
-.text-secondary { color: $secondary !important; }
-.alert-secondary, .btn-secondary:hover {
-  color: $light;
-  background-color: darken($secondary, 10%);
-  border-color: darken($secondary, 10%);
-}
-
-.bg-primary, .btn-primary, .badge-primary { background-color: $primary !important; }
-.btn-primary, .card-primary .card-header { border-color: $primary !important; }
-.text-primary { color: $primary !important; }
-.alert-primary, .btn-primary:hover {
-  color: $light;
-  background-color: darken($primary, 10%);
-  border-color: darken($primary, 10%);
-}
-
-.bg-warning, .btn-warning, .badge-warning { background-color: $warning !important; }
-.btn-warning, .card-warning .card-header { border-color: $warning !important; }
-.text-warning { color: $warning !important; }
-.card-warning > .text-dark { color: $dark-400 !important; }
-.alert-warning, .btn-warning:hover {
-  color: $light;
-  background-color: darken($warning, 10%);
-  border-color: darken($warning, 10%);
-}
-
-.bg-info, .btn-info, .badge-info { background-color: $info !important; }
-.btn-info, .card-info .card-header { border-color: $info !important; }
-.text-info { color: $info !important; }
-.alert-info, .btn-info:hover {
-  color: $light;
-  background-color: darken($info, 10%);
-  border-color: darken($info, 10%);
-}
-
-.bg-success, .btn-success, .badge-success { background-color: $success !important; }
-.btn-success, .card-success .card-header { border-color: $success !important; }
-.text-success { color: $success !important; }
-.alert-success, .btn-success {
-  color: $light;
-  background-color: darken($success, 10%);
-  border-color: darken($success, 10%);
-}
-
-.bg-danger, .btn-danger, .badge-danger { background-color: $danger !important; }
-.btn-danger, .card-danger .card-header { border-color: $danger !important; }
-.text-danger { color: $danger !important; }
-.alert-danger, .btn-danger:hover {
-  color: $light;
-  background-color: darken($danger, 10%);
-  border-color: darken($danger, 10%);
-}
-
-.card {
-  box-shadow: none !important;
-}
-
-.dropdown-item:hover {
-  color: $light;
-  background-color: $dark-300;
-}
-
-.form-control,
-.form-control:focus {
-  color: $light;
-  background: $dark-300;
-  border-color: $dark-300;
-}
-
-.form-control[readonly],
-.form-control:disabled {
-  background: $dark-300;
-}
-
-.card,
-.jumbotron,
-.list-group-item {
-  background: $dark-300;
-}
-
-.blockquote {
-  border-color: $dark-300;
-}
-
-.bg-dark {
-  background-color: $dark-300 !important;
-}
-
-.dropdown-item {
-  color: $light;
-}
-
-.list-group-item {
-  border-color: $dark-200;
-}
-
-.text-dark {
-  color: $light !important;
-}
-
-table[data-sortable].sortable-theme-bootstrap {
-  color: $light;
-  background-color: $dark-300;
-}
-table[data-sortable].sortable-theme-bootstrap th,
-table[data-sortable].sortable-theme-bootstrap td {
-  border-color: $dark-100 !important;
-}
-table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"] {
-  color: $light;
-  background: $dark-200;
-}
-table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="ascending"]::after, {
-  border-bottom-color: $light;
-}
-table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="descending"]::after {
-  border-top-color: $light;
-}
-
-
-/*
- * Other
- */
-
-.nav-dropdown {
-  color: $light;
-  background-color: $dark-400;
-  border-color: $dark-300;
-}
-
-.nav-theme-icon:before {
-  color: $warning;
-  font-size: 1em;
-  content: "\f185";
-}
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@ -177,184 +177,9 @@ h2, h3:not(.h5), h4, h5 {
  text-align: justify;
 }

-.no-text-wrap {
-  white-space: nowrap;
-}
-
 footer {
  img,
  i {
    margin-right: 1rem;
  }
 }
-
-
-/*
- * Navbar
- */
-
-#navbar {
-  margin-left: auto;
-  margin-right: auto;
-  max-width: 1140px;
-  padding: .75rem 3rem;
-  color: rgba(255,255,255,0.5);
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-#navbar .menu {
-  position: relative;
-}
-
-.menu {
-  display: flex;
-  justify-content: space-between;
-}
-
-.nav-anchor {
-  display: inline;
-  color: inherit;
-}
-
-.nav-anchor:hover {
-  text-decoration: none;
-}
-
-.nav-anchor:hover,
-.nav-summary:hover,
-.nav-details[open] > summary > .nav-summary {
-  color: rgba(255,255,255,0.8);
-}
-
-.nav-dropdown {
-  color: var(--dark);
-  background-color: var(--light);
-  padding: .5rem 0;
-  margin-top: .5rem;
-  position: absolute;
-  border: 1px solid #dee2e6;
-  border-radius: .25rem;
-  box-shadow: 0 .5rem 1rem rgba(0,0,0,.15);
-  z-index: 10;
-}
-
-#nav-right > details > .nav-dropdown {
-  right: 0;
-}
-
-.nav-details {
-  display: inline;
-  position: relative;
-}
-
-.nav-details > summary {
-  list-style: none;
-}
-.nav-details > summary::-webkit-details-marker {
-  display: none;
-}
-
-#nav-right > .nav-details,
-#nav-right > .nav-anchor {
-  padding-left: 0.5rem;
-}
-#nav-left > .nav-details,
-#nav-left > .nav-anchor {
-  padding-right: 0.5rem;
-}
-
-input#nav-toggle,
-#nav-toggle-label {
-  display: none;
-}
-
-#nav-home-mobile {
-  display: none;
-}
-
-#nav-switch-theme {
-  /* We will make it visible with JavaScript
-   * as it does not work without it */
-  display: none;
-}
-
-/*
- * Mobile hamburger menu
- */
-
-@media only screen and (max-width: 992px) {
-  .menu,
-  .nav-details,
-  .nav-anchor {
-    display: block;
-  }
-  .menu {
-    margin-top: 0.5rem;
-  }
-  #nav-home {
-    display: none;
-  }
-  #nav-home-mobile {
-    display: inline;
-  }
-  input#nav-toggle:checked ~ .menu {
-    display: none;
-  }
-  input#nav-toggle + label {
-    display: block;
-    cursor: pointer;
-    margin-top: 0.25rem;
-    float: right;
-  }
-  .nav-dropdown {
-    display: block;
-    position: relative;
-    max-height: 15.75em;
-    overflow-y: auto;
-    left: 0;
-    right: 0;
-  }
-  #nav-right > .nav-details,
-  #nav-right > .nav-anchor,
-  #nav-left > .nav-details,
-  #nav-left > .nav-anchor {
-    padding: 0 0;
-  }
-  #navbar {
-    padding: 1rem 3rem;
-  }
-}
-
-@media only screen and (max-width: 768px) {
-  #navbar {
-    padding: 1rem 2rem;
-  }
-}
-
-@media only screen and (max-width: 575px) {
-  #navbar {
-    padding: 1rem 1rem;
-  }
-}
-
-@media only screen and (max-height: 350px) {
-  .nav-dropdown {
-    max-height: 8em;
-  }
-}
-
-.nav-theme-icon:before {
-  color: var(--warning);
-  font-size: 0.875em;
-  content: "\f186";
-}
-
-.table td, .table th {
-  vertical-align: middle;
-}
-
--- a/assets/img/addons/Blokada.png
+++ b/assets/img/addons/Blokada.png
--- a/assets/img/addons/Disconnect.png
+++ b/assets/img/addons/Disconnect.png
--- a/assets/img/addons/Orbot.png
+++ b/assets/img/addons/Orbot.png
--- a/assets/img/addons/Self-Destructing-Cookies.png
+++ b/assets/img/addons/Self-Destructing-Cookies.png
--- a/assets/img/addons/cookie-autodelete.png
+++ b/assets/img/addons/cookie-autodelete.png
--- a/assets/img/addons/decentraleyes.png
+++ b/assets/img/addons/decentraleyes.png
--- a/assets/img/addons/https-everywhere.png
+++ b/assets/img/addons/https-everywhere.png
--- a/assets/img/addons/netguard.png
+++ b/assets/img/addons/netguard.png
--- a/assets/img/addons/noscript.png
+++ b/assets/img/addons/noscript.png
--- a/assets/img/addons/privacy-badger.png
+++ b/assets/img/addons/privacy-badger.png
--- a/assets/img/addons/snowflake.png
+++ b/assets/img/addons/snowflake.png
--- a/assets/img/addons/tosdr.png
+++ b/assets/img/addons/tosdr.png
--- a/assets/img/addons/ublock-origin.png
+++ b/assets/img/addons/ublock-origin.png
--- a/assets/img/addons/ublock.png
+++ b/assets/img/addons/ublock.png
--- a/assets/img/addons/umatrix.png
+++ b/assets/img/addons/umatrix.png
--- a/assets/img/addons/xprivacylua.png
+++ b/assets/img/addons/xprivacylua.png
--- a/assets/img/favicons/android-chrome-144x144.png
+++ b/assets/img/favicons/android-chrome-144x144.png
--- a/assets/img/favicons/android-chrome-36x36.png
+++ b/assets/img/favicons/android-chrome-36x36.png
--- a/assets/img/favicons/android-chrome-48x48.png
+++ b/assets/img/favicons/android-chrome-48x48.png
--- a/assets/img/favicons/android-chrome-72x72.png
+++ b/assets/img/favicons/android-chrome-72x72.png
--- a/assets/img/favicons/android-chrome-96x96.png
+++ b/assets/img/favicons/android-chrome-96x96.png
--- a/assets/img/favicons/apple-touch-icon-120x120.png
+++ b/assets/img/favicons/apple-touch-icon-120x120.png
--- a/assets/img/favicons/apple-touch-icon-144x144.png
+++ b/assets/img/favicons/apple-touch-icon-144x144.png
--- a/assets/img/favicons/apple-touch-icon-57x57.png
+++ b/assets/img/favicons/apple-touch-icon-57x57.png
--- a/assets/img/favicons/apple-touch-icon-60x60.png
+++ b/assets/img/favicons/apple-touch-icon-60x60.png
--- a/assets/img/favicons/favicon-32x32.png
+++ b/assets/img/favicons/favicon-32x32.png
--- a/assets/img/favicons/favicon-96x96.png
+++ b/assets/img/favicons/favicon-96x96.png
--- a/assets/img/favicons/mstile-144x144.png
+++ b/assets/img/favicons/mstile-144x144.png
--- a/assets/img/favicons/mstile-70x70.png
+++ b/assets/img/favicons/mstile-70x70.png
--- a/assets/img/icons/bromite.png
+++ b/assets/img/icons/bromite.png
--- a/assets/img/icons/discourse.png
+++ b/assets/img/icons/discourse.png
--- a/assets/img/icons/github.png
+++ b/assets/img/icons/github.png
--- a/assets/img/icons/mastodon.png
+++ b/assets/img/icons/mastodon.png
--- a/assets/img/icons/reddit.png
+++ b/assets/img/icons/reddit.png
--- a/assets/img/icons/twitter.png
+++ b/assets/img/icons/twitter.png
--- a/assets/img/layout/Bitcoin.png
+++ b/assets/img/layout/Bitcoin.png
--- a/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg
+++ b/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg
--- a/assets/img/layout/PayPal.png
+++ b/assets/img/layout/PayPal.png
--- a/assets/img/layout/UKUSA.png
+++ b/assets/img/layout/UKUSA.png
--- a/assets/img/layout/USA.png
+++ b/assets/img/layout/USA.png
--- a/assets/img/layout/Windows-10-Privacy.jpg
+++ b/assets/img/layout/Windows-10-Privacy.jpg
--- a/assets/img/layout/Windows-10-Privacy.png
+++ b/assets/img/layout/Windows-10-Privacy.png
--- a/assets/img/layout/browser-fingerprint.jpg
+++ b/assets/img/layout/browser-fingerprint.jpg
--- a/assets/img/layout/browser-fingerprint.png
+++ b/assets/img/layout/browser-fingerprint.png
--- a/assets/img/layout/creativecommons.png
+++ b/assets/img/layout/creativecommons.png
--- a/assets/img/layout/git.png
+++ b/assets/img/layout/git.png
--- a/assets/img/layout/jonah.png
+++ b/assets/img/layout/jonah.png
--- a/assets/img/layout/kopimi.png
+++ b/assets/img/layout/kopimi.png
--- a/assets/img/layout/logo.png
+++ b/assets/img/layout/logo.png
--- a/assets/img/layout/logo_smaller.png
+++ b/assets/img/layout/logo_smaller.png
--- a/assets/img/layout/ogimage.jpg
+++ b/assets/img/layout/ogimage.jpg
--- a/assets/img/layout/privatesearch.png
+++ b/assets/img/layout/privatesearch.png
--- a/assets/img/layout/qr.png
+++ b/assets/img/layout/qr.png
--- a/assets/img/layout/reddit-logo.png
+++ b/assets/img/layout/reddit-logo.png
--- a/assets/img/layout/tor.png
+++ b/assets/img/layout/tor.png
--- a/assets/img/layout/warrant-canary.jpg
+++ b/assets/img/layout/warrant-canary.jpg
--- a/assets/img/layout/www.png
+++ b/assets/img/layout/www.png
--- a/assets/img/layout/zero.png
+++ b/assets/img/layout/zero.png
--- a/assets/img/misc/email.png
+++ b/assets/img/misc/email.png
--- a/assets/img/misc/smile.png
+++ b/assets/img/misc/smile.png
--- a/assets/img/provider/CryptPad.png
+++ b/assets/img/provider/CryptPad.png
--- a/assets/img/provider/DuckDuckGo.jpg
+++ b/assets/img/provider/DuckDuckGo.jpg
--- a/assets/img/provider/DuckDuckGo.png
+++ b/assets/img/provider/DuckDuckGo.png
--- a/assets/img/provider/IPredator.png
+++ b/assets/img/provider/IPredator.png
--- a/assets/img/provider/IVPN.png
+++ b/assets/img/provider/IVPN.png
--- a/Show More
+++ b/Show More