diff --git a/_includes/sections/email-alternatives.html b/_includes/sections/email-alternatives.html
index 662b9e30..94c48ff8 100644
--- a/_includes/sections/email-alternatives.html
+++ b/_includes/sections/email-alternatives.html
@@ -1,24 +1,30 @@
 <h1 id="messaging" class="anchor"><a href="#messaging"><i class="fas fa-link anchor-icon"></i></a> Email Alternatives</h1>
 
-<div class="row mb-2">
+{% include cardv2.html
+title="Bitmessage"
+image="/assets/img/tools/Bitmessage.png"
+description="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless,
+meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data."
+website="https://bitmessage.org/"
+forum="https://forum.privacytools.io/t/discussion-bitmessage/661"
+github="https://github.com/Bitmessage/PyBitmessage"
+windows=""
+mac=""
+linux=""
+%}
 
-  {% include card.html color="success"
-  title="Bitmessage"
-  image="/assets/img/tools/Bitmessage.png"
-  url="https://bitmessage.org/"
-  footer="OS: Windows, macOS, Linux."
-  description="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless,
-  meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data."
-  %}
-  {% include card.html color="primary"
-  title="RetroShare"
-  image="/assets/img/tools/RetroShare.png"
-  url="https://retroshare.cc/"
-  footer="OS: Windows, macOS, Linux."
-  description="Retroshare creates encrypted connections to your friends. Nobody can spy on you. Retroshare is completely decentralized. This means there are no central servers. It is entirely Open-Source and free. There are no costs, no ads and no Terms of Service."
-  %}
+{% include cardv2.html
+title="RetroShare"
+image="/assets/img/tools/RetroShare.png"
+description="Retroshare creates encrypted connections to your friends. Nobody can spy on you. Retroshare is completely decentralized. This means there are no central servers. It is entirely Open-Source and free. There are no costs, no ads and no Terms of Service."
+website="https://retroshare.cc/"
+forum="https://forum.privacytools.io/t/discussion-retroshare/662"
+github="https://github.com/RetroShare/RetroShare"
+windows=""
+mac=""
+linux=""
+%}
 
-</div>
 
 <h3>Worth Mentioning</h3>
 
diff --git a/_includes/sections/email-clients.html b/_includes/sections/email-clients.html
index 70f48c4d..3310e8b6 100644
--- a/_includes/sections/email-clients.html
+++ b/_includes/sections/email-clients.html
@@ -1,22 +1,31 @@
 <h1 id="clients" class="anchor"><a href="#clients"><i class="fas fa-link anchor-icon"></i></a> Email Clients</h1>
-<div class="row mb-2">
 
-  {% include card.html color="success"
-  title="Thunderbird"
-  image="/assets/img/tools/Thunderbird.png"
-  url="https://mozilla.org/thunderbird"
-  website="mozilla.org"
-  footer="OS: Windows, macOS, Linux, BSD."
-  description="Mozilla Thunderbird is a free, open source, cross-platform email, news, and chat client developed by the Mozilla Foundation. Thunderbird is an email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client."
-  %}    {% include card.html color="primary"
-  title="Claws Mail"
-  image="/assets/img/tools/Claws-Mail.png"
-  url="https://www.claws-mail.org/"
-  footer="OS: Windows, macOS, Linux, BSD, Solaris, Unix."
-  description="Claws Mail is a free and open source, GTK+-based email and news client. It offers easy configuration and an abundance of features. It is included with Gpg4win, an encryption suite for Windows."
-  %}
+{% include cardv2.html
+title="Thunderbird"
+image="/assets/img/tools/Thunderbird.png"
+description="Mozilla Thunderbird is a free, open source, cross-platform email, news, and chat client developed by the Mozilla Foundation. Thunderbird is an email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client."
+website="https://mozilla.org/thunderbird"
+forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
+github="https://github.com/mozilla"
+windows=""
+mac=""
+linux=""
+bsd=""
+%}
+
+{% include cardv2.html
+title="Claws Mail"
+image="/assets/img/tools/Claws-Mail.png"
+description="Claws Mail is a free and open source, GTK+-based email and news client. It offers easy configuration and an abundance of features. It is included with Gpg4win, an encryption suite for Windows."
+website="https://www.claws-mail.org/"
+forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
+git="https://git.claws-mail.org/"
+windows=""
+mac=""
+linux=""
+bsd=""
+%}
 
-</div>
 
 <h3>Privacy Email Tools</h3>