Merge branch 'master' into rtc-improvements

.github/CONTRIBUTING.md

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

_includes/cardv2.html

@@ -55,22 +55,22 @@
       </div>
 
       <div class="mt-2">
-          {% if include.windows %}<i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>{% 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 %}<i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>{% 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 %}<i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.linux %}{% if include.linux != "" %}<a href="{{ include.linux }}"><i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.bsd %}<i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.bsd %}{% if include.bsd != "" %}<a href="{{ include.bsd }}"><i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
 
-          {% if include.firefox %}<i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.firefox %}{% if include.firefox != "" %}<a href="{{ include.firefox }}"><i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.chrome %}<i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>{% 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 %}<i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>{% 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 %}<i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>{% 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 %}<i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>{% 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 %}<i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.android %}{% if include.android != "" %}<a href="{{ include.android }}"><i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
-          {% if include.ios %}<i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>{% 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 %}<i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>{% 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 %}<i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.web %}{% if include.web != "" %}<a href="{{ include.web }}"><i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
 
           {{include.icon1}}
           {{include.icon2}}

_includes/nav.html

@@ -31,11 +31,11 @@
             Browser
           </a>
           <div class="dropdown-menu" aria-labelledby="browserDropdown">
-            <a class="dropdown-item" href="/browsers/#fingerprint"><i class="fas fa-fingerprint fa-fw"></i> Fingerprint</a>
+            <a class="dropdown-item" href="/browsers/#browser"><i class="fas fa-check fa-fw"></i> Recommendations</a>
-            <a class="dropdown-item" href="/browsers/#addons"><i class="far fa-list-alt fa-fw"></i> Firefox Privacy Add-ons</a>
+            <a class="dropdown-item" href="/browsers/#fingerprint"><i class="fas fa-fingerprint fa-fw"></i> Fingerprinting Info</a>
-            <a class="dropdown-item" href="/browsers/#about_config"><i class="fas fa-wrench fa-fw"></i> Privacy Related Tweaks</a>
+            <a class="dropdown-item" href="/browsers/#webrtc"><i class="far fa-eye fa-fw"></i> WebRTC IP Leak Test</a>
-            <a class="dropdown-item" href="/browsers/#browser"><i class="fas fa-check fa-fw"></i> Recommendation</a>
+            <a class="dropdown-item" href="/browsers/#addons"><i class="far fa-list-alt fa-fw"></i> Browser Add-ons</a>
-            <a class="dropdown-item" href="/browsers/#webrtc"><i class="far fa-eye fa-fw"></i> WebRTC IP Leak</a>
+            <a class="dropdown-item" href="/browsers/#about_config"><i class="fas fa-wrench fa-fw"></i> Firefox Tweaks</a>
           </div>
         </li>
         <li class="nav-item dropdown">
@@ -62,12 +62,12 @@
             OS
           </a>
           <div class="dropdown-menu" aria-labelledby="osDropdown">
+            <a class="dropdown-item" href="/operating-systems/#os"><i class="fas fa-th-large fa-fw"></i> PC OS Recommendations</a>
+            <a class="dropdown-item" href="/operating-systems/#live_os"><i class="fas fa-compact-disc fa-fw"></i> Live CD Operating Systems</a>
+            <a class="dropdown-item" href="/operating-systems/#mobile_os"><i class="fas fa-mobile-alt fa-fw"></i> Mobile Operating Systems</a>
             <a class="dropdown-item" href="/operating-systems/#aaddons"><i class="fas fa-th fa-fw"></i> Android Privacy Add-ons</a>
-            <a class="dropdown-item" href="/operating-systems/#win10"><i class="far fa-thumbs-down fa-fw"></i> Don't use Windows 10</a>
-            <a class="dropdown-item" href="/operating-systems/#live_os"><i class="fas fa-compact-disc fa-fw"></i> Live CD OS</a>
-            <a class="dropdown-item" href="/operating-systems/#mobile_os"><i class="fas fa-mobile-alt fa-fw"></i> Mobile OS</a>
-            <a class="dropdown-item" href="/operating-systems/#os"><i class="fas fa-th-large fa-fw"></i> PC OS</a>
             <a class="dropdown-item" href="/operating-systems/#firmware"><i class="fas fa-signal fa-fw"></i> Router Firmware</a>
+            <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">

_includes/sections/browser-addons.html

@@ -1,7 +1,7 @@
-<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Excellent Firefox Privacy Add-ons</h1>
+<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Recommended Browser Add-ons</h1>
 
 <div class="alert alert-primary" role="alert">
-  <strong>Improve your privacy with these excellent Firefox add-ons.</strong>
+  <strong>Improve your privacy with these browser add-ons.</strong>
 </div>
 
 

_includes/sections/browser-recommendation.html

@@ -1,4 +1,4 @@
-<h1 id="browser" class="anchor"><a href="#browser"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendation</h1>
+<h1 id="browser" class="anchor"><a href="#browser"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations</h1>
 
 {% include cardv2.html
 title="Mozilla Firefox"
@@ -17,7 +17,7 @@ bsd=""
 %}
 
 {% include cardv2.html
-title="Tor Browser - for anonymity"
+title="Tor Browser - Provides Anonymity"
 image="/assets/img/tools/Tor-Browser.png"
 description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
 website="https://www.torproject.org/"
@@ -32,7 +32,7 @@ bsd=""
 %}
 
 {% include cardv2.html
-title="Brave Browser - Complete but Experimental"
+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/"

_includes/sections/calendar-contacts-sync.html

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

_includes/sections/dns.html

@@ -27,14 +27,6 @@ forum="https://forum.privacytools.io/t/discussion-dnscrypt/340"
 github="https://github.com/jedisct1/dnscrypt-proxy"
 %}
 
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://gitlab.com/quidsup/notrack">NoTrack</a> - A network-wide DNS server which blocks Tracking sites. Currently works in Debian and Ubuntu.</li>
-  <li><a href="https://namecoin.info/">Namecoin</a> - A decentralized DNS open source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
-  <li><a href="https://pi-hole.net/">Pi-hole</a> - A network-wide DNS server for the Raspberry Pi.  Blocks advertising and tracking domains for all devices on your network.</li>
-</ul>
-
 <h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> Encrypted ICANN DNS Providers</h1>
 
 <div class="alert alert-warning" role="alert">
@@ -298,12 +290,11 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
   <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>
+    <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>
-      <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><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>
+      <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>
+    <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>
-      <a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby">Stubby</a> - An <a href="https://github.com/getdnsapi/stubby">open-source</a> application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.
+    <li><a href="https://namecoin.info/">Namecoin</a> - A decentralized DNS open-source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
-    </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>

_includes/sections/email-providers.html

@@ -8,7 +8,7 @@
   <table class="table sortable-theme-bootstrap" data-sortable>
     <thead>
       <tr>
-        <th data-sorted="true" data-sorted-direction="descending">Email Provider</th>
+        <th data-sorted="true" data-sorted-direction="ascending">Email Provider</th>
         <th data-sortable="false">Website</th>
         <th data-sortable="true">Since</th>
         <th data-sortable="true">Jurisdiction</th>
@@ -23,7 +23,104 @@
     <tbody>
 
       <tr>
-        <td data-value="ProtonMail">
+        <td data-value="disroot">
+          <img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2015">2015</td>
+        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
+        <td data-value="1000">1 GB</td>
+        <td data-value="0"><span class="label label-warning">Free</span></td>
+        <td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="1"><span class="label label-success">Built-in</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="kolabnow">
+          <img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2010">2010</td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+        <td data-value="2048">2 GB</td>
+        <td data-value="6000">$ 60</td>
+        <td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="0"><span class="label label-primary">No</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="mailbox">
+          <img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
+
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
+        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
+        <td data-value="2000">2 GB</td>
+        <td data-value="1444">12 €</td>
+        <td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="1"><span class="label label-success">Built-in</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="mailfence">
+          <img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2013">2013</td>
+        <td><span class="flag-icon flag-icon-be"></span> Belgium</td>
+        <td data-value="500">500 MB</td>
+        <td data-value="0"><span class="label label-warning">Free</span></td>
+        <td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="1"><span class="label label-success">Built-in</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="neomailbox">
+          <img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2003">2003</td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
+        <td data-value="1000">1 GB</td>
+        <td data-value="4995">$ 49.95</td>
+        <td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="1"><span class="label label-success">Built-in</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="posteo">
+          <img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2009">2009</td>
+        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
+        <td data-value="2000">2 GB</td>
+        <td data-value="1444">12 €</td>
+        <td data-value="0"><span class="label label-primary">No</span></td>
+        <td data-value="1"><span class="label label-success">Built-in</span></td>
+        <td data-value="0"><span class="label label-primary">No</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="protonmail">
           <img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70">
         </td>
         <td>
@@ -40,23 +137,56 @@
       </tr>
 
       <tr>
-        <td data-value="disroot.org">
+        <td data-value="runbox">
-          <img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
+          <img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
+
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="1999">1999</td>
+        <td><span class="flag-icon flag-icon-no"></span> Norway</td>
+        <td data-value="1000">1 GB</td>
+        <td data-value="1995">$ 19.95</td>
+        <td data-value="1"><span class="label label-primary">Accepted</span></td>
+        <td data-value="0"><span class="label label-primary">No</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="soverin">
+          <img alt="Soverin" src="/assets/img/provider/Soverin.png" width="200" height="70">
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://soverin.net/" href="https://soverin.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
         </td>
         <td data-value="2015">2015</td>
         <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-        <td data-value="2000">2 GB</td>
+        <td data-value="25000">25 GB</td>
-        <td data-value="1"><span class="label label-warning">Free</span></td>
+        <td data-value="3489">29 €</td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
+        <td data-value="0"><span class="label label-success">No</span></td>
+        <td data-value="0"><span class="label label-success">No</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
+      <tr>
+        <td data-value="startmail">
+          <img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
+        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
+        <td data-value="10000">10 GB</td>
+        <td data-value="5995">$ 59.95</td>
+        <td data-value="0"><span class="label label-success">Accepted</span></td>
         <td data-value="1"><span class="label label-success">Built-in</span></td>
         <td data-value="1"><span class="label label-success">Yes</span></td>
       </tr>
 
       <tr>
-        <td data-value="Tutanota">
+        <td data-value="tutanota">
           <img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70">
         </td>
         <td>
@@ -71,136 +201,6 @@
         <td data-value="1"><span class="label label-success">Yes</span></td>
       </tr>
 
-      <tr>
-        <td data-value="Mailfence">
-          <img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2013">2013</td>
-        <td><span class="flag-icon flag-icon-be"></span> Belgium</td>
-        <td data-value="500">500 MB</td>
-        <td data-value="0"><span class="label label-warning">Free</span></td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="mailbox.org">
-          <img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
-
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
-        <td data-value="2000">2 GB</td>
-        <td data-value="13">12 €</td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="Posteo">
-          <img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2009">2009</td>
-        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
-        <td data-value="2000">2 GB</td>
-        <td data-value="13">12 €</td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="Runbox">
-          <img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
-
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="1999">1999</td>
-        <td><span class="flag-icon flag-icon-no"></span> Norway</td>
-        <td data-value="1000">1 GB</td>
-        <td data-value="20">$ 19.95</td>
-        <td data-value="1"><span class="label label-primary">Accepted</span></td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="Neomailbox">
-          <img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2003">2003</td>
-        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-        <td data-value="1000">1 GB</td>
-        <td data-value="50">$ 49.95</td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="Soverin">
-          <img alt="Soverin" src="/assets/img/provider/Soverin.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://soverin.net/" href="https://soverin.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2015">2015</td>
-        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-        <td data-value="25000">25 GB</td>
-        <td data-value="35">29 €</td>
-        <td data-value="0"><span class="label label-success">No</span></td>
-        <td data-value="1"><span class="label label-success">No</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="StartMail">
-          <img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
-        <td data-value="10000">10 GB</td>
-        <td data-value="60">$ 59.95</td>
-        <td data-value="0"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
-      <tr>
-        <td data-value="Kolab Now">
-          <img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2010">2010</td>
-        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-        <td data-value="2048">2 GB</td>
-        <td data-value="60">$ 60</td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
-
     </tbody>
   </table>
 </div>

_includes/sections/instant-messenger.html

@@ -58,7 +58,6 @@ web=""
   <li><a href="https://www.kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
   <li><a href="https://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
   <li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
-  <li><a href="https://ricochet.im/">Ricochet</a> - <span class="badge badge-danger" data-toggle="tooltip" title="This software is safe if you manually keep Tor up to date."><a href="#ricochetTor" class="text-white">Danger</a></span> <span class="badge badge-warning" data-toggle="tooltip" title="This software is considered safe but experimental and the client has not been updated since 2016."><a href="https://github.com/ricochet-im/ricochet#experimental">Experimental</a></span> Ricochet uses the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor network</a> to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with your contacts without revealing your location or IP address.</li>
   <li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. <span class="badge badge-success">VoIP</span></li>
   <li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you full control over your communications and an unmatched level of privacy. Jami has <em>text messaging, video and audio calls, file transfer, video conferencing</em>. <span class="badge badge-success">VoIP</span></li>
 </ul>
@@ -67,7 +66,6 @@ web=""
 <h3>Related Information</h3>
 
 <ul>
-  <li><a href="https://www.vice.com/en_us/article/mg7v3a/ricochet-encrypted-messenger-tackles-metadata-problem-head-on">Ricochet, the Messenger That Beats Metadata, Passes Security Audit | Motherboard</a></li>
   <li><a href="https://firstlook.org/theintercept/2015/07/14/communicating-secret-watched/">Chatting in Secret While We're All Being Watched - firstlook.org</a></li>
   <li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
   <li>Independent security audits</li>
@@ -78,37 +76,3 @@ web=""
   </ul>
 </ul>
 
-<!-- Updating the Tor binary included with Ricochet -->
-<h3 id="ricochetTor" class="anchor"><a href="#ricochetTor"><i class="fas fa-link anchor-icon"></i></a> Updating the Tor binary included with Ricochet</h3>
-
-Currently there are no known vulnerabilities with Ricochet. The software is safe to use as long as you update the included Tor binary to the latest version.
-
-<ol class="long-string-list">
-  <li>Download the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor Browser</a>.</li>
-  <li>Run the Tor Browser installer or extract package for your platform. Windows (.exe), MacOSX (.dmg) and Linux (.tar.bz2).</li>
-  <li>Copy the Tor binary or create a symbolic link to it: </li>
-  <br>
-  <ul>
-      <li><strong>Windows: </strong>Copy the Tor binary included with the Tor Browser and overwrite the old one included with Ricochet.</li>
-      <ul>
-          <li>Tor Browser binary: <code>%HOMEPATH%\Desktop\Tor Browser\Browser\TorBrowser\Tor\tor.exe</code></li>
-          <li>Ricochet's included binary: <code>%HOMEPATH%\Desktop\Ricochet\tor.exe</code></li>
-      </ul>
-      <br>
-      <li><strong>MacOSX: </strong>Assuming you copied the <code>Tor Browser.app</code> and <code>Ricochet.app</code> from their respective .dmg install media to <code>/Applications</code>: <br>
-          Create a symbolic link to the Tor binary in Terminal. Ricochet will continue to use the up to date version of the Tor binary when you update the Tor Browser Bundle.</li>
-      <ul>
-          <li><code>rm ~/Applications/Ricochet.app/Contents/MacOS/tor <br>
-                    ln -s ~/Applications/Tor\ Browser.app/Contents/Resources/TorBrowser/Tor/tor \ <br>
-                          ~/Applications/Ricochet.app/Contents/MacOS/tor</code>
-          </li>
-      </ul>
-      <br>
-      <li><strong>Linux: </strong>Assuming you extracted the Tor Browser Bundle and Ricochet tarball to your home directory:</li>
-      <ul>
-          <li><code>rm ~/ricochet/tor <br>
-                    ln -s ~/tor-browser_en-US/Browser/TorBrowser/Tor/tor ~/ricochet/tor</code>
-          </li>
-      </ul>
-  <ul>
-</ol>

_includes/sections/mobile-operating-systems.html

@@ -39,5 +39,5 @@ github="https://github.com/ubports"
 <ul>
   <li><a href="https://www.replicant.us/">Replicant</a> <span class="badge badge-info">AOSP</span> - An open-source operating system based on Android, aiming to replace all proprietary components with free software.</li>
   <li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
-  <li><a href="https://microg.org/">MicroG</a> <span class="badge badge-info">Add-on Package</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement.
+  <li><a href="https://microg.org/">MicroG</a> <span class="badge badge-info">Add-on Package</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at <a href="https://lineage.microg.org/">Lineage for microG</a>.</li>
 </ul>

_includes/sections/vpn.html

@@ -20,96 +20,6 @@
       </tr>
     </thead>
     <tbody>
-      <tr>
-        <td data-value="AirVPN">
-          <a href="https://airvpn.org/"><img alt="AirVPN" src="/assets/img/provider/AirVPN.png" width="200" height="70"></a></td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://airvpn.org/" href="https://airvpn.org/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2010">2010</td>
-        <td data-value="{{ 54 | times: eur_to_usd }}">54 €</td>
-        <td><span class="label label-success">Yes</span></td>
-        <td>162</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-it"></span> Italy</td>
-      </tr>
-
-      <tr>
-        <td data-value="AzireVPN">
-          <a href="https://www.azirevpn.com/"><img alt="AzireVPN" src="/assets/img/provider/AzireVPN.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.azirevpn.com/" href="https://www.azirevpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2012">2012</td>
-        <td data-value="{{ 45 | times: eur_to_usd }}">45 €</td>
-        <td><span class="label label-success">Yes</span></td>
-        <td>22</td>
-        <td><span class="label label-success">Yes</span></td>
-        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
-      </tr>
-
-      <tr>
-        <td data-value="blackVPN">
-          <a href="https://www.blackvpn.com/"><img alt="blackVPN" src="/assets/img/provider/blackVPN.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.blackvpn.com/" href="https://www.blackvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2009">2009</td>
-        <td data-value="{{ 49 | times: eur_to_usd }}">49 €</td>
-        <td><span class="label label-success">Yes</span></td>
-        <td>31</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
-      </tr>
-
-      <tr>
-        <td data-value="ExpressVPN">
-          <a href="https://www.expressvpn.com/"><img alt="ExpressVPN" src="/assets/img/provider/ExpressVPN.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.expressvpn.com/" href="https://www.expressvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="http://expressobutiolem.onion. Requires specific software to access: torproject.org" href="http://expressobutiolem.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
-        </td>
-        <td data-value="2009">2009</td>
-        <td data-value="100">$ 99.95</td> <!-- USD on December 28, 2018 -->
-        <td><span class="label label-success">Yes</span></td>
-        <td>148</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-vg"></span> British Virgin Islands</td>
-      </tr>
-
-      <tr>
-        <td data-value="FrootVPN">
-          <a href="https://www.frootvpn.com/"><img alt="FrootVPN" src="/assets/img/provider/FrootVPN.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.frootvpn.com/" href="https://www.frootvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td data-value="36">$ 35.88</td>
-        <td><span class="label label-warning">No</span></td>
-        <td>27</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
-      </tr>
-
-      <tr>
-        <td data-value="hide.me">
-          <a href="https://hide.me/"><img alt="hide.me" src="/assets/img/provider/hide.me.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://hide.me/" href="https://hide.me/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2012">2012</td>
-        <td data-value="0"><a data-toggle="tooltip" data-placement="bottom" data-original-title="2 GB data transfer, 1 simultaneous connection" href="https://hide.me/pricing">Free</a></td>
-        <td><span class="label label-success">Yes</span></td>
-        <td>160+</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-my"></span> Malaysia</td>
-      </tr>
-
       <tr>
         <td data-value="IVPN">
           <a href="https://www.ivpn.net/"><img alt="IVPN" src="/assets/img/provider/IVPN.png" width="200" height="70"></a>
@@ -156,36 +66,6 @@
         <td><span class="flag-icon flag-icon-pa"></span> Panama</td>
       </tr>
 
-      <tr>
-        <td data-value="OVPN">
-          <a href="https://www.ovpn.com/"><img alt="OVPN" src="/assets/img/provider/ovpn.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ovpn.com/" href="https://www.ovpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td data-value="{{ 84 | times: eur_to_usd }}">84 €</td>
-        <td><span class="label label-success">Yes</span></td>
-        <td>67</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
-      </tr>
-
-      <tr>
-        <td data-value="Perfect Privacy">
-          <a href="https://www.perfect-privacy.com/"><img alt="Perfect Privacy" src="/assets/img/provider/Perfect-Privacy.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.perfect-privacy.com/" href="https://www.perfect-privacy.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2008">2008</td>
-        <td data-value="{{ 119.99 | times: eur_to_usd }}">119.99 €</td>
-        <td><span class="label label-warning">No</span></td>
-        <td>54</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-      </tr>
-
       <tr>
         <td data-value="ProtonVPN">
           <a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a     >
@@ -200,65 +80,6 @@
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
       </tr>
-
-      <tr>
-        <td data-value="Proxy.sh">
-          <a href="https://proxy.sh/"><img alt="Proxy.sh" src="/assets/img/provider/Proxy.sh.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://proxy.sh/" href="https://proxy.sh/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2012">2012</td>
-        <td data-value="40">$ 40</td>
-        <td><span class="label label-warning">No</span></td>
-        <td>300+</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
-      </tr>
-
-      <tr>
-        <td data-value="Trust.Zone">
-          <a href="https://trust.zone/"><img alt="Trust.Zone" src="/assets/img/provider/Trust.Zone.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://trust.zone/" href="https://trust.zone/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td data-value="40">$ 39.95</td>
-        <td><span class="label label-success">Yes</span></td>
-        <td>164</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
-      </tr>
-      <tr>
-        <td data-value="VPNArea">
-          <a href="https://vpnarea.com/"><img alt="VPNArea" src="/assets/img/provider/vpnarea.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpnarea.com/" href="https://vpnarea.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td data-value="59">$ 59</td>
-        <td><span class="label label-success">Yes</span></td>
-        <td>204</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-bg"></span> Bulgaria</td>
-      </tr>
-      <tr>
-        <td data-value="VPNTunnel">
-          <a href="https://vpntunnel.com/"><img alt="VPNTunnel" src="/assets/img/provider/VPNTunnel.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpntunnel.com/" href="https://vpntunnel.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td data-value="{{ 35.88 | times: eur_to_usd }}">35.88 €</td>
-        <td><span class="label label-warning">No</span></td>
-        <td>800+</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
-      </tr>
-
     </tbody>
   </table>
 </div>

pages/old.html

@@ -41,6 +41,8 @@ permalink: /classic/
 
 {% include sections/voice-video-messenger.html %}
 
+{% include sections/teamchat.html %}
+
 {% include sections/file-sharing.html %}
 
 {% include sections/cloud-storage.html %}

source_code.md

@@ -134,8 +134,6 @@ Backend: closed-source
 
  Status.im: https://github.com/status-im
 
- Ricochet: https://github.com/ricochet-im/ricochet
-
  Tox: https://github.com/TokTok/c-toxcore
 
  Ring/Jami: https://git.jami.net/savoirfairelinux