diff --git a/404.html b/404.html
index 72bffe6..a8c4e2d 100644
--- a/404.html
+++ b/404.html
@@ -98,10 +98,6 @@ <h4>Engineering at IT3 Consultants</h4>
 						<h4>Contact Us</h4>
 						<a href="mailto:info@it3.be">info@it3.be</a>
 					</div>
-					<div class="span3">
-						<h4>Follow Us</h4>
-						<a href="http://twitter.com/gratiendh">@gratiendh</a> <br>
-					</div>
 				</div>
 			</div>
 			<br>
diff --git a/_config.yml b/_config.yml
index b7fddc0..f5d7d04 100644
--- a/_config.yml
+++ b/_config.yml
@@ -12,7 +12,7 @@ disqus_short_name: it3consultants
 
 analytics_code: UA-3406473-1
 
-share_twitter: true
+share_twitter: false
 share_google: true
 share_facebook: false
 share_reddit: false
@@ -27,7 +27,7 @@ authors:
     position: Unix/Linux Consultant
     start_date: 1996-04-01
     github: gdha
-    twitter: gratiendh
+    twitter: removed
     linkedin: gratiendhaese
     gravatar: 79ba5ce1fe4f33cf89996260d80e77ec
     about: Besides IT3 Consultants, he is the author of several Open Source projects (see <a href="https://github.com/gdha" title="Github page of Gratien">GitHub page of Gratien Dhaese)</a>.
diff --git a/_layouts/default.html b/_layouts/default.html
index ff9db23..0dd42bb 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -128,8 +128,9 @@ <h4>Contact Us</h4>
 						<a onclick="_gaq.push(['_trackEvent', 'Careers', 'email'])" href="mailto:{{ site.career_email }}">{{ site.career_email }}</a>
 					</div>
 					<div class="span3">
-						<a href="https://twitter.com/gratiendh" class="twitter-follow-button" data-show-count="false">Follow @gratiendh</a><br>
-					</div>
+						<a onclick="_gaq.push(['_trackEvent', 'GitHub', 'site'])" href="https://github.com/gdha"><h4>GitHub Pages</h4></a>
+						<a href="https://github.com/gdha"><img src="{{ site.url }}/images/github-light.png" width="35" height="35" frameborder="0" alt="GitHub page of gdha"></a>
+                                        </div>
 				</div>
 			</div>
 			<br>
@@ -159,8 +160,8 @@ <h4>Contact Us</h4>
                 <!--
 		<script type="text/javascript" src="http://analytics-api-samples.googlecode.com/svn/trunk/src/tracking/javascript/v5/social/ga_social_tracking.js"></script>
                 -->
+
 		{% if site.share_twitter == true %}
-		<!-- Twitter -->
 		<script type="text/javascript">
 			window.twttr = function(d,s,id){
 				var js,fjs=d.getElementsByTagName(s)[0];
@@ -180,6 +181,7 @@ <h4>Contact Us</h4>
 			});
 		</script>
 		{% endif %}
+
 		{% if site.share_google == true %}
 		<!-- Google Plus -->
 		<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
diff --git a/_layouts/post.html b/_layouts/post.html
index 2d0dcba..e1385fe 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -33,7 +33,7 @@ <h1 itemprop="name headline">{{ page.title }}</h1>
 	</div>
 
 	<section class="post_share">
-		{% if site.share_twitter == true %}<a href="https://twitter.com/share" class="twitter-share-button" data-via="gratiendh">Tweet</a>{% endif %}
+		{% if site.share_twitter == true %}<a href="https://twitter.com/share" class="twitter-share-button" data-via="removed">Tweet</a>{% endif %}
 		{% if site.share_google == true %}<div class="g-plusone" data-size="medium"></div>{% endif %}
 		{% if site.share_facebook == true %}<div class="fb-like" data-send="false" data-layout="button_count" data-width="150" data-show-faces="false"></div>{% endif %}
 		{% if site.share_reddit == true %}<script type="text/javascript" src="http://www.reddit.com/static/button/button1.js"> </script>{% endif %}
diff --git a/images/github-light.png b/images/github-light.png
new file mode 100644
index 0000000..2c951a0
Binary files /dev/null and b/images/github-light.png differ