diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
index 88e3f7e2..af181ac0 100644
--- a/app/config/sculpin_site.yml
+++ b/app/config/sculpin_site.yml
@@ -3,20 +3,10 @@ subtitle: Drupal & Linux Specialist
 description: Oliver Davies, Drupal Developer
 url: http://localhost:8000
 
-twitter:
-  title: Twitter
-  url: http://twitter.com/opdavies
-  handle: opdavies
-linkedin:
-  title: LinkedIn
-  url: http://uk.linkedin.com/in/opdavies
-drupalorg:
-  title: Drupal.org
-  url: https://www.drupal.org/user/381388
-  nice_url: https://www.drupal.org/u/opdavies
-github:
-  title: GitHub
-  url: http://github.com/opdavies
-irc:
-  title: IRC
-  handle: opdavies
\ No newline at end of file
+twitter: http://twitter.com/opdavies
+twitter_name: opdavies
+linkedin: http://uk.linkedin.com/in/opdavies
+drupalorg: https://www.drupal.org/user/381388
+drupalorg_nice: https://www.drupal.org/u/opdavies
+github: http://github.com/opdavies
+irc: opdavies
\ No newline at end of file
diff --git a/source/contact.md b/source/contact.md
index 4a326171..0d30e66e 100644
--- a/source/contact.md
+++ b/source/contact.md
@@ -17,10 +17,10 @@ If you want to report an issue or want to suggest any improvements to the site,
 
 Here are the best places to contact me online:
 
-* {{ site.irc.title }} ({{ site.irc.handle }}) - I'm usually in #drupal-uk on Freenode, among others.
-* <a href="{{ site.twitter.url }}">{{ site.twitter.title }}</a> (@{{ site.twitter.handle }})
-* <a href="{{ site.drupalorg.nice_url }}">{{ site.drupalorg.title }}</a>
-* <a href="{{ site.linkedin.url }}">{{ site.linkedin.title }}</a>
+* IRC ({{ site.irc }}) - I'm usually in #drupal-uk on Freenode, among others.
+* <a href="{{ site.twitter }}">Twitter</a> (@{{ site.twitter_name }})
+* <a href="{{ site.drupalorg_nice }}">Drupal.org</a>
+* <a href="{{ site.linkedin }}">LinkedIn</a>
 
 ## Meetups
 
diff --git a/source/index.md b/source/index.md
index b512e72f..3c8a9bbe 100644
--- a/source/index.md
+++ b/source/index.md
@@ -23,5 +23,5 @@ Oliver currently works for the [Drupal Association](https://assoc.drupal.org) an
 
 In his spare time, Oliver contributes to Drupal core and maintains several contrib modules on Drupal.org, is the Git Documentation Maintainer for the Drupal project, and is a provisional member of the [Drupal Security team](https://www.drupal.org/security-team). He attends, organises and [talks](/talks) at user groups, and volunteers and mentors at conferences. He also is a 2nd Degree Black Belt in Tae Kwon-Do and a Brazilian Jiu-Jitsu practitioner.
 
-Oliver has active social media profiles on <a href="{{ site.twitter.url }}">{{ site.twitter.title }}</a> and <a href="{{ site.linkedin.url }}">{{ site.linkedin.title }}</a>, and you can view his code on
-<a href="{{ site.drupalorg.url }}/track/code">{{ site.drupalorg.title }}</a> and <a href="{{ site.github.url }}?tab=activity">{{ site.github.title }}</a>.
\ No newline at end of file
+Oliver has active social media profiles on <a href="{{ site.twitter }}">Twitter</a> and <a href="{{ site.linkedin }}">LinkedIn</a>, and you can view his code on
+<a href="{{ site.drupalorg }}/track/code">Drupal.org</a> and <a href="{{ site.github }}?tab=activity">GitHub</a>.
\ No newline at end of file