@@ -1,3 +1,24 @@ 
+@font-face {
+    font-family: 'Calendas Plus';
+    src: url('../fonts/calendas-plus.woff2') format('woff2');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'Calendas Plus';
+    src: url('../fonts/calendas-plus-italic.woff2') format('woff2');
+    font-weight: normal;
+    font-style: italic;
+}
+
+@font-face {
+    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-light-webfont.woff2') format('woff2');

@@ -127,14 +127,14 @@ display: initial;
     }
 }
 
-
 html {
     font-size: var(--html-font-size);
     line-height: var(--line-height);
 }
 
 body {
-    font-family: 'Noway', sans-serif;
+    background-color: var(--primary-background);
+    font-family: 'Calendas Plus', serif;
     font-feature-settings: "liga", "clig", "kern";
     hyphens: auto;
     font-weight: 300;
@@ -142,6 +142,23 @@ margin: auto;
     letter-spacing: var(--letter-spacing);
     font-size: var(--base-font-size);
     line-height: var(--leading);
+}
+
+.grimoire,
+.navlinks,
+.primary-subtitle,
+.secondary-subtitle,
+.panel-header,
+h1,
+h2,
+h3,
+h4,
+h5 {
+    font-feature-settings: "liga", "clig", "dlig", "onum", "frac", "kern";
+}
+
+.navlinks {
+    text-transform: uppercase;
 }
 
 h1,
@@ -282,7 +299,7 @@ em,
 .primary-subtitle,
 .secondary-subtitle,
 .panel-header {
-    font-family: 'Noway', sans-serif;
+    font-family: 'Calendas Plus', serif;
     font-style: italic;
     font-feature-settings: "liga", "clig", "dlig", "onum", "frac", "kern";
 }
@@ -292,7 +309,7 @@ h2,
 h3,
 h4,
 h5 {
-    font-family: 'Noway', sans-serif;
+    font-family: 'Calendas Plus', serif;
     font-style: normal;
     font-feature-settings: "liga", "clig", "dlig", "onum", "frac", "kern";
 }