diff --git a/_config.yml b/_config.yml
index 5a2bca4f..d37297c2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,7 +3,7 @@
 
 # NB! Set your site's url, otherwise stuff will break :)
 
-url: "https://flokuep.github.io"
+url: "https://vocaluxe.github.io"
 
 # If you're hosting your site at a Project repository on GitHub pages
 # (https://yourusername.github.io/repository-name)
@@ -12,7 +12,7 @@ url: "https://flokuep.github.io"
 #
 # NB! Without this *nothing* will work, because it's used in every path :)
 
-baseurl: /VocaluxeWebsite
+baseurl: /Vocaluxe
 
 # Google tracking id to track your visitors
 
@@ -42,9 +42,7 @@ favicon: "/img/vocaluxe_icon.png"
 # Header layout #
 ################
 
-black-favicon: "/img/vocaluxe_icon.png"
-
-#background-img: "../img/Vocaluxe.png"
+faviconPng: "/img/vocaluxe_icon.png"
 
 ##############################
 # Color the browser elements #
@@ -65,61 +63,7 @@ web-app-mode: True
 post-preview-words: 80
 big-post-preview-words: 200
 
-paginate: 5
-
-email-share: True
-fb-share: True
-twitter-share: True
-linkedin-share: True
-reddit-share: True
-google-plus-share: True
-tumblr-share: True
-pinterest-share: True
-pocket-share: True
-vkontakte-share: True
-
-disqus-shortname: ""
-
-syntax-highlight: False
-
-
-################
-# Author Blurb #
-################
-
-# The author blurb goes underneath blog posts.
-# This works best when your author blurb image has a transparent background, or matches your site background color.
-
-# if the author_blurb is not set, then this feature is skipped
-author_blurb: |
-    Vocaluxe is a free and open source singing game inspired by Ultrastar Deluxe and SingStar™.    
-    It allows up to six players to sing along with music using microphones in order to score points.
-author_blurb_image: "/img/Vocaluxe_Icon.png"
-
-##################
-# Social Buttons #
-##################
-
-enableSocial: True
-socialLikeOptions: >
-    {
-        "uri"      : "http://vocaluxe.org/",
-        "services" : {
-            "facebook": {
-                action      : 'like',
-                colorscheme : 'dark'
-            }
-        },
-        "order"    : ["facebook"],
-        "info_link_target": "_blank",
-        perma_option: false
-    }
-
-############
-# 404 page #
-############
-
-404-img: "/img/labtocat.png"
+#paginate: 5
 
 ################################################################################
 
diff --git a/_includes/head.html b/_includes/head.html
index dce5dfe8..1e3388dd 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -40,8 +40,6 @@
 	  <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
 	  <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
 	<![endif]-->
-
-	{% include web-app.html %}
 	
 	{% include color-browser.html %}
 </head>
diff --git a/_includes/navigation.html b/_includes/navigation.html
index a9866f49..8a6376b4 100644
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -16,8 +16,8 @@
 			<a class="navbar-brand" href="{{site.baseurl}}/">
           {% endif %}
 		  <div>
-            {% if site.black-favicon %}
-			  <img class="black-favicon" width="25" height=25" src="{{site.baseurl}}{{ site.black-favicon }}" alt="">
+            {% if site.faviconPng %}
+			  <img class="faviconPng" width="25" height=25" src="{{site.baseurl}}{{ site.faviconPng }}" alt="">
             {% endif %}
 			  {{ site.title }}
           </div>
diff --git a/_includes/web-app.html b/_includes/web-app.html
deleted file mode 100644
index e7753eb6..00000000
--- a/_includes/web-app.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-{% if site.web-app-mode %}
-
-  <!-- iOS Web App mode -->
-
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <link rel="apple-touch-icon" sizes="36x36" href="{{site.baseurl}}{{site.icon-36p}}">
-  <link rel="apple-touch-icon" sizes="48x48" href="{{site.baseurl}}{{site.icon-48p}}">
-  <link rel="apple-touch-icon" sizes="72x72" href="{{site.baseurl}}{{site.icon-72p}}">
-  <link rel="apple-touch-icon" sizes="96x96" href="{{site.baseurl}}{{site.icon-96p}}">
-  <link rel="apple-touch-icon" sizes="144x144" href="{{site.baseurl}}{{site.icon-144p}}">
-  <link rel="apple-touch-icon" sizes="192x192" href="{{site.baseurl}}{{site.icon-192p}}">
-
-  <!-- Android Web App mode -->
-
-  <link rel="manifest" href="{{site.baseurl}}/manifest.json">
-
-{% endif %}