Redo of instant messenger section (centralized, federated, peer to peer)

_includes/sections/teamchat.html

@@ -6,10 +6,11 @@ <h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link ancho
 
 {%
   include cardv2.html
-  title="Riot.im (Matrix)"
-  image="/assets/img/tools/Riot.png"
-  description="Riot.im is a federated free-software messaging application based on the <a href\"https://matrix.org/\">Matrix</a> protocol, a recent open protocol for real-time communication offering optional E2E encryption. It also has bridging functionality, allowing you to connect to other chat protocols such as IRC or Telegram."
-  labels="warning:<a href=//github.com/vector-im/riot-web/issues/6779>Experimental E2EE</a>:The end-to-end encryption is currently in beta, and the mobile client states 'End-to-end encryption is in beta and may not be reliable. You should not yet trust it to secure data.'"
+  title="Matrix"
+  image="/assets/img/tools/Matrix.png"
+  image-dark="/assets/img/tools/Matrix-dark.png"
+  description='<a href="https://matrix.org/docs/guides/introduction">Matrix</a> is an open-source project that publishes the <a href="https://matrix.org/docs/spec">Matrix open standard</a> for secure, decentralized, real-time communication.<br />
+  <a href="https://en.wikipedia.org/wiki/Riot.im">Riot.im</a> is the popular reference client produced by the Matrix.org team. It offers optional E2EE for 1:1 and group conversations that <strong>must</strong> be turned on by the user. (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security &amp; Privacy → Encrypted). In the future it will be <a href="https://github.com/vector-im/riot-web/issues/6779">on by default.</a>'
   website="https://about.riot.im/"
   forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
   github="https://github.com/vector-im/riot-web/"
@@ -18,7 +19,7 @@ <h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link ancho
   linux="https://riot.im/download/desktop/"
   fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
   googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
-  ios="https://itunes.apple.com/us/app/vector.im/id1083446067"
+  ios="https://itunes.apple.com/app/vector.im/id1083446067"
   web="https://riot.im/app/"
 %}
 
@@ -43,8 +44,8 @@ <h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link ancho
   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">independently audited (PDF)</a>.'
-  labels="warning:<a href=//github.com/keybase/client/issues/6374>Warning</a>:The server side of Keybase runs on proprietary code and is centralized."
+  description='Keybase provides a hosted team chat with E2EE. Its protocol 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>. Keybase can help you prove you own social media accounts though the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
+  labels="warning:<a href=github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
   website="https://keybase.io/"
   forum="https://forum.privacytools.io/t/discussion-keybase/1224"
   tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
@@ -53,8 +54,8 @@ <h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link ancho
   mac="https://keybase.io/docs/the_app/install_macos"
   linux="https://keybase.io/docs/the_app/install_linux"
   freebsd="https://www.freshports.org/security/keybase/"
-  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage&hl=en_US"
-  ios="https://keybase.io/_/download/keybase-for-ios"
-  firefox="https://addons.mozilla.org/en-US/firefox/addon/keybase-for-firefox/"
+  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage"
+  ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770"
+  firefox="https://addons.mozilla.org/firefox/addon/keybase-for-firefox/"
   chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
 %}