diff --git a/_config.yml b/_config.yml
index 48f6b9b1..84d02dec 100644
--- a/_config.yml
+++ b/_config.yml
@@ -20,7 +20,7 @@ email:                  m@kretschmann.io
 # Urls
 # --------------------
 
-permalink:              /:title
+permalink:              /:title/
 paginate:               15
 paginate_path:          "/page/:num"
 category_dir:           "/"
diff --git a/_src/_includes/articles.html b/_src/_includes/articles.html
index 9489a6a7..db8618f1 100644
--- a/_src/_includes/articles.html
+++ b/_src/_includes/articles.html
@@ -15,7 +15,7 @@
             {{ post.content | markdownify }}
     		<p>
     			<a class="more-link" href="{{ post.linkurl }}">Go to source <i class="icon icon-forward"></i></a>
-                <a class="permalink-link" href="{{ post.url | append: '/' }}" rel="tooltip" title="Permalink">&#8734;</a>
+                <a class="permalink-link" href="{{ post.url }}" rel="tooltip" title="Permalink">&#8734;</a>
     		</p>
         </section>
     </article>
@@ -39,13 +39,13 @@
 
     <article class="hentry format-post">
     	<header>
-    		<h1 class="entry-title"><a href="{{ post.url | append: '/' }}">{{ post.title | titlecase }}</a></h1>
+    		<h1 class="entry-title"><a href="{{ post.url }}">{{ post.title | titlecase }}</a></h1>
     	</header>
 
         <section class="entry-content">
 
             {% if post.image %}
-                <a href="{{ post.url | append: '/' }}">
+                <a href="{{ post.url }}">
                     {% picture {{ post.image }} class="teaser" %}
                 </a>
             {% endif %}
@@ -64,7 +64,7 @@
                 <footer class="goodie-actions">
 
                     <p class="info col3">
-                        <a class="btn icon icon-info" href="{{ post.url | append: '/' }}">Release Post</a>
+                        <a class="btn icon icon-info" href="{{ post.url }}">Release Post</a>
                     </p>
 
                     {% if post.download %}
@@ -77,7 +77,7 @@
             {% endif %}
 
             {% unless page.path contains "goodies" %}
-                <a class="more-link" href="{{ post.url | append: '/' }}">Continue reading <i class="icon icon-arrow-right"></i></a>
+                <a class="more-link" href="{{ post.url }}">Continue reading <i class="icon icon-arrow-right"></i></a>
             {% endunless %}
 
         </section>
diff --git a/_src/_includes/head.html b/_src/_includes/head.html
index fe76f556..e96d17f6 100644
--- a/_src/_includes/head.html
+++ b/_src/_includes/head.html
@@ -59,16 +59,15 @@
     {% endif %}
     
 	<!-- TypeKit -->
-	<script data-cfasync="false" src="//use.typekit.com/msu4qap.js"></script>
-	<script data-cfasync="false">try{Typekit.load();}catch(e){}</script>
+	<script src="//use.typekit.com/msu4qap.js"></script>
+	<script>try{Typekit.load();}catch(e){}</script>
 	
 	<!-- Picturefill  -->
 	<script src="/assets/js/picturefill.min.js" defer></script>
 	
 	
 	<!-- Canonical URL -->
-    {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
-    <link rel="canonical" href="{{ canonical }}">
+    <link rel="canonical" href="{{ site.url}}{{ page.url | replace:'index.html','' }}">
 	
 	<link rel="alternate"  href="{{ site.url }}/feed/" type="application/rss+xml" title="Posts Feed"/>
     
diff --git a/_src/_includes/opengraph.html b/_src/_includes/opengraph.html
index 06c75505..bfe6401a 100644
--- a/_src/_includes/opengraph.html
+++ b/_src/_includes/opengraph.html
@@ -19,8 +19,7 @@
     <meta content="{{ page.excerpt | strip_html | strip_newlines }}" property="og:description">
 {% endif %}
 {% if page.url %}
-    {% capture canonical %}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
-    <meta content="{{ site.url }}{{ canonical }}" property="og:url"> 
+    <meta content="{{ site.url}}{{ page.url | replace:'index.html','' }}" property="og:url"> 
 {% endif %}
 {% if page.date %}
     <meta content="{{ page.date | date_to_xmlschema }}" property="article:published_time">
diff --git a/_src/_includes/twittercards.html b/_src/_includes/twittercards.html
index 9e108a63..b92fa12d 100644
--- a/_src/_includes/twittercards.html
+++ b/_src/_includes/twittercards.html
@@ -12,7 +12,7 @@
     <meta name="twitter:title" content="{{ site.title }}">
 {% endif %}
 {% if page.url %}
-    <meta name="twitter:url" content="{{ site.url }}{{ page.url }}">
+    <meta name="twitter:url" content="{{ site.url}}{{ page.url | replace:'index.html','' }}">
 {% endif %}
 {% if page.description %}
     <meta name="twitter:description" content="{{ page.description }}">
diff --git a/_src/_layouts/link.html b/_src/_layouts/link.html
index 652dd1da..b6a73816 100644
--- a/_src/_layouts/link.html
+++ b/_src/_layouts/link.html
@@ -18,7 +18,7 @@ layout: base
             {{ content }}
     		<p>
     			<a class="more-link" href="{{ page.linkurl }}">Go to source <i class="icon icon-forward"></i></a>
-                <a class="permalink-link" href="{{ page.url | append: '/' }}" rel="tooltip" title="Permalink">&#8734;</a>
+                <a class="permalink-link" href="{{ page.url }}" rel="tooltip" title="Permalink">&#8734;</a>
     		</p>
         </section>