diff --git a/_config.yml b/_config.yml
index 7990276..b53922f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -14,28 +14,29 @@ email:
 
 social:
     gitter:
-        title: Gitter
-        url:   https://gitter.im/bigchaindb/bigchaindb
+        title:  Gitter
+        url:    https://gitter.im/bigchaindb/bigchaindb
     github:
-        title: GitHub
-        url:   https://github.com/bigchaindb
-        org:   bigchaindb
-        repo:  bigchaindb
+        title:  GitHub
+        url:    https://github.com/bigchaindb
+        org:    bigchaindb
+        repo:   bigchaindb
     twitter:
-        title: Twitter
-        url:   https://twitter.com/bigchaindb
+        title:  Twitter
+        handle: bigchaindb
+        url:    https://twitter.com/bigchaindb
     medium:
-        title: Blog
-        url:   https://blog.bigchaindb.com
+        title:  Blog
+        url:    https://blog.bigchaindb.com
     meetup:
-        title: Meetup
-        url:   https://www.meetup.com/BigchainDB-IPDB-Meetup
+        title:  Meetup
+        url:    https://www.meetup.com/BigchainDB-IPDB-Meetup
     linkedin:
-        title: LinkedIn
-        url:   https://www.linkedin.com/company/bigchaindb
+        title:  LinkedIn
+        url:    https://www.linkedin.com/company/bigchaindb
     youtube:
-        title: YouTube
-        url:   https://www.youtube.com/channel/UCh0Y3p3kJ9oyz9CRgZaO05w
+        title:  YouTube
+        url:    https://www.youtube.com/channel/UCh0Y3p3kJ9oyz9CRgZaO05w
 
 address:
     company:            BigchainDB GmbH
diff --git a/_src/_includes/hero.html b/_src/_includes/hero.html
index e57c0d9..3778504 100644
--- a/_src/_includes/hero.html
+++ b/_src/_includes/hero.html
@@ -20,14 +20,14 @@
                 </svg> Star <span class="stars" id="stars"></span>
             </a>
 
-            <a class="social-link btn btn-text btn-sm js-social-link" href="https://twitter.com/{{ site.twitter }}" title="Follow on Twitter">
+            <a class="social-link btn btn-text btn-sm js-social-link" href="{{ site.social.twitter.url }}" title="Follow on Twitter">
                 <svg class="icon icon--social icon--twitter" aria-labelledby="title">
                     <title>Twitter</title>
                     <use xlink:href="/assets/img/sprite.svg#twitter"></use>
                 </svg> Follow
             </a>
 
-            <a class="social-link btn btn-text btn-sm js-social-link js-social-link--meetup" href="https://www.meetup.com/BigchainDB-IPDB-Meetup/">
+            <a class="social-link btn btn-text btn-sm js-social-link js-social-link--meetup" href="{{ site.social.meetup.url }}">
                 <svg class="icon icon--social icon--meetup">
                     <use xlink:href="/assets/img/sprite.svg#meetup"></use>
                 </svg> <span class="meetup-title">BigchainDB &amp; IPDB Meetup</span>
diff --git a/_src/_includes/twittercards.html b/_src/_includes/twittercards.html
index e9e62db..fce635b 100644
--- a/_src/_includes/twittercards.html
+++ b/_src/_includes/twittercards.html
@@ -1,6 +1,6 @@
 <meta name="twitter:card" content="summary_large_image">
-<meta name="twitter:site" content="@{{ site.twitter }}">
-<meta name="twitter:creator" content="@{{ site.twitter }}">
+<meta name="twitter:site" content="@{{ site.social.twitter.handle }}">
+<meta name="twitter:creator" content="@{{ site.social.twitter.handle }}">
 
 {% if page.layout == 'usecase' %}
     <meta name="twitter:title" content="{{ page.company }} &bull; &bull; {{ page.industry }} &bull; &bull; {{ site.name }}">
diff --git a/_src/contact.html b/_src/contact.html
index 1a93311..fc7125c 100644
--- a/_src/contact.html
+++ b/_src/contact.html
@@ -28,7 +28,7 @@ js: page-contact.min.js
 
                     <div class="social">
                         <p>
-                            <a href="https://github.com/{{ site.github.org }}">
+                            <a href="https://github.com/{{ site.social.github.org }}">
                                 <svg class="icon icon--social icon--github" aria-labelledby="title">
                                     <title>GitHub</title>
                                     <use xlink:href="/assets/img/sprite.svg#github"></use>
@@ -37,7 +37,7 @@ js: page-contact.min.js
                             </a>
                         </p>
                         <p>
-                            <a href="https://twitter.com/{{ site.twitter }}">
+                            <a href="{{ site.social.twitter.url }}">
                                 <svg class="icon icon--social icon--twitter" aria-labelledby="title">
                                     <title>Twitter</title>
                                     <use xlink:href="/assets/img/sprite.svg#twitter"></use>
@@ -46,7 +46,7 @@ js: page-contact.min.js
                             </a>
                         </p>
                         <p>
-                            <a href="https://medium.com/{{ site.medium }}">
+                            <a href="{{ site.social.medium.url }}">
                                 <svg class="icon icon--social icon--blog" aria-labelledby="title">
                                     <title>Blog</title>
                                     <use xlink:href="/assets/img/sprite.svg#medium"></use>