Use updated label functionality

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

_includes/sections/instant-messenger.html

@@ -1,7 +1,7 @@
 <h1 id="im" class="anchor"><a href="#im"><i class="fas fa-link anchor-icon"></i></a> Encrypted Instant Messenger</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using an Instant Messenger like LINE, Telegram, Viber, <a href="https://www.eff.org/deeplinks/2016/10/where-whatsapp-went-wrong-effs-four-biggest-security-concerns">WhatsApp</a>, or plain SMS messages you should pick an alternative here.</strong>
+  <strong>If you are currently using an Instant Messenger like Telegram, LINE, Viber, <a href="https://www.eff.org/deeplinks/2016/10/where-whatsapp-went-wrong-effs-four-biggest-security-concerns">WhatsApp</a>, or plain SMS you should pick an alternative here.</strong>
 </div>
 
 
@@ -10,21 +10,20 @@ title="Signal"
 image="/assets/img/tools/Signal.png"
 description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
 All communications are end-to-end encrypted. Signal is free and open source."
+labels="success:VoIP"
 website="https://signal.org/"
 forum="https://forum.privacytools.io/t/discussion-signal/664"
 github="https://github.com/signalapp"
 android=""
 ios=""
-mac=""
-windows=""
-linux=""
 %}
 
 
 {% include cardv2.html
 title="Wire"
 image="/assets/img/tools/wire.png"
-description='A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available. <span class="badge badge-warning" data-toggle="tooltip" title="Wire stores metadata such as list of your connections/conversations in plaintext (= not encrypted)."><a href="https://www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text">Warning</a></span>'
+description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
+labels="warning:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text>Warning</a>:Wire stores metadata such as list of your connections/conversations in plaintext (= not encrypted).,success:VoIP"
 website="https://wire.com/"
 forum="https://forum.privacytools.io/t/discussion-wire/750"
 github="https://github.com/wireapp/"
@@ -53,13 +52,15 @@ web=""
   <ul>
     <li><a href="https://conversations.im/">Conversations</a> (Android) - An open source Jabber/XMPP client for Android 4.4+ smartphones. <span class="badge badge-success">OMEMO</span></li>
     <li><a href="https://gajim.org/">Gajim</a> (FreeBSD, Linux, Windows) - An open source fully featured XMPP client. <span class="badge badge-success">OMEMO</span></li>
-    <li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development. <span class="badge badge-success">OMEMO</span></li>
+    <li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development. <span class="badge badge-success">OMEMO</span> <span class="badge badge-success">VoIP</span></li>
     <li><a href="https://omemo.top/">Other OMEMO ready clients</a>.</li>
   </ul>
   <li><a href="https://www.kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
   <li><a href="https://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
   <li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
   <li><a href="https://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>
 
 
@@ -69,6 +70,12 @@ web=""
   <li><a href="https://www.vice.com/en_us/article/mg7v3a/ricochet-encrypted-messenger-tackles-metadata-problem-head-on">Ricochet, the Messenger That Beats Metadata, Passes Security Audit | Motherboard</a></li>
   <li><a href="https://firstlook.org/theintercept/2015/07/14/communicating-secret-watched/">Chatting in Secret While We're All Being Watched - firstlook.org</a></li>
   <li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
+  <li>Independent security audits</li>
+  <ul>
+    <li><a href="https://eprint.iacr.org/2016/1013.pdf">A Formal Security Analysis of the Signal Messaging Protocol (2019)</a> by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila</li>
+    <li><a href="https://wire.com/en/security/#audits">Independent security audits</a> on Wire's website</li>
+    <li><a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a></li>
+  </ul>
 </ul>
 
 <!-- Updating the Tor binary included with Ricochet -->

_includes/sections/teamchat.html

@@ -1,13 +1,14 @@
-<h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Team Chat Applications</h1>
+<h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Team Chat Platforms</h1>
 
 <div class="alert alert-warning" role="alert">
-        <strong>If your project or organization currently uses a team chat 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>
+        <strong>If your project or organization currently uses a platform like <a href="https://web.archive.org/web/20171029114027/https://feedback.discordapp.com/forums/326712-discord-dream-land/suggestions/17094256-implement-whispersystems-encryption-for-voice-and">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
 </div>
 
 {% include cardv2.html
 title="Rocket.chat"
 image="/assets/img/tools/rocket.chat.png"
-description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE. <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"
@@ -37,5 +39,5 @@ web=""
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">Wire Pro</a> - Paid team communication with E2EE. <span class="badge badge-warning" data-toggle="tooltip" title="While the free edition of Wire is a recommended platform, we have not tested the Pro edition.">Untested<i class="far fa-question-circle"></i></span></li>
+  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">Wire Pro</a> - Paid team communication with E2EE. <span class="badge badge-warning" data-toggle="tooltip" title="While the free edition of Wire is a recommended platform, we have not tested the Pro edition.">Untested <i class="far fa-question-circle"></i></span></li>
 </ul>

_includes/sections/voice-video-messenger.html

@@ -1,41 +1,9 @@
-<h1 id="voip" class="anchor"><a href="#voip"><i class="fas fa-link anchor-icon"></i></a> Encrypted Video & Voice Messenger</h1>
+<h1 id="voip" class="anchor"><a href="#voip"><i class="fas fa-link anchor-icon"></i></a> Video/Voice Calling</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a Video & Voice Messenger like Skype, Viber or Google Hangouts, you should pick an alternative here.</strong>
+  <strong>If you are currently using a Video/Voice Calling app like Skype, Viber or Google Hangouts, you should pick an alternative here.</strong> Please note that many of the above instant messengers also support <span class="badge badge-success">VoIP</span>. The software listed below are <em>primarily</em> Voice/Video focused.
 </div>
 
-{% include cardv2.html
-title="Mobile: Signal"
-image="/assets/img/tools/Signal.png"
-website="https://signal.org"
-description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
-All communications are end-to-end encrypted. Signal is free and open source."
-forum="https://forum.privacytools.io/t/discussion-signal/664"
-github="https://github.com/signalapp"
-android=""
-ios=""
-mac=""
-windows=""
-linux=""
-footer="OS: Android, iOS, macOS, Windows, Linux"
-%}
-
-{% include cardv2.html
-title="Wire"
-image="/assets/img/tools/wire.png"
-website="https://wire.com/download/"
-description="Wire is an app developed by Wire Swiss GmbH.
-The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source. <span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The company keeps a list of all the users you contact until you delete your account.\">Caution <i class=\"far fa-question-circle\"></i></span>"
-forum="https://forum.privacytools.io/t/discussion-wire/750"
-github="https://github.com/wireapp"
-android=""
-ios=""
-mac=""
-windows=""
-linux=""
-web=""
-%}
-
 {% include cardv2.html
 title="Linphone"
 image="/assets/img/tools/Linphone.png"
@@ -51,20 +19,30 @@ mac=""
 web=""
 %}
 
-
-
+{% include cardv2.html
+title="Mumble"
+image="/assets/img/tools/Mumble.png"
+website="https://mumble.info/"
+description="Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, <a href=\"https://github.com/mumble-voip/mumble/issues/1813\">it's missing end-to-end encryption</a>, so self-hosting is recommended."
+forum="https://forum.privacytools.io/t/discussion-mumble/1289"
+github="https://github.com/mumble-voip/"
+windows=""
+linux=""
+mac=""
+%}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://jitsi.org/">Jitsi</a> - Jitsi is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application.</li>
-  <li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. </li>
-  <li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you a full control over your communications and an unmatched level of privacy.</li>
+  <li><a href="https://jitsi.org/">Jitsi Meet</a> - Jitsi Meet is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application.<span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"Our Firefox tweaks recommend disabling WebRTC as it can be used to leak your IP address even behind a VPN, which is why Tor Browser disables it.\">Requires WebRTC</span> </li>
 </ul>
 
 <h3>Related Information</h3>
 
 <ul>
-  <li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
-  <li><a href="https://www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text">Secure Messaging App Wire Stores Everyone You've Ever Contacted in Plain Text | Motherboard</a></li>
+  <li>More information about Mumble:</li>
+  <ul>
+  <li><a href="https://wiki.mumble.info/wiki/Running_Murmur">Running Mumble Server</a> and <a href="https://wiki.mumble.info/wiki/Murmur.ini">its config file</a>, particularly <a href="https://wiki.mumble.info/wiki/Murmur.ini#obfuscate">obfuscating IPv4 addresses</a> and <a href="https://wiki.mumble.info/wiki/Murmur.ini#Process_Administrivia">logging</a></li>
+  <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/TorifyHOWTO/Mumble">Torifying Mumble</a>
+  </ul>
 </ul>

source_code.md

@@ -136,26 +136,24 @@ Backend: closed-source
 
  Ricochet: https://github.com/ricochet-im/ricochet
 
+ Tox: https://github.com/TokTok/c-toxcore
+
+ Ring/Jami: https://git.jami.net/savoirfairelinux
+
 ## Team chat
 
  Rocket.chat: https://github.com/rocketchat/
  
  Keybase: https://github.com/Keybase
 
-## Encrypted Video & Voice Messenger
- Signal: https://github.com/signalapp
-
- Wire: https://github.com/wireapp
-
+## Video & Voice Messenger
  Linphone: https://github.com/BelledonneCommunications/
 
+ Mumble: https://github.com/mumble-voip/
+
    Worth Mentioning
 
- Jitsi: https://github.com/jitsi/jitsi-meet
-
- Tox: https://github.com/TokTok/c-toxcore
-
- Ring/Jami: https://gerrit-ring.savoirfairelinux.com/#/q/status:open
+ Jitsi Meet: https://github.com/jitsi/jitsi-meet
 
  ## File Sharing
   OnionShare: https://github.com/micahflee/onionshare