@@ -1,34 +1,3 @@ 
-/*
-@font-face {
-    font-family: 'Neris';
-    src: url('../fonts/neris-light-webfont.woff2') format('woff2');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'Neris';
-     src: url('../fonts/neris-lightitalic-webfont.woff2') format('woff2');
-    font-weight: normal;
-    font-style: italic;
-}
-
-@font-face {
-    font-family: 'Neris';
-    src: url('../fonts/neris-semibold-webfont.woff2') format('woff2');
-    font-weight: bold;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'Neris';
-    src: url('../fonts/neris-semibold-italic-webfont.woff2') format('woff2');
-    font-weight: bold;
-    font-style: italic;
-}
-*/
-
-
 @font-face {
     font-family: 'Bunday Sans';
     src: url('../fonts/bundaysans-light-webfont.woff2') format('woff2');
@@ -38,85 +7,31 @@ }
 
 @font-face {
     font-family: 'Bunday Sans';
-     src: url('../fonts/bundaysans-lightit-webfont.woff2') format('woff2');
-    font-weight: normal;
-    font-style: italic;
-}
-
-@font-face {
-    font-family: 'Bunday Sans';
-    src: url('../fonts/bundaysans-bold-webfont.woff2') format('woff2');
+    src: url('../fonts/bundaysans-semibold-webfont.woff2') format('woff2');
     font-weight: bold;
     font-style: normal;
 }
 
 @font-face {
-    font-family: 'Bunday Sans';
-    src: url('../fonts/bundaysans-boldit-webfont.woff2') format('woff2');
-    font-weight: bold;
-    font-style: italic;
-}
-
-/*
-@font-face {
-    font-family: 'Noway';
-    src: url('../fonts/noway-regular-webfont.woff2') format('woff2');
+    font-family: 'Calendas Plus';
+    src: url('../fonts/calendas_plus.woff2') format('woff2');
     font-weight: normal;
     font-style: normal;
 }
 
 @font-face {
-    font-family: 'Noway';
-     src: url('../fonts/noway_regular_italic-webfont.woff2') format('woff2');
+    font-family: 'Calendas Plus';
+     src: url('../fonts/calendas_plus_italic.woff2') format('woff2');
     font-weight: normal;
     font-style: italic;
 }
 
 @font-face {
-    font-family: 'Noway';
-    src: url('../fonts/noway-regular-webfont.woff2') format('woff2');
+    font-family: 'Calendas Plus';
+    src: url('../fonts/calendas_plus_bold.woff2') format('woff2');
     font-weight: bold;
     font-style: normal;
 }
-
-@font-face {
-    font-family: 'Noway';
-    src: url('../fonts/noway_regular_italic-webfont.woff2') format('woff2');
-    font-weight: bold;
-    font-style: italic;
-}
-*/
-
-/*
-@font-face {
-    font-family: 'Clear Sans';
-    src: url('../fonts/ClearSans-Light.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'Clear Sans';
-     src: url('../fonts/ClearSans-Italic.woff') format('woff');
-    font-weight: normal;
-    font-style: italic;
-}
-
-@font-face {
-    font-family: 'Clear Sans';
-    src: url('../fonts/ClearSans-Medium.woff') format('woff');
-    font-weight: bold;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'Clear Sans';
-    src: url('../fonts/ClearSans-MediumItalic.woff') format('woff');
-    font-weight: bold;
-    font-style: italic;
-}
-
-*/
 
 @font-face {
     font-family: 'Hack';

@@ -19,7 +19,8 @@ b, strong, h1, h2, h3, h4, h5, h6, .panel-title {
   font-weight: bold;
 }
 
-i, em, .subtitle, .panel-header {
+i, em, .subtitle, .panel-header, a {
+  font-family: 'Calendas Plus', serif;
   font-style: italic;
   -moz-font-feature-settings: "liga", "clig", "dlig", "onum", "frac", "kern";
   -webkit-font-feature-settings: "liga", "clig", "dlig", "onum", "frac", "kern";
@@ -27,11 +28,24 @@ -ms-font-feature-settings: "liga", "clig", "dlig", "onum", "frac", "kern";
   font-feature-settings: "liga", "clig", "dlig", "onum", "frac", "kern";
 }
 
+h1 a, h2 a, h3 a, h4 a, h5 a {
+  font-family: 'Bunday Sans', sans-serif;  
+  font-style: normal;
+  -moz-font-feature-settings: "liga", "clig", "onum", "frac", "kern";
+  -webkit-font-feature-settings: "liga", "clig", "onum", "frac", "kern";
+  -ms-font-feature-settings: "liga", "clig", "onum", "frac", "kern";
+  font-feature-settings: "liga", "clig", "onum", "frac", "kern";
+}
+
+a {
+  text-decoration-skip: ink;
+}
+
 .subtitle {
   font-style: italic;
   font-size: 1rem;
-  line-height: 1.1rem;
-  margin-top: -0.4rem;
+  line-height: 1.2rem;
+  margin-top: -0.3rem;
 }
 
 .featured .subtitle {
@@ -67,7 +81,7 @@ .navbar {
   padding-top: 1rem;
 }
 
-.navbar .btn {
+.navbar-link {
   margin-top: -0.3rem;
   font-size: 1.2rem;
 }

@@ -1,9 +1,9 @@ 
 <header class="navbar">
   <section class="navbar-section"></section>
   <section class="navbar-center">
-    <a href="/articles" class="btn btn-link navbar-left">articles</a>
+    <a href="/articles" class="navbar-link navbar-left">articles</a>
     <a href="/" class="h3rald h3rald-header">&nbsp;</a>
-    <a href="/projects" class="btn btn-link navbar-right">projects</a>
+    <a href="/projects" class="navbar-link navbar-right">projects</a>
   </section>
   <section class="navbar-section"></section>
 </header>