diff --git a/_config.yml b/_config.yml
index 1fd94f1ef..97e73ebed 100644
--- a/_config.yml
+++ b/_config.yml
@@ -26,7 +26,9 @@ sass:
   style:            compressed
 
 # Google Analytics
-#google-analytics: UA-XXXXX-Y
+google-analytics:
+  tracking-id: UA-XXXXX-Y
+  track-social-links: false
 
 # Social Links
 #email:             email
@@ -53,6 +55,7 @@ stackoverflow:     123456/username   from a "http://stackoverflow.com/users/1234
 #xmpp:              username@server.com
 #hackernews:        username
 behance:           username
+#strava:             userid         # no icon for now, check font awesome for updates # number form a my profile link https://www.strava.com/athletes/123456
 
 # Gems
 gems:
diff --git a/_includes/scripts.html b/_includes/scripts.html
index 6430a8456..8ca8b8c4b 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -1,13 +1,13 @@
 <!-- JS -->
 <script src="{{ site.url }}/assets/js/main.min.js"></script>
-{% if site.google-analytics %}
+{% if site.google-analytics.tracking-id %}
 <!-- Asynchronous Google Analytics snippet -->
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', '{{ site.google-analytics }}', 'auto');  
+  ga('create', '{{ site.google-analytics.tracking-id }}', 'auto');  
   ga('require', 'linkid', 'linkid.js');
   ga('send', 'pageview');
 </script>
diff --git a/_includes/social-links.html b/_includes/social-links.html
index 090ce9002..ed833d50e 100644
--- a/_includes/social-links.html
+++ b/_includes/social-links.html
@@ -1,26 +1,28 @@
 <ul>
-  {% if site.email %}<li><a class="social-btn" href="mailto:{{ site.email }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-envelope"></i></a></li>{% endif %}
-  {% if site.behance %}<li><a class="social-btn" href="https://www.behance.net/{{ site.behance }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-behance"></i></a></li>{% endif %}
-  {% if site.twitter %}<li><a class="social-btn" href="http://twitter.com/{{ site.twitter }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-twitter"></i></a></li>{% endif %}
-  {% if site.facebook %}<li><a class="social-btn" href="http://facebook.com/{{ site.facebook }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-facebook"></i></a></li>{% endif %}
-  {% if site.google.plus %}<li><a class="social-btn" href="http://plus.google.com/+{{ site.google.plus }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-google-plus"></i></a></li>{% endif %}
-  {% if site.linkedin %}<li><a class="social-btn" href="http://linkedin.com/in/{{ site.linkedin }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-linkedin"></i></a></li>{% endif %}
-  {% if site.xing %}<li><a class="social-btn" href="http://www.xing.com/profile/{{ site.xing }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-xing"></i></a></li>{% endif %}
-  {% if site.instagram %}<li><a class="social-btn" href="http://instagram.com/{{ site.instagram }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-instagram"></i></a></li>{% endif %}
-  {% if site.tumblr %}<li><a class="social-btn" href="http://{{ site.tumblr }}.tumblr.com" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-tumblr"></i></a></li>{% endif %}
-  {% if site.github %}<li><a class="social-btn" href="http://github.com/{{ site.github }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-github"></i></a></li>{% endif %}
-  {% if site.stackoverflow %}<li><a class="social-btn" href="http://stackoverflow.com/users/{{ site.stackoverflow }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-stack-overflow"></i></a></li>{% endif %}
-  {% if site.lastfm %}<li><a class="social-btn" href="http://lastfm.com/user/{{ site.lastfm }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-music"></i></a></li>{% endif %}
-  {% if site.dribbble %}<li><a class="social-btn" href="http://dribbble.com/{{ site.dribbble }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-dribbble"></i></a></li>{% endif %}
-  {% if site.pinterest %}<li><a class="social-btn" href="http://www.pinterest.com/{{ site.pinterest }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-pinterest"></i></a></li>{% endif %}
-  {% if site.foursquare %}<li><a class="social-btn" href="http://foursquare.com/{{ site.foursquare }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-foursquare"></i></a></li>{% endif %}
-  {% if site.steam %}<li><a class="social-btn" href="http://steamcommunity.com/id/{{ site.steam }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-steam"></i></a></li>{% endif %}
-  {% if site.youtube %}<li><a class="social-btn" href="https://youtube.com/user/{{ site.youtube }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-youtube"></i></a></li>{% endif %}
-  {% if site.soundcloud %}<li><a class="social-btn" href="http://soundcloud.com/{{ site.soundcloud }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-soundcloud"></i></a></li>{% endif %}
-  {% if site.weibo %}<li><a class="social-btn" href="http://www.weibo.com/{{ site.weibo }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-weibo"></i></a></li>{% endif %}
-  {% if site.flickr %}<li><a class="social-btn" href="http://www.flickr.com/{{ site.flickr }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-flickr"></i></a></li>{% endif %}
-  {% if site.codepen %}<li><a class="social-btn" href="http://codepen.io/{{ site.codepen }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-codepen"></i></a></li>{% endif %}
-  {% if site.keybase %}<li><a class="social-btn" href="https://keybase.io/{{ site.keybase }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-key"></i></a></li>{% endif %}
-  {% if site.xmpp %}<li><a class="social-btn" href="xmpp:{{ site.xmpp }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-lightbulb-o"></i></a></li>{% endif %}
-  {% if site.hackernews %}<li><a class="social-btn" href="https://news.ycombinator.com/user?id={{ site.hackernews }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-hacker-news"></i></a></li>{% endif %}
+  {% if site.email %}<li><a class="social-btn" href="mailto:{{ site.email }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'email');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-envelope"></i></a></li>{% endif %}
+  {% if site.behance %}<li><a class="social-btn" href="https://www.behance.net/{{ site.behance }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'behance');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-behance"></i></a></li>{% endif %}
+  {% if site.twitter %}<li><a class="social-btn" href="https://twitter.com/{{ site.twitter }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'twitter');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-twitter"></i></a></li>{% endif %}
+  {% if site.facebook %}<li><a class="social-btn" href="https://facebook.com/{{ site.facebook }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'facebook');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-facebook"></i></a></li>{% endif %}
+  {% if site.google.plus %}<li><a class="social-btn" href="https://plus.google.com/+{{ site.google.plus }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'google_plus');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-google-plus"></i></a></li>{% endif %}
+  {% if site.linkedin %}<li><a class="social-btn" href="https://linkedin.com/in/{{ site.linkedin }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'linkedin');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-linkedin"></i></a></li>{% endif %}
+  {% if site.xing %}<li><a class="social-btn" href="http://www.xing.com/profile/{{ site.xing }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'xing');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-xing"></i></a></li>{% endif %}
+  {% if site.instagram %}<li><a class="social-btn" href="https://instagram.com/{{ site.instagram }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'instagram');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-instagram"></i></a></li>{% endif %}
+  {% if site.tumblr %}<li><a class="social-btn" href="http://{{ site.tumblr }}.tumblr.com" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'tumblr');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-tumblr"></i></a></li>{% endif %}
+  {% if site.github %}<li><a class="social-btn" href="https://github.com/{{ site.github }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'github');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-github"></i></a></li>{% endif %}
+  {% if site.stackoverflow %}<li><a class="social-btn" href="https://stackoverflow.com/users/{{ site.stackoverflow }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'stackoverflow');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-stack-overflow"></i></a></li>{% endif %}
+  {% if site.lastfm %}<li><a class="social-btn" href="http://lastfm.com/user/{{ site.lastfm }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'lastfm');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-music"></i></a></li>{% endif %}
+  {% if site.dribbble %}<li><a class="social-btn" href="http://dribbble.com/{{ site.dribbble }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'dribbble');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-dribbble"></i></a></li>{% endif %}
+  {% if site.pinterest %}<li><a class="social-btn" href="http://www.pinterest.com/{{ site.pinterest }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'pinterest');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-pinterest"></i></a></li>{% endif %}
+  {% if site.foursquare %}<li><a class="social-btn" href="https://foursquare.com/{{ site.foursquare }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'foursquare');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-foursquare"></i></a></li>{% endif %}
+  {% if site.steam %}<li><a class="social-btn" href="http://steamcommunity.com/id/{{ site.steam }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'steam');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-steam"></i></a></li>{% endif %}
+  {% if site.youtube %}<li><a class="social-btn" href="https://youtube.com/user/{{ site.youtube }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'youtube');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-youtube"></i></a></li>{% endif %}
+  {% if site.soundcloud %}<li><a class="social-btn" href="http://soundcloud.com/{{ site.soundcloud }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'soundcloud');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-soundcloud"></i></a></li>{% endif %}
+  {% if site.weibo %}<li><a class="social-btn" href="http://www.weibo.com/{{ site.weibo }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'weibo');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-weibo"></i></a></li>{% endif %}
+  {% if site.flickr %}<li><a class="social-btn" href="http://www.flickr.com/{{ site.flickr }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'flickr');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-flickr"></i></a></li>{% endif %}
+  {% if site.codepen %}<li><a class="social-btn" href="http://codepen.io/{{ site.codepen }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'codepen');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-codepen"></i></a></li>{% endif %}
+  {% if site.keybase %}<li><a class="social-btn" href="https://keybase.io/{{ site.keybase }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'keybase');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-key"></i></a></li>{% endif %}
+  {% if site.xmpp %}<li><a class="social-btn" href="xmpp:{{ site.xmpp }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'xmpp');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-lightbulb-o"></i></a></li>{% endif %}
+  {% if site.hackernews %}<li><a class="social-btn" href="https://news.ycombinator.com/user?id={{ site.hackernews }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'hackernews');"{% endif %} target="_blank" rel="noopener noreferrer" style="padding-bottom: 0.2em"><i class="fa fa-fw fa-hacker-news"></i></a></li>{% endif %}
+  {% if site.strava %}<li><a class="social-btn" href="https://strava.com/athletes/{{ site.strava }}/badge" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'strava');"{% endif %} target="_blank" rel="noopener noreferrer"><img src="{{ site.url }}/assets/fonts/custom/icon-strava.svg" class="fa-fw" style="height: 1em; padding-top: 0.1em"></a></li>{% endif %}
+  {% if site.goodreads %}<li><a class="social-btn" href="https://www.goodreads.com/user/show/{{ site.goodreads }}" {% if site.google-analytics.track-social-links %}onClick="ga('send', 'event', 'link-click', 'social', 'goodreads');"{% endif %} target="_blank" rel="noopener noreferrer"><i class="fa fa-fw fa-book"></i></a></li>{% endif %}
 </ul>
\ No newline at end of file