diff --git a/_includes/cardv2.html b/_includes/cardv2.html
index 7d25d9b5..f96dc6e8 100644
--- a/_includes/cardv2.html
+++ b/_includes/cardv2.html
@@ -20,7 +20,6 @@
         {% if include.mac %}<i class="fab fa-apple fa-2x fa-fw"></i>{% endif %}
         {% if include.linux %}<i class="fab fa-linux fa-2x fa-fw"></i>{% endif %}
         {% if include.bsd %}<i class="fab fa-freebsd fa-2x fa-fw"></i>{% endif %}
-        {% if include.web %}<i class="fas fa-desktop fa-2x fa-fw"></i>{% endif %}
 
         {% if include.firefox %}<i class="fab fa-firefox fa-2x fa-fw"></i>{% endif %}
         {% if include.chrome %}<i class="fab fa-chrome fa-2x fa-fw"></i>{% endif %}
@@ -32,6 +31,8 @@
         {% if include.ios %}<i class="fab fa-app-store-ios fa-2x fa-fw"></i>{% endif %}
         {% if include.fire %}<i class="fas fa-fire fa-2x fa-fw"></i>{% endif %}
 
+        {% if include.web %}<i class="fas fa-desktop fa-2x fa-fw"></i>{% endif %}
+
         {{include.icon1}}
         {{include.icon2}}
         {{include.icon3}}
diff --git a/_includes/sections/social-networks.html b/_includes/sections/social-networks.html
index 12961be2..7e529ec7 100644
--- a/_includes/sections/social-networks.html
+++ b/_includes/sections/social-networks.html
@@ -4,39 +4,55 @@
   <strong> If you are currently using Social Networks like Facebook or Twitter, you should pick an alternative here. </strong>
 </div>
 
-<div class="row mb-2">
+{% include cardv2.html
+title="Mastodon - Twitter Alternative"
+image="/assets/img/tools/Mastodon.png"
+description='Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like e-mail. It also has the most users, and the most diverse (in terms of interests) users, looks good, and is easy to setup. Feel welcome to join our hosted instance: <a href="https://social.privacytools.io/">social.privacytools.io</a>'
+website="https://joinmastodon.org/"
+forum="https://forum.privacytools.io/t/discussion-mastodon/289"
+github="https://github.com/tootsuite/mastodon"
+android=""
+ios=""
+web=""
+%}
 
-  {% include card.html color="success"
-  title="Mastodon"
-  image="/assets/img/tools/Mastodon.png"
-  url="https://joinmastodon.org/"
-  website="joinmastodon.org"
-  description='Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like e-mail. It also has the most users, and the most diverse (in terms of interests) users, looks good, and is easy to setup. Feel welcome to join our hosted instance: <a href="https://social.privacytools.io/">social.privacytools.io</a>'
-  %}
+{% include cardv2.html
+title="diaspora* - Google+ Alternative"
+image="/assets/img/tools/diaspora.png"
+description="diaspora* is based on three key philosophies: Decentralization, freedom and privacy. It is intended to address privacy concerns related to centralized social networks by allowing users set up their own server (or \"pod\") to host content; pods can then interact to share status updates, photographs, and other social data."
+website="https://diasporafoundation.org/"
+forum="https://forum.privacytools.io/t/discussion-diaspora/290"
+github="https://github.com/diaspora/diaspora"
+android=""
+web=""
+%}
 
-  {% include card.html color="primary"
-  title="diaspora*"
-  image="/assets/img/tools/diaspora.png"
-  url="https://diasporafoundation.org/"
-  description="diaspora* is based on three key philosophies: Decentralization, freedom and privacy. It is intended to address privacy concerns related to centralized social
-  networks by allowing users set up their own server (or \"pod\") to host content; pods can then interact to share status updates, photographs, and other social data."
-  %}
+{% include cardv2.html
+title="Friendica - Facebook Alternative"
+image="/assets/img/tools/Friendica.png"
+description="Friendica has an emphasis on extensive privacy settings and easy server installation. It aims to federate with as many other social networks as possible. Currently, Friendica users can integrate contacts from Facebook, Twitter, Diaspora, GNU social, App.net, Pump.io and other services in their social streams."
+website="https://friendi.ca/"
+forum="https://forum.privacytools.io/t/discussion-friendica/291"
+github="https://github.com/friendica/friendica"
+windows=""
+linux=""
+android=""
+web=""
+%}
 
-  {% include card.html color="warning"
-  title="Friendica"
-  image="/assets/img/tools/Friendica.png"
-  url="https://friendi.ca/"
-  description="Friendica has an emphasis on extensive privacy settings and easy server installation. It aims to federate with as many other social networks as possible. Currently,
-  Friendica users can integrate contacts from Facebook, Twitter, Diaspora, GNU social, App.net, Pump.io and other services in their social streams."
-  %}
-
-</div>
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://gnu.io/social/">GNU Social</a> - An open sourced, free and decentralized social network compatible with Mastodon and Friendica.</li>
-</ul>
+{% include cardv2.html
+title="GNU social - Twitter Alternative"
+image="/assets/img/provider/gnu-social.png"
+description="A social communication software for both public and private communications. It is widely supported and has a large userbase. It is already used by the Free Software Foundation."
+website="https://gnu.io/social/"
+forum="https://forum.privacytools.io/t/discussion-gnu-social/292"
+github="https://github.com/foocorp/gnu-social"
+android=""
+ios=""
+linux=""
+windows=""
+web=""
+%}
 
 <h3>Related Information</h3>
 
diff --git a/assets/img/provider/gnu-social.png b/assets/img/provider/gnu-social.png
new file mode 100644
index 00000000..8f5f3712
Binary files /dev/null and b/assets/img/provider/gnu-social.png differ