diff --git a/_config.yml b/_config.yml
index 0896156..aba5597 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,20 +3,19 @@ destination: ./_site
 
 markdown:    kramdown
 
-port: 8080
 safe: true
-pygments: true
+highlighter: rouge
 
 style: light
 
-title: 'Gaspard Jankowiak &middot; RICAM &middot; ÖAW'
+title: 'Gaspard Jankowiak &middot; TU Wien'
 
 header-title-fr: 'Page personnelle de Gaspard Jankowiak'
-header-subtitle-fr: 'Postdoc l´Université de Vienne<br><span>gaspard</span>.<span>jankowiak</span>@<span>math.cnrs.fr</span>'
+header-subtitle-fr: 'Postdoc l´Université Technique de Vienne<br><span>gaspard</span>.<span>jankowiak</span>@<span>math.cnrs.fr</span>'
 header-homelink-fr: '/'
 
 header-title-en: "Gaspard Jankowiak's homepage"
-header-subtitle-en: 'Postdoctoral fellow at the University of Vienna<br><span>gaspard</span>.<span>jankowiak</span>@<span>math.cnrs.fr</span>'
+header-subtitle-en: 'Postdoctoral fellow at the TU Vienna<br><span>gaspard</span>.<span>jankowiak</span>@<span>math.cnrs.fr</span>'
 header-homelink-en: '/en'
 
 pretty: permalinks
diff --git a/_layouts/default.html b/_layouts/default.html
index 287fec9..25384a7 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,16 +1,16 @@
 <!doctype html>
-{% if page:lang %}
-<html lang="{{ page:lang }}">
+{% if page.lang %}
+<html lang="{{ page.lang }}">
 {% else %}
 <html lang="fr">
 {% endif %}
     <head>
         <meta charset="utf-8">
         <title>
-        {% if page:title  %}
-            {{ page:title }}
+        {% if page.title  %}
+            {{ page.title }}
         {% else %}
-            {{ site:title }}
+            {{ site.title }}
         {% endif %}
         </title>
         <link rel="icon" href="/images/favicon.png">
@@ -46,13 +46,13 @@
             <div id="wrapper">
 
                 <header>
-                    {% assign homelink = site:header-homelink-fr %}
-                    {% assign title = site:header-title-fr %}
-                    {% assign subtitle = site:header-subtitle-fr %}
-                    {% if page:lang == 'en' %}
-                        {% assign homelink = site:header-homelink-en %}
-                        {% assign title = site:header-title-en %}
-                        {% assign subtitle = site:header-subtitle-en %}
+                    {% assign homelink = site.header-homelink-fr %}
+                    {% assign title = site.header-title-fr %}
+                    {% assign subtitle = site.header-subtitle-fr %}
+                    {% if page.lang == 'en' %}
+                        {% assign homelink = site.header-homelink-en %}
+                        {% assign title = site.header-title-en %}
+                        {% assign subtitle = site.header-subtitle-en %}
                     {% endif %}
                     <h1><a href="{{ homelink }}">{{ title }}</a></h1>
                     <p>{{ subtitle }}</p>
