Merge pull request #2 from privacytoolsIO/pr/1147

Pr/1147

_includes/cardv2.html

@@ -1,11 +1,47 @@
 <div class="card">
   <div class="card-header text-white bg-secondary">
-    <h3 class="h5">{{include.title}}</h3>
+    <h3 class="h5">
+      {% if include.badges %}
+      <span class="mr-2">{{include.title}}</span>
+      {% assign badges = include.badges | replace:", ", "," | split:"," %}
+          {% for badge in badges %}
+              {% assign badge_data = badge | split:":" %}
+              {% assign color = badge_data[0] %}
+              {% assign text = badge_data[1] %}
+              {% assign tooltip = badge_data[2] | default: false %}
+              {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+              <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
+                  }}
+                  {% else %}
+                  >{{text}}
+                  {% endif %}
+              </span>
+          {% endfor %}
+      {% else %}
+      {{include.title}}
+      {% endif %}
+    </h3>
   </div>
   <div class="card-body">
     <p class="card-text">
       <img src="{{include.image}}" height="120" width="120" class="panel-pic" alt="{{include.title}}">
       {{include.description}}
+      {% if include.labels %}
+      {% assign labels = include.labels | replace:", ", "," | split:"," %}
+          {% for label in labels %}
+              {% assign label_data = label | split:":" %}
+              {% assign color = label_data[0] %}
+              {% assign text = label_data[1] %}
+              {% assign tooltip = label_data[2] | default: false %}
+              {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+              <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
+                  }}
+                  {% else %}
+                  >{{text}}
+                  {% endif %}
+              </span>
+          {% endfor %}
+      {% endif %}
     </p>
     <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
       <div class="flex-shrink-0 mr-2">

_includes/sections/instant-messenger.html

@@ -8,8 +8,9 @@
 {% include cardv2.html
 title="Signal"
 image="/assets/img/tools/Signal.png"
-description='Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
+description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
-All communications are end-to-end encrypted. Signal is free and open source. <span class="badge badge-success">VoIP</span>'
+All communications are end-to-end encrypted. Signal is free and open source."
+labels="success:VoIP"
 website="https://signal.org/"
 forum="https://forum.privacytools.io/t/discussion-signal/664"
 github="https://github.com/signalapp"
@@ -21,7 +22,8 @@ ios=""
 {% include cardv2.html
 title="Wire"
 image="/assets/img/tools/wire.png"
-description='A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available. <span class="badge badge-warning" data-toggle="tooltip" title="Wire stores metadata such as list of your connections/conversations in plaintext (= not encrypted)."><a href="https://www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text">Warning</a></span> <span class="badge badge-success">VoIP</span>'
+description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
+labels="warning:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text>Warning</a>:Wire stores metadata such as list of your connections/conversations in plaintext (= not encrypted).,success:VoIP"
 website="https://wire.com/"
 forum="https://forum.privacytools.io/t/discussion-wire/750"
 github="https://github.com/wireapp/"

_includes/sections/live-operating-systems.html

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

_includes/sections/mobile-operating-systems.html

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

_includes/sections/notebooks.html

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

_includes/sections/operating-systems.html

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

_includes/sections/router-firmware.html

@@ -1,35 +1,38 @@
 <h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> Open Source Router Firmware</h1>
 
-<div class="row mb-2">
+{% include cardv2.html
-
-  {% include card.html color="success"
 title="OpenWrt"
-  labels="warning:contrib:This software may depend on or recommend non-free software."
 image="/assets/img/tools/OpenWrt.png"
-  url="https://openwrt.org/"
 description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers."
-  %}
+badges="info:Linux"
-
-  {% include card.html color="primary"
-  title="pfSense"
 labels="warning:contrib:This software may depend on or recommend non-free software."
-  image="/assets/img/tools/pfSense.png"
+website="https://openwrt.org/"
-  url="https://www.pfsense.org/"
+git="https://git.openwrt.org/"
-  description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
+github="https://github.com/openwrt"
 %}
 
-  {% include card.html color="warning"
+{% include cardv2.html
+title="pfSense"
+image="/assets/img/tools/pfSense.png"
+description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
+badges="info:BSD"
+labels="warning:contrib:This software may depend on or recommend non-free software."
+website="https://www.pfsense.org/"
+github="https://github.com/pfsense/"
+%}
+
+{% include cardv2.html
 title="LibreCMC"
 image="/assets/img/tools/LibreCMC.png"
-  url="https://librecmc.org"
+description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)."
-  description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF).."
+badges="info:GNU/Linux"
+website="https://librecmc.org"
+git="https://gogs.librecmc.org/libreCMC/libreCMC"
 %}
 
-</div>
-
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.openbsd.org/">OpenBSD</a> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
+  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
-  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
+  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
 </ul>

_includes/sections/teamchat.html

@@ -7,7 +7,8 @@
 {% 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. <a href=\"https://rocket.chat/docs/user-guides/end-to-end-encryption/\"><span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The documentation says this of E2EE: 'Note: This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. The federation was also added afterwards potentially causing room for mistakes.'\">Experimental <i class=\"far fa-question-circle\"></i></a></span>"
+description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
+labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental</a>:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. The federation was also added afterwards potentially causing room for mistakes."
 website="https://rocket.chat/"
 forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
 github="https://github.com/rocketchat/"
@@ -21,7 +22,8 @@ linux=""
 {% include cardv2.html
 title="Keybase"
 image="/assets/img/tools/keybase.png"
-description='Keybase provides a hosted team chat with end-to-end encryption. It has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. <span class="badge badge-warning" data-toggle="tooltip" title="The server side of Keybase runs on proprietary code and is centralized">experimental <i class="far fa-question-circle"></i> (<a href="https://github.com/keybase/client/issues/6374">GitHub issue</a>)</span>'
+description='Keybase provides a hosted team chat with end-to-end encryption. It has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>.'
+labels="warning:<a href=//github.com/keybase/client/issues/6374>Experimental</a>:The server side of Keybase runs on proprietary code and is centralized."
 website="https://keybase.io/"
 forum="https://forum.privacytools.io/t/discussion-keybase/1224"
 github="https://github.com/Keybase"

_includes/sections/voice-video-messenger.html

@@ -1,7 +1,7 @@
 <h1 id="voip" class="anchor"><a href="#voip"><i class="fas fa-link anchor-icon"></i></a> Video/Voice Calling</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a Video/Voice Calling app like Skype, Viber or Google Hangouts, you should pick an alternative here.</strong> Please note that many of the above instant messengers also support VoIP. The software listed below are <em>primarily</em> Voice/Video focused.
+  <strong>If you are currently using a Video/Voice Calling app like Skype, Viber or Google Hangouts, you should pick an alternative here.</strong> Please note that many of the above instant messengers also support <span class="badge badge-success">VoIP</span>. The software listed below are <em>primarily</em> Voice/Video focused.
 </div>
 
 {% include cardv2.html
@@ -23,7 +23,7 @@ web=""
 title="Mumble"
 image="/assets/img/tools/Mumble.png"
 website="https://mumble.info/"
-description="Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. <span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"\">Warning</span> 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."
+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=""

_includes/sections/vpn.html

@@ -230,20 +230,6 @@
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
       </tr>
-      <tr>
-        <td data-value="VPN.ht">
-          <a href="https://vpn.ht/"><img alt="VPN.ht" src="/assets/img/provider/VPN.ht.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpn.ht/" href="https://vpn.ht/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td data-value="40">$ 39.99</td>
-        <td><span class="label label-warning">No</span></td>
-        <td>128</td>
-        <td><span class="label label-warning">No</span></td>
-        <td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
-      </tr>
       <tr>
         <td data-value="VPNArea">
           <a href="https://vpnarea.com/"><img alt="VPNArea" src="/assets/img/provider/vpnarea.png" width="200" height="70"></a>