diff --git a/assets/scss/2-helpers/_text.scss b/assets/scss/2-helpers/_text.scss
index 02759b4..a1c413e 100644
--- a/assets/scss/2-helpers/_text.scss
+++ b/assets/scss/2-helpers/_text.scss
@@ -3,7 +3,7 @@
 /* ----------------------------------------------------------- */
 
 .bold {
-  font-weight: bold;
+  font-weight: 700;
 }
 
 .semibold {
diff --git a/assets/scss/3-components/_forms.scss b/assets/scss/3-components/_forms.scss
index 8cb980e..6e09257 100644
--- a/assets/scss/3-components/_forms.scss
+++ b/assets/scss/3-components/_forms.scss
@@ -201,7 +201,7 @@ input[type="checkbox"] {
 
 .f-required {
   color: $input-error;
-  font-weight: bold;
+  font-weight: 700;
 }
 
 .f-error input {
diff --git a/assets/scss/3-components/_radiobox.scss b/assets/scss/3-components/_radiobox.scss
index 751ffe4..6b9bc16 100644
--- a/assets/scss/3-components/_radiobox.scss
+++ b/assets/scss/3-components/_radiobox.scss
@@ -36,7 +36,7 @@
   min-height: 4rem;
   width: 50%;
   text-align: center;
-  font-weight: normal;
+  font-weight: 400;
   transition: all .05s ease-in;
 }
 
diff --git a/assets/scss/4-base/_01-fonts.scss b/assets/scss/4-base/_01-fonts.scss
index b25e45d..966ca88 100644
--- a/assets/scss/4-base/_01-fonts.scss
+++ b/assets/scss/4-base/_01-fonts.scss
@@ -3,34 +3,28 @@
 /* ----------------------------------------------------------- */
 
 
-@font-face {
-  font-display: swap;
-  font-weight: normal;
-  font-family: "Source Sans Pro";
-  src: local("Source Sans Pro"), local("SourceSansPro-Regular"),
-  url("/fonts/sourcesanspro-regular-webfont.woff2") format("woff2"),
-  url("/fonts/sourcesanspro-regular-webfont.woff") format("woff");
+@font-face{
+  font-family: "Source Sans 3 VF";
+  font-weight: 400 900;
+  font-style: normal;
+  font-stretch: normal;
+  font-display: fallback;
+  src:
+    local("SourceSans3VF"),
+    url('/fonts/sourcesans3vf-upright.otf.woff2') format('woff2-variations');
 }
 
-@font-face {
-  font-display: swap;
-  font-weight: 600;
-  font-family: "Source Sans Pro";
-  src: local("Source Sans Pro Semibold"), local("SourceSansPro-Semibold"),
-  url("/fonts/sourcesanspro-semibold-webfont.woff2") format("woff2"),
-  url("/fonts/sourcesanspro-semibold-webfont.woff") format("woff");
+@font-face{
+  font-family: "Source Sans 3 VF";
+  font-weight: 400 900;
+  font-style: italic;
+  font-stretch: normal;
+  font-display: fallback;
+  src:
+    local("SourceSans3VF Italic"),
+    url('/fonts/sourcesans3vf-italic.otf.woff2') format('woff2-variations');
 }
 
-@font-face {
-  font-display: swap;
-  font-weight: 900;
-  font-family: "Source Sans Pro";
-  src: local("Source Sans Pro Black"), local("SourceSansPro-Black"),
-  url("/fonts/sourcesanspro-black-webfont.woff2") format("woff2"),
-  url("/fonts/sourcesanspro-black-webfont.woff") format("woff");
-}
-
-
 // Fallback hack
 // --------------------------------------------------------------
 
diff --git a/assets/scss/4-base/_09-footer.scss b/assets/scss/4-base/_09-footer.scss
index 93bb3b5..5c7abf2 100644
--- a/assets/scss/4-base/_09-footer.scss
+++ b/assets/scss/4-base/_09-footer.scss
@@ -17,12 +17,14 @@
   // color: inherit;
 }
 
-.footer__logo,
-.footer__logo:link,
-.footer__logo:visited {
+.footer__logo:where(:link, :visited) {
   display: inline-block;
   text-decoration: none;
   font-size: 3rem;
-  font-weight: bold;
+  font-weight: 900;
   letter-spacing: 0.015em;
 }
+
+.footer__logo:where(:hover, :active, :focus) {
+  text-decoration: underline;
+}
diff --git a/assets/scss/6-pages/album.scss b/assets/scss/6-pages/album.scss
index 967f481..cb93d57 100644
--- a/assets/scss/6-pages/album.scss
+++ b/assets/scss/6-pages/album.scss
@@ -64,7 +64,7 @@
   display: block;
   margin-top: .4rem;
   color: rgba($color-light-text, .8);
-  font-weight: normal;
+  font-weight: 400;
   font-size: 3rem;
   line-height: 4rem;
 }
diff --git a/assets/scss/6-pages/home.scss b/assets/scss/6-pages/home.scss
index 2ea3cac..7c59a8c 100644
--- a/assets/scss/6-pages/home.scss
+++ b/assets/scss/6-pages/home.scss
@@ -25,6 +25,7 @@
 .home-head__title {
   margin-top: 0;
   margin-bottom: 0;
+  font-weight: 900;
 }
 
 .home-head__title span {
diff --git a/assets/scss/_config.scss b/assets/scss/_config.scss
index 80a444c..60d0eec 100644
--- a/assets/scss/_config.scss
+++ b/assets/scss/_config.scss
@@ -7,7 +7,7 @@
 
 $base-font: 16; // px value (without unit), will be converted in em
 $line-height: 1.5;
-$fontstack1: "Source Sans Pro", "Source Sans Pro-fallback", "Helvetica Neue", Helvetica, Arial, sans-serif;
+$fontstack1: "Source Sans 3 VF", "Source Sans Pro-fallback", "Helvetica Neue", Helvetica, Arial, sans-serif;
 $fontstack2: Georgia, Times, "Times New Roman", serif;
 
 // responsive
diff --git a/assets/scss/style.scss b/assets/scss/style.scss
index 677348b..a49cab6 100644
--- a/assets/scss/style.scss
+++ b/assets/scss/style.scss
@@ -33,13 +33,13 @@
 // --------------------------------------------------------------
 
 @import "3-components/_forms";
-@import "3-components/_switch";
-@import "3-components/_radiobox";
+// @import "3-components/_switch";
+// @import "3-components/_radiobox";
 @import "3-components/_buttons";
 @import "3-components/_pagination";
-@import "3-components/_tables";
-@import "3-components/_tooltips";
-@import "3-components/_notifications";
+// @import "3-components/_tables";
+// @import "3-components/_tooltips";
+// @import "3-components/_notifications";
 
 
 // --------------------------------------------------------------
@@ -47,7 +47,7 @@
 // --------------------------------------------------------------
 
 @import "4-base/_01-fonts";
-@import "4-base/_02-icons";
+// @import "4-base/_02-icons";
 @import "4-base/_03-grids";
 @import "4-base/_04-main";
 // @import "4-base/_05-layout";
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 564eb42..4d5f95b 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -57,11 +57,8 @@
     <link rel="preload" href="{{ $secureStyle.Permalink }}" as="style" />
     <link rel="stylesheet" href="{{ $secureStyle.Permalink }}" integrity="{{ $secureStyle.Data.Integrity }}">
 
-
-    <link rel="preload" as="font" type="font/woff2" href="/fonts/sourcesanspro-regular-webfont.woff2" crossorigin/>
-    <link rel="preload" as="font" type="font/woff2" href="/fonts/sourcesanspro-semibold-webfont.woff2" crossorigin/>
-    <link rel="preload" as="font" type="font/woff2" href="/fonts/sourcesanspro-black-webfont.woff2" crossorigin/>
-
+    <link rel="preload" as="font" type="font/woff2" href="/fonts/sourcesans3vf-upright.otf.woff2" crossorigin/>
+    <link rel="preload" as="font" type="font/woff2" href="/fonts/sourcesans3vf-italic.otf.woff2" crossorigin/>
 
   </head>
   <body>
diff --git a/static/fonts/sourcesans3vf-italic.otf.woff2 b/static/fonts/sourcesans3vf-italic.otf.woff2
new file mode 100644
index 0000000..4a160ff
Binary files /dev/null and b/static/fonts/sourcesans3vf-italic.otf.woff2 differ
diff --git a/static/fonts/sourcesans3vf-upright.otf.woff2 b/static/fonts/sourcesans3vf-upright.otf.woff2
new file mode 100644
index 0000000..d1537d8
Binary files /dev/null and b/static/fonts/sourcesans3vf-upright.otf.woff2 differ
diff --git a/static/fonts/sourcesanspro-black-webfont.woff b/static/fonts/sourcesanspro-black-webfont.woff
deleted file mode 100644
index f4dc44e..0000000
Binary files a/static/fonts/sourcesanspro-black-webfont.woff and /dev/null differ
diff --git a/static/fonts/sourcesanspro-black-webfont.woff2 b/static/fonts/sourcesanspro-black-webfont.woff2
deleted file mode 100644
index d58afb4..0000000
Binary files a/static/fonts/sourcesanspro-black-webfont.woff2 and /dev/null differ
diff --git a/static/fonts/sourcesanspro-regular-webfont.woff b/static/fonts/sourcesanspro-regular-webfont.woff
deleted file mode 100644
index 440c9ce..0000000
Binary files a/static/fonts/sourcesanspro-regular-webfont.woff and /dev/null differ
diff --git a/static/fonts/sourcesanspro-regular-webfont.woff2 b/static/fonts/sourcesanspro-regular-webfont.woff2
deleted file mode 100644
index 4e32c46..0000000
Binary files a/static/fonts/sourcesanspro-regular-webfont.woff2 and /dev/null differ
diff --git a/static/fonts/sourcesanspro-semibold-webfont.woff b/static/fonts/sourcesanspro-semibold-webfont.woff
deleted file mode 100644
index 15a9613..0000000
Binary files a/static/fonts/sourcesanspro-semibold-webfont.woff and /dev/null differ
diff --git a/static/fonts/sourcesanspro-semibold-webfont.woff2 b/static/fonts/sourcesanspro-semibold-webfont.woff2
deleted file mode 100644
index 31fb144..0000000
Binary files a/static/fonts/sourcesanspro-semibold-webfont.woff2 and /dev/null differ