diff --git a/template/default.twig b/template/default.twig
index bb565a5a..b440e825 100644
--- a/template/default.twig
+++ b/template/default.twig
@@ -72,6 +72,17 @@
                 if (navigator.userAgent.indexOf('Safari') != -1 && navigator.userAgent.indexOf('Chrome') == -1) {
                     $('body').addClass('safari');
                 }
+
+                $('h1, h2, h3, h4, h5, h6').each(function(key, item) {
+                    var $item = $(item);
+                    var id = $item.attr('id');
+                    if (id) {
+                        var link = $('<a>');
+                        link.attr('href', '#' + id);
+                        console.log(link)
+                        $item.wrap(link);
+                    }
+                })
             });
         </script>
 
diff --git a/template/styles/main.css b/template/styles/main.css
index 24ffcd90..876ed790 100644
--- a/template/styles/main.css
+++ b/template/styles/main.css
@@ -42,6 +42,10 @@ h1, h2, h3, h4, h5, h6 {
 	letter-spacing: -1px;
 }
 
+:target {
+	background: #ffff99;
+}
+
 a.logo {
 	display: block;
 	position: relative;