diff --git a/.gitignore b/.gitignore
index 867d3792..7f2222ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 *.gem
+.DS_Store
 .bundle
 .sass-cache
+_sass
 _site
 Gemfile.lock
diff --git a/_config.yml b/_config.yml
index 7a13d952..7dbe21b9 100644
--- a/_config.yml
+++ b/_config.yml
@@ -16,7 +16,7 @@
 title: whiteglass theme
 author: Yous
 description: Minimal, responsive Jekyll theme for hackers.
-baseurl: "/whiteglass" # the subpath of your site, e.g. /blog
+baseurl: "/" # the subpath of your site, e.g. /blog
 url: "https://yous.github.io" # the base hostname & protocol for your site, e.g. http://example.com
 lang: en
 timezone: UTC
@@ -72,3 +72,14 @@ jekyll-archives:
   permalinks:
     category: /categories/:name/
     tag: /tags/:name/
+
+footer_links:
+  - title: Twitter
+    url: https://twitter.com/username
+    icon: fab fa-twitter-square
+  - title: YouTube
+    url: https://www.youtube.com/channelURL
+    icon: fab fa-youtube-square
+  - title: Feed
+    url: feed.xml
+    icon: fas fa-rss-square
diff --git a/_includes/fonts.html b/_includes/fonts.html
index ab6c66be..70ad359a 100644
--- a/_includes/fonts.html
+++ b/_includes/fonts.html
@@ -1,2 +1,3 @@
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link href="https://fonts.googleapis.com/css?family=Bitter:400,400i,700" rel="stylesheet">
+<script src="https://use.fontawesome.com/releases/v5.0.12/js/all.js"></script>
\ No newline at end of file
diff --git a/_includes/footer_content.html b/_includes/footer_content.html
index e4e93bde..2c2d41a5 100644
--- a/_includes/footer_content.html
+++ b/_includes/footer_content.html
@@ -2,4 +2,18 @@
 {% if site.feed and site.feed.path %}
   {% assign feed_path = site.feed.path %}
 {% endif %}
-&copy; {{ site.author }} - Powered by <a href="https://jekyllrb.com">Jekyll</a> &amp; <a href="https://github.com/yous/whiteglass">whiteglass</a> - Subscribe via <a href="{{ feed_path | absolute_url }}">RSS</a>
+
+{% if site.footer_links %}
+  <div class="social-icons">
+    {% for footer_link in site.footer_links %}
+      {% if footer_link.url contains "://" %}
+        {% assign url = footer_link.url %}
+      {% else %}
+        {% assign url = footer_link.url | relative_url %}
+      {% endif %}
+      <a class="social-icon" href="{{ url }}"><i class="{{ footer_link.icon | default: 'fas fa-link' }} fa-2x" title="{{ footer_link.title }}"></i></a>
+    {% endfor %}
+  </div>
+{% endif %}
+
+&copy; {{ site.time | date: '%Y' }} {{ site.author }} - Powered by <a href="https://jekyllrb.com">Jekyll</a> &amp; <a href="https://github.com/yous/whiteglass">whiteglass</a> - Subscribe via <a href="{{ feed_path | absolute_url }}">RSS</a>
diff --git a/_includes/head.html b/_includes/head.html
index f556ddee..efe5826d 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -6,7 +6,15 @@
   {% assign title = page.title | default: site.title | escape %}
   {% assign canonical = page.url | replace:'index.html','' | absolute_url %}
   {% assign description = page.description | default: page.excerpt | default: site.description | strip_html | normalize_whitespace | escape %}
-  <title>{{ title }}</title>
+
+  <title>
+    {% if page.title == "Home" %}
+      {{ site.title }}
+    {% else %}
+      {{ page.title }} &middot; {{ site.title }}
+    {% endif %}
+  </title>
+
   <meta name="description" content="{{ description }}">
   {% if page.keywords %}
     {% if page.keywords.first %}
diff --git a/_sass/whiteglass/_layout.scss b/_sass/whiteglass/_layout.scss
index 5908c8e0..7d53af68 100644
--- a/_sass/whiteglass/_layout.scss
+++ b/_sass/whiteglass/_layout.scss
@@ -3,6 +3,7 @@
  */
 .site-header {
   min-height: 56px;
+  border-bottom: 1px solid #eee;
 
   // Positioning context for the mobile navigation icon
   position: relative;
@@ -49,17 +50,31 @@
 }
 
 
-
 /**
  * Site footer
  */
 .site-footer {
-  padding: $spacing-unit 0;
+  padding: 15px 0 30px;
   font-size: 15px;
   color: $grey-color;
   text-align: center;
+  border-top: 1px solid #eee;
+}
+
+.social-icons {
+  text-align: center;
+  margin-bottom: 0.5em;
 }
 
+.social-icon {
+  display: inline-block;
+  padding: 0 0.25em;
+  
+  &,
+  &:visited {
+    color: $grey-color-dark;
+  }
+}
 
 
 /**