diff --git a/source/_footer.slim b/source/_footer.slim
index f6cca72..d376de2 100644
--- a/source/_footer.slim
+++ b/source/_footer.slim
@@ -1,11 +1,11 @@
 a name="about"
 p
-  ' ® Copyright 2012 | 
-  a href="albert" Albert Schulz
+  ' ® Copyright 2012 |
+  ==link_to "Albert Schulz", "albert"
   ' ,
-  a href="joerg" Jörg Thalheim
+  ==link_to "Jörg Thalheim", "joerg"
   br/
   ' using
   a href="http://ethanschoonover.com/solarized" target="_blank" solarized
   ', more infos
-  a href="humans.txt" here
+  ==link_to "here", "humans.txt"
diff --git a/source/_navbar.slim b/source/_navbar.slim
index a1a90a0..dcdb81d 100644
--- a/source/_navbar.slim
+++ b/source/_navbar.slim
@@ -1,4 +1,3 @@
-a.navlink#sitelink href="index.html" Higgs-Boson
-a.navlink href="impressum.html" Impressum
-a.navlink href="#about" About
-
+==link_to "Higgs-Boson", "index.html", :class => "navlink", :id => "sitelink"
+==link_to "Impressum", "impressum.html", :class => "navlink"
+==link_to "About", "#about", :class => "navlink"