diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index a784cfbb..1f8261ab 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -4,39 +4,48 @@
If you are currently using an Instant Messenger like WhatsApp, Viber, LINE, Telegram or Threema, you should pick an alternative here.
-
- {% include card.html color="success"
- title="Mobile: Signal"
- image="/assets/img/tools/Signal.png"
- url="https://signal.org"
- footer="OS: Android, iOS, macOS, Windows, Linux"
- 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, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
- and it doesn't cost anything to use."
- %}
+
+{% include cardv2.html
+title="Mobile: 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."
+website="https://signal.org"
+forum="https://forum.privacytools.io/t/discussion-signal/664"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+%}
- {% include card.html color="primary"
- title="Riot.im"
- image="/assets/img/tools/riot.png"
- url="https://riot.im/"
- footer="OS: Android, iOS, macOS, Windows, Linux, Web"
- labels="warning:beta:The software 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.'"
- description='Riot.im is a decentralized free-software chatting application based on the
Matrix protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too.'
- %}
+{% include cardv2.html
+title="Riot.im"
+image="/assets/img/tools/riot.png"
+description="Riot.im is a decentralized free-software chatting application based on the
Matrix protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too.
beta "
+website="https://riot.im/"
+forum="https://forum.privacytools.io/t/discussion-riot-im/665"
+github="https://github.com/signalapp"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+web=""
+%}
- {% include card.html color="warning"
- title="Desktop: Ricochet"
- image="/assets/img/tools/Ricochet.png"
- url="https://ricochet.im/"
- footer="OS: Windows, macOS, Linux."
- description='Ricochet uses the
Tor network 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. Instead of a username, you get a unique address that looks like
ricochet:rs7ce36jsj24ogfw. Other Ricochet users can use this address to send a contact request - asking to be
- added to your contacts list.
-
Danger Always keep Tor up to date. See below: Updating the Tor binary included with Ricochet'
- %}
-
-
+{% include cardv2.html
+title="Desktop: Ricochet"
+image="/assets/img/tools/Ricochet.png"
+description='Ricochet uses the