diff --git a/.gitignore b/.gitignore
index 49b02122..af408d27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ _site/
 Gemfile
 Gemfile.lock
 .sass-cache/
+.DS_Store
diff --git a/README.md b/README.md
index 4e6d6d1f..2602deef 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,10 @@ It's important for a website like privacytools.io to be up-to-date. Keep an eye
 
 You can submit your suggestions here on GitHub [(Issues)](https://github.com/privacytoolsIO/privacytools.io/issues) and also in our [subreddit](https://www.reddit.com/r/privacytoolsIO/). Thank you.
 
+## Building
+1. Install Ruby
+2. `bundle install`
+3. `bundle exec jekyll serve` # Live refresh.
 
 # Contributing Guidelines
 Please read this before contributing.
diff --git a/assets/img/tools/GNU-social.png b/assets/img/tools/GNU-social.png
deleted file mode 100644
index 80532fba..00000000
Binary files a/assets/img/tools/GNU-social.png and /dev/null differ
diff --git a/assets/img/tools/Mastodon.png b/assets/img/tools/Mastodon.png
new file mode 100644
index 00000000..ac4694ec
Binary files /dev/null and b/assets/img/tools/Mastodon.png differ
diff --git a/index.html b/index.html
index 2ea702db..50918e0c 100644
--- a/index.html
+++ b/index.html
@@ -1719,6 +1719,14 @@ layout: default
 <div class="row mb-2">
 
     {% include card.html color="success"
+    title="Mastodon"
+    image="assets/img/tools/Mastodon.png"
+    url="https://joinmastodon.org"
+    website="mastodon.social"
+    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.'
+    %}
+
+    {% include card.html color="primary"
     title="diaspora*"
     image="assets/img/tools/diaspora.png"
     url="https://diasporafoundation.org/"
@@ -1726,7 +1734,7 @@ layout: default
                 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 card.html color="primary"
+    {% include card.html color="warning"
     title="Friendica"
     image="assets/img/tools/Friendica.png"
     url="http://friendi.ca/"
@@ -1734,20 +1742,11 @@ layout: default
                 Friendica users can integrate contacts from Facebook, Twitter, Diaspora, GNU social, App.net, Pump.io and other services in their social streams."
     %}
 
-    {% include card.html color="warning"
-    title="GNU social"
-    image="assets/img/tools/GNU-social.png"
-    url="https://gnu.io/social/try/"
-    website="gnu.io"
-    description='While offering functionality similar to Twitter, GNU social seeks to provide the potential for open, inter-service and distributed communications between
-                microblogging communities. Enterprises and individuals can install and control their own services and data. Notable public deployments are <a href="https://quitter.se/">quitter.se</a> and <a href="https://gnusocial.no">gnusocial.no</a>.'
-    %}
-
 </div>
 
         <h3>Worth Mentioning</h3>
 <ul>
-    <li><a href="https://mastodon.social/about">Mastodon</a> - An open sourced, free and decentralized social network built on top of GNU Social.</li>
+    <li><a href="https://gnu.io/social/try/">GNU Social</a> - An open sourced, free and decentralized social network compatible with Mastodon and Friendica.</li>
 </ul>
 
 <h3>Related Information</h3>