diff --git a/themes/blog.jaseg.de/layouts/_default/list.html b/themes/blog.jaseg.de/layouts/_default/list.html
index 41d9d89..7f6e88c 100644
--- a/themes/blog.jaseg.de/layouts/_default/list.html
+++ b/themes/blog.jaseg.de/layouts/_default/list.html
@@ -10,7 +10,7 @@
   {{ range (where .Data.Pages "Section" "!=" "") }}
   <li>
     <span class="date">{{ .Date.Format "2006/01/02" }}</span>
-    <a href="{{ .URL }}">{{ .Title }}</a>
+    <a href="{{ .RelPermalink }}">{{ .Title }}</a>
   </li>
   {{ end }}
 </ul>
diff --git a/themes/blog.jaseg.de/layouts/index.html b/themes/blog.jaseg.de/layouts/index.html
index 0c885ce..5b202e0 100644
--- a/themes/blog.jaseg.de/layouts/index.html
+++ b/themes/blog.jaseg.de/layouts/index.html
@@ -6,7 +6,7 @@
   {{ range (where site.RegularPages "Section" "==" "posts") }}
   <li>
     <span class="date">{{ .Date.Format "2006/01/02" }}</span>
-    <a href="{{ .URL }}">{{ .Title }}</a>
+    <a href="{{ .Permalink }}">{{ .Title }}</a>
   </li>
   {{ end }}
 </ul>
diff --git a/themes/blog.jaseg.de/layouts/partials/head_custom.html b/themes/blog.jaseg.de/layouts/partials/head_custom.html
index 6520ca0..cb1a57b 100644
--- a/themes/blog.jaseg.de/layouts/partials/head_custom.html
+++ b/themes/blog.jaseg.de/layouts/partials/head_custom.html
@@ -1,12 +1,4 @@
 <header>
-
-  <!--
-  Syntax highlighting - defaults to atom light theme.
-  List here: https://github.com/isagalaev/highlight.js/tree/master/src/styles
-  -->
-  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/atom-one-light.min.css">
-  <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
-  <script>hljs.initHighlightingOnLoad();</script>
   <nav>
     <ul>
       {{ $title := lower .Title }}
@@ -17,14 +9,14 @@
       {{ range .Site.Menus.main }}
       {{ $name := lower .Name }}
       <li class="pull-left {{ if eq $name $title }}current{{ else if eq $section $name }}current{{ else if eq $title (pluralize $name) }}current{{ end }}">
-        <a href="{{ .URL }}">~/{{ lower .Name }}</a>
+        <a href="{{ .RelPermalink }}">~/{{ lower .Name }}</a>
       </li>
       {{end}}
 
       {{ range .Site.Menus.feed }}
       {{ $name := lower .Name}}
       <li class="pull-right">
-        <a href="{{ .URL }}">~/{{ lower .Name}}</a>
+        <a href="{{ .RelPermalink }}">~/{{ lower .Name}}</a>
       </li>
       {{end}}
 
diff --git a/themes/blog.jaseg.de/static/css/style.css b/themes/blog.jaseg.de/static/css/style.css
index 47e5233..18e13f4 100644
--- a/themes/blog.jaseg.de/static/css/style.css
+++ b/themes/blog.jaseg.de/static/css/style.css
@@ -1,7 +1,6 @@
 /* @import url('https://fonts.googleapis.com/css?family=Roboto+Slab:400,700|Source+Serif+Pro'); */
 /* @import url('https://fonts.googleapis.com/css?family=Fredoka+One|Source+Serif+Pro'); */
-@import url('https://fonts.googleapis.com/css?family=Baloo|Source+Serif+Pro');
-@import url('https://fonts.googleapis.com/css?family=Ubuntu+Mono');
+@import url('/css/webfonts.css');
 
 body {
     max-width: 800px;
diff --git a/themes/blog.jaseg.de/static/css/webfonts.css b/themes/blog.jaseg.de/static/css/webfonts.css
new file mode 100644
index 0000000..e94d5e2
--- /dev/null
+++ b/themes/blog.jaseg.de/static/css/webfonts.css
@@ -0,0 +1,18 @@
+@font-face {
+  font-family: 'Baloo';
+  font-style: normal;
+  font-weight: 400;
+  src: url(/fonts/baloo.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Source Serif Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: url(/fonts/source-serif-pro.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Ubuntu Mono';
+  font-style: normal;
+  font-weight: 400;
+  src: url(/fonts/ubuntu-mono.ttf) format('truetype');
+}
diff --git a/themes/blog.jaseg.de/static/favicon.ico b/themes/blog.jaseg.de/static/favicon.ico
new file mode 100644
index 0000000..25fbd4c
Binary files /dev/null and b/themes/blog.jaseg.de/static/favicon.ico differ
diff --git a/themes/blog.jaseg.de/static/fonts/baloo.ttf b/themes/blog.jaseg.de/static/fonts/baloo.ttf
new file mode 100644
index 0000000..ce8a822
Binary files /dev/null and b/themes/blog.jaseg.de/static/fonts/baloo.ttf differ
diff --git a/themes/blog.jaseg.de/static/fonts/source-serif-pro.ttf b/themes/blog.jaseg.de/static/fonts/source-serif-pro.ttf
new file mode 100644
index 0000000..5d23687
Binary files /dev/null and b/themes/blog.jaseg.de/static/fonts/source-serif-pro.ttf differ
diff --git a/themes/blog.jaseg.de/static/fonts/ubuntu-mono.ttf b/themes/blog.jaseg.de/static/fonts/ubuntu-mono.ttf
new file mode 100644
index 0000000..25a9dfe
Binary files /dev/null and b/themes/blog.jaseg.de/static/fonts/ubuntu-mono.ttf differ