diff --git a/.gitignore b/.gitignore
index 45c1505..fcb2476 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 _site
 .sass-cache
 .jekyll-metadata
+.jekyll-cache
diff --git a/_config.yml b/_config.yml
index 176dcf1..2607f8b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,24 +1,78 @@
-# Site settings
 title: Jim Myhrberg (jimeh)
-person_name: Jim Myhrberg
-person_nickname: jimeh
-email: pbagnpg\100wvzru\056zr
-mailto: "&#109;&#97;&#105;&#108;&#116;&#111;&#58;%63%6s%6r%74%61%63%74@%6n%69%6q%65%68.%6q%65"
 description: Crazy-Ass Software Engineering Mercenary
-baseurl: "" # the subpath of your site, e.g. /blog/
+author:
+  name: Jim Myhrberg
+  nickname: jimeh
+  twitter: jimeh
 hostname: jimeh.me # used to determine if google analytics should be triggered
-url: http://jimeh.me # the base hostname & protocol for your site
+url: https://jimeh.me # the base hostname & protocol for your site
+baseurl: "" # the subpath of your site, e.g. /blog/
 permalink: /:title/
 
-blog_url: https://jimeh.io/
-cv_url: http://assets.jimeh.me/jim-myhrberg-cv.pdf
-vcard_url: http://assets.jimeh.me/jim-myhrberg.vcf
-twitter_username: jimeh
-github_username: jimeh
-linkedin_username: jimeh
-facebook_username: jimeh
-flickr_username: jimeh
-lastfm_username: jimeh
+# stuff for jekyll-seo-tag
+social:
+  name: Jim Myhrberg
+  links:
+    - https://twitter.com/jimeh
+    - https://github.com/jimeh
+    - https://jimeh.io/
+    - http://www.linkedin.com/in/jimeh
+    - http://www.last.fm/user/jimeh
+    - https://flickr.com/photos/jimeh/
+    - https://keybase.io/jimeh
 
-# Build settings
-markdown: kramdown
+twitter:
+  username: jimeh
+
+# main page content
+email:
+  title: pbagnpg\100wvzru\056zr
+  href: "&#109;&#97;&#105;&#108;&#116;&#111;&#58;%63%6s%6r%74%61%63%74@%6n%69%6q%65%68.%6q%65"
+
+links:
+  - name: twitter
+    url: https://twitter.com/jimeh
+    class: fa-twitter
+  - name: github
+    url: https://github.com/jimeh
+    class: fa-github
+  - name: blog
+    url: https://jimeh.io/
+    class: fa-medium
+  - name: linkedin
+    url: https://www.linkedin.com/in/jimeh
+    class: fa-linkedin
+  - name: last.fm
+    url: https://www.last.fm/user/jimeh
+    class: fa-lastfm
+  - name: flickr
+    url: https://flickr.com/photos/jimeh
+    class: fa-flickr
+  - name: vcard
+    id: vcard
+    type: download
+    url: http://assets.jimeh.me/jim-myhrberg.vcf
+    class: fa-user
+  - name: cv (pdf)
+    id: resume
+    type: download
+    url: http://assets.jimeh.me/jim-myhrberg-cv.pdf
+    class: fa-file-text-o
+
+# additional stuff
+exclude:
+  - Gemfile
+  - Gemfile.lock
+  - Rakefile
+  - README.md
+
+plugins:
+  - jekyll-sitemap
+  - jekyll-seo-tag
+
+defaults:
+  -
+    scope:
+      path: ""
+    values:
+      layout: "default"
diff --git a/_includes/ga.html b/_includes/ga.html
deleted file mode 100644
index 56a549b..0000000
--- a/_includes/ga.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<script>
-  if (window.location.hostname == "{{ site.hostname }}") {
-    (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', 'UA-354018-11', 'auto');
-    ga('send', 'pageview');
-  } else { _gaq = []; };
-</script>
diff --git a/_includes/head.html b/_includes/head.html
deleted file mode 100644
index 5fa9ad6..0000000
--- a/_includes/head.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
-  <link rel="shortcut icon" href="/favicon.ico" />
-  <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
-  <meta name="description" content="{{ site.title }} - {{ site.description }}">
-  <link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:700,300|Open+Sans:400italic,700italic,400,700' rel='stylesheet' type='text/css'>
-  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-  <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
-</head>
diff --git a/_layouts/default.html b/_layouts/default.html
index 59fb17f..dfc629c 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,8 +1,29 @@
 <!DOCTYPE html>
 <html>
-  {% include head.html %}
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
+
+{% seo title=false %}
+    <link rel="shortcut icon" href="/favicon.ico" />
+    <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
+    <link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:700,300|Open+Sans:400italic,700italic,400,700' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
+  </head>
   <body>
-    {{ content }}
-    {% include ga.html %}
+{{ content }}
+    <script>
+     if (window.location.hostname == "{{ site.hostname }}") {
+       (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', 'UA-354018-11', 'auto');
+       ga('send', 'pageview');
+     } else { _gaq = []; };
+    </script>
   </body>
 </html>
diff --git a/index.html b/index.html
index 4a2d54b..ba9233b 100644
--- a/index.html
+++ b/index.html
@@ -6,22 +6,16 @@ layout: default
     <img class="site-avatar" src="{{ "/img/jimeh-4.0.jpg" | prepend: site.baseurl }}">
     <span class="content">
       <span class="site-title">
-        <span class="site-name">{{ site.person_name }}</span>
-        <span class="site-nickname">({{ site.person_nickname }})</span>
+        <span class="site-name">{{ site.author.name }}</span>
+        <span class="site-nickname">({{ site.author.nickname }})</span>
         <span class="site-description">{{ site.description }}</span>
       </span>
       <div class="site-links">
         <script type="text/javascript">
-          document.write("<n uers=\"{{ site.mailto }}\" bapyvpx=\"_tnd\056chfu(['_genpxRirag', 'yvaxGb', 'rznvy', guvf\056uers]);\"><v pynff=\"sn sn-rairybcr\"><\057v><fcna pynff=\"yvax-grkg\">{{ site.email }}<\057fcna><\057n>".replace(/[a-zA-Z]/g, function(c){return String.fromCharCode((c<="Z"?90:122)>=(c=c.charCodeAt(0)+13)?c:c-26);}));
+          document.write("<n uers=\"{{ site.email.href }}\" bapyvpx=\"_tnd\056chfu(['_genpxRirag', 'yvaxGb', 'rznvy', guvf\056uers]);\"><v pynff=\"sn sn-rairybcr\"><\057v><fcna pynff=\"yvax-grkg\">{{ site.email.title }}<\057fcna><\057n>".replace(/[a-zA-Z]/g, function(c){return String.fromCharCode((c<="Z"?90:122)>=(c=c.charCodeAt(0)+13)?c:c-26);}));
         </script>
-        <a href="https://twitter.com/{{ site.twitter_username }}" onclick="_gaq.push(['_trackEvent', 'linkTo', 'twitter', this.href]);"><i class="fa fa-twitter"></i><span class="link-text">twitter</span></a>
-        <a href="https://github.com/{{ site.github_username }}" onclick="_gaq.push(['_trackEvent', 'linkTo', 'github', this.href]);"><i class="fa fa-github"></i><span class="link-text">github</span></a>
-        <a href="{{ site.blog_url }}" onclick="_gaq.push(['_trackEvent', 'linkTo', 'blog', this.href]);"><i class="fa fa-medium"></i><span class="link-text">blog</span></a>
-        <a href="http://www.linkedin.com/in/{{ site.linkedin_username }}" onclick="_gaq.push(['_trackEvent', 'linkTo', 'linkedin', this.href]);"><i class="fa fa-linkedin"></i><span class="link-text">linkedin</span></a>
-        <a href="http://www.last.fm/user/{{ site.lastfm_username }}" onclick="_gaq.push(['_trackEvent', 'linkTo', 'last.fm', this.href]);"><i class="fa fa-lastfm"></i><span class="link-text">last.fm</span></a>
-        <a href="https://flickr.com/photos/{{ site.flickr_username }}/" onclick="_gaq.push(['_trackEvent', 'linkTo', 'flickr', this.href]);"><i class="fa fa-flickr"></i><span class="link-text">flickr</span></a>
-        <a href="{{ site.vcard_url }}" onclick="_gaq.push(['_trackEvent', 'download', 'resume', this.href]);"><i class="fa fa-user"></i><span class="link-text">vcard</span></a>
-        <a href="{{ site.cv_url }}" onclick="_gaq.push(['_trackEvent', 'download', 'vcard', this.href]);"><i class="fa fa-file-text-o"></i><span class="link-text">cv (pdf)</span></a>
+        {% for item in site.links %}
+        <a href="{{ item.url }}" onclick="_gaq.push(['_trackEvent', '{% if item.type %}{{ item.type}}{% else %}linkTo{% endif %}', '{% if item.id%}{{ item.id }}{% else %}{{ item.name }}{% endif %}', this.href]);"><i class="fa {{ item.class }}"></i><span class="link-text">{{ item.name }}</span></a>{% endfor %}
       </div>
     </span>
   </div>
