diff --git a/docusaurus.config.js b/docusaurus.config.js
index 987ab9402..47390eebe 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -4,6 +4,7 @@ const tailwindPlugin = require('./plugins/tailwind-config.cjs')
 require('dotenv').config()
 
 module.exports = {
+  staticDirectories: ['static'],
   customFields: {
     // Analytics proxy URL
     analyticsProxyUrl: process.env.REACT_APP_AMPLITUDE_PROXY_URL,
@@ -66,9 +67,9 @@ module.exports = {
         },
         theme: {
           customCss: [
-            require.resolve('./src/css/custom.css'),
             require.resolve('./src/css/font.css'),
             require.resolve('./src/css/types.css'),
+            require.resolve('./src/css/custom.css'),
           ],
         },
       },
diff --git a/src/css/custom.css b/src/css/custom.css
index ed08016de..1a3307c57 100644
--- a/src/css/custom.css
+++ b/src/css/custom.css
@@ -12,9 +12,6 @@
 @import 'tailwindcss/components';
 @import 'tailwindcss/utilities';
 
-@import './font.css';
-@import './types.css';
-
 :root {
   .site-max-width {
     max-width: 1440px;
@@ -23,9 +20,4 @@
   .default-grid {
     @apply grid grid-cols-4 gap-gap-large sm:grid-cols-8;
   }
-
-  .Navbar {
-    .Navbar__logo-text {
-    }
-  }
 }
diff --git a/src/css/font.css b/src/css/font.css
index 57509a891..1e7a8fbf8 100644
--- a/src/css/font.css
+++ b/src/css/font.css
@@ -2,77 +2,95 @@
 
 @font-face {
   font-family: 'Basel Grotesk';
-  src: url('/fonts/baselGrotesk/Basel-Grotesk-Regular.woff2') format('woff2');
+  src:
+    url('/font/baselGrotesk/Basel-Grotesk-Regular.woff2') format('woff2'),
+    url('/font/baselGrotesk/Basel-Grotesk-Regular.woff') format('woff'),
+    url('/font/baselGrotesk/Basel-Grotesk-Regular.otf') format('opentype');
   font-weight: '400';
   font-style: 'normal';
 }
 
-/* @font-face {
+@font-face {
   font-family: 'Basel Grotesk';
-  src: url('/fonts/baselGrotesk/Basel-Grotesk-Regular-Italic.woff2') format('woff2');
+  src:
+    url('/font/baselGrotesk/Basel-Grotesk-Regular-Italic.woff2') format('woff2'),
+    url('/font/baselGrotesk/Basel-Grotesk-Regular-Italic.woff') format('woff'),
+    url('/font/baselGrotesk/Basel-Grotesk-Regular-Italic.otf') format('opentype');
   font-weight: '400';
   font-style: 'italic';
-} */
+}
 
 @font-face {
   font-family: 'Basel Grotesk';
-  src: url('/fonts/baselGrotesk/Basel-Grotesk-Book.woff2') format('woff2');
+  src:
+    url('/font/baselGrotesk/Basel-Grotesk-Book.woff2') format('woff2'),
+    url('/font/baselGrotesk/Basel-Grotesk-Book.woff') format('woff'),
+    url('/font/baselGrotesk/Basel-Grotesk-Book.otf') format('opentype');
   font-weight: '500';
   font-style: 'normal';
 }
 
-/* @font-face {
+@font-face {
   font-family: 'Basel Grotesk';
-  src: url('/fonts/baselGrotesk/Basel-Grotesk-Book-Italic.woff2') format('woff2');
+  src:
+    url('/font/baselGrotesk/Basel-Grotesk-Book-Italic.woff2') format('woff2'),
+    url('/font/baselGrotesk/Basel-Grotesk-Book-Italic.woff') format('woff'),
+    url('/font/baselGrotesk/Basel-Grotesk-Book-Italic.otf') format('opentype');
   font-weight: '500';
   font-style: 'italic';
-} */
+}
 
 @font-face {
   font-family: 'Basel Grotesk';
-  src: url('/fonts/baselGrotesk/Basel-Grotesk-Medium.woff2') format('woff2');
+  src:
+    url('/font/baselGrotesk/Basel-Grotesk-Medium.woff2') format('woff2'),
+    url('/font/baselGrotesk/Basel-Grotesk-Medium.woff') format('woff'),
+    url('/font/baselGrotesk/Basel-Grotesk-Medium.otf') format('opentype');
   font-weight: '600';
   font-style: 'normal';
 }
 
-/* @font-face {
+@font-face {
   font-family: 'Basel Grotesk';
-  src: url('/fonts/baselGrotesk/Basel-Grotesk-Medium-Italic.woff2') format('woff2');
+  src:
+    url('/font/baselGrotesk/Basel-Grotesk-Medium-Italic.woff2') format('woff2'),
+    url('/font/baselGrotesk/Basel-Grotesk-Medium-Italic.woff') format('woff'),
+    url('/font/baselGrotesk/Basel-Grotesk-Medium-Italic.otf') format('opentype');
   font-weight: '600';
   font-style: 'italic';
-} */
+}
 
 @font-face {
   font-family: 'Riegraf';
-  src: url('/fonts/riegraf/Riegraf-Light.otf');
+  src: url('/font/riegraf/Riegraf-Light.otf') format('opentype');
   font-weight: '300';
   font-style: 'normal';
 }
 
 @font-face {
   font-family: 'Riegraf';
-  src: url('/fonts/riegraf/Riegraf-Regular.otf');
+  src: url('/font/riegraf/Riegraf-Regular.otf') format('opentype');
   font-weight: '400';
   font-style: 'normal';
 }
 
-/* @font-face {
+@font-face {
   font-family: 'Riegraf';
-  src: url('/fonts/riegraf/Riegraf-Regular-Italic.otf');
+  src: url('/font/riegraf/Riegraf-Regular-Italic.otf') format('opentype');
   font-weight: '400';
   font-style: 'italic';
-} */
+}
 
 @font-face {
   font-family: 'Riegraf';
-  src: url('/fonts/riegraf/Riegraf-Medium.otf');
+  src: url('/font/riegraf/Riegraf-Medium.otf') format('opentype');
   font-weight: '500';
   font-style: 'normal';
 }
 
 @font-face {
   font-family: 'Riegraf';
-  src: url('/fonts/riegraf/Riegraf-Bold.otf');
+  src: url('/font/riegraf/Riegraf-Bold.otf') format('opentype');
   font-weight: '600';
   font-style: 'normal';
 }
diff --git a/src/css/infma-overrides.css b/src/css/infma-overrides.css
index f132aaf4f..7bf3f79f1 100644
--- a/src/css/infma-overrides.css
+++ b/src/css/infma-overrides.css
@@ -122,4 +122,5 @@ a:hover {
   border-style: solid;
   border-width: 0;
   border-color: unset;
+  font-style: normal;
 }
diff --git a/src/css/types.css b/src/css/types.css
index f19520a4c..39cc94de4 100644
--- a/src/css/types.css
+++ b/src/css/types.css
@@ -220,7 +220,6 @@
 
   .mono-body-5 {
     @apply font-fragment-mono;
-    font-family: 'Fragment Mono';
     font-size: 0.8125rem;
     font-style: normal;
     font-weight: 400;
diff --git a/src/theme/Footer.tsx b/src/theme/Footer.tsx
index ae5c74ab6..31bfd66d4 100644
--- a/src/theme/Footer.tsx
+++ b/src/theme/Footer.tsx
@@ -108,7 +108,7 @@ const Footer: FC<{}> = () => {
             {footerData.footerLinks && footerData.footerLinks.length > 0 ? (
               <>
                 {footerData.footerLinks.map((section) => (
-                  <div className="space-y-[0.3125rem]">
+                  <div key={section.title} className="space-y-[0.3125rem]">
                     <h3 className="body-1 text-light-neutral-1 dark:text-dark-neutral-1">{section.title}</h3>
                     <ul>
                       {section.links.map((link) => (
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Book-Italic.otf b/static/font/baselGrotesk/Basel-Grotesk-Book-Italic.otf
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Book-Italic.otf
rename to static/font/baselGrotesk/Basel-Grotesk-Book-Italic.otf
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Book-Italic.woff b/static/font/baselGrotesk/Basel-Grotesk-Book-Italic.woff
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Book-Italic.woff
rename to static/font/baselGrotesk/Basel-Grotesk-Book-Italic.woff
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Book-Italic.woff2 b/static/font/baselGrotesk/Basel-Grotesk-Book-Italic.woff2
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Book-Italic.woff2
rename to static/font/baselGrotesk/Basel-Grotesk-Book-Italic.woff2
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Book.otf b/static/font/baselGrotesk/Basel-Grotesk-Book.otf
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Book.otf
rename to static/font/baselGrotesk/Basel-Grotesk-Book.otf
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Book.woff b/static/font/baselGrotesk/Basel-Grotesk-Book.woff
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Book.woff
rename to static/font/baselGrotesk/Basel-Grotesk-Book.woff
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Book.woff2 b/static/font/baselGrotesk/Basel-Grotesk-Book.woff2
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Book.woff2
rename to static/font/baselGrotesk/Basel-Grotesk-Book.woff2
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Medium-Italic.otf b/static/font/baselGrotesk/Basel-Grotesk-Medium-Italic.otf
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Medium-Italic.otf
rename to static/font/baselGrotesk/Basel-Grotesk-Medium-Italic.otf
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Medium-Italic.woff b/static/font/baselGrotesk/Basel-Grotesk-Medium-Italic.woff
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Medium-Italic.woff
rename to static/font/baselGrotesk/Basel-Grotesk-Medium-Italic.woff
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Medium-Italic.woff2 b/static/font/baselGrotesk/Basel-Grotesk-Medium-Italic.woff2
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Medium-Italic.woff2
rename to static/font/baselGrotesk/Basel-Grotesk-Medium-Italic.woff2
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Medium.otf b/static/font/baselGrotesk/Basel-Grotesk-Medium.otf
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Medium.otf
rename to static/font/baselGrotesk/Basel-Grotesk-Medium.otf
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Medium.woff b/static/font/baselGrotesk/Basel-Grotesk-Medium.woff
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Medium.woff
rename to static/font/baselGrotesk/Basel-Grotesk-Medium.woff
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Medium.woff2 b/static/font/baselGrotesk/Basel-Grotesk-Medium.woff2
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Medium.woff2
rename to static/font/baselGrotesk/Basel-Grotesk-Medium.woff2
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Regular-Italic.otf b/static/font/baselGrotesk/Basel-Grotesk-Regular-Italic.otf
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Regular-Italic.otf
rename to static/font/baselGrotesk/Basel-Grotesk-Regular-Italic.otf
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Regular-Italic.woff b/static/font/baselGrotesk/Basel-Grotesk-Regular-Italic.woff
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Regular-Italic.woff
rename to static/font/baselGrotesk/Basel-Grotesk-Regular-Italic.woff
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Regular-Italic.woff2 b/static/font/baselGrotesk/Basel-Grotesk-Regular-Italic.woff2
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Regular-Italic.woff2
rename to static/font/baselGrotesk/Basel-Grotesk-Regular-Italic.woff2
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Regular.otf b/static/font/baselGrotesk/Basel-Grotesk-Regular.otf
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Regular.otf
rename to static/font/baselGrotesk/Basel-Grotesk-Regular.otf
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Regular.woff b/static/font/baselGrotesk/Basel-Grotesk-Regular.woff
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Regular.woff
rename to static/font/baselGrotesk/Basel-Grotesk-Regular.woff
diff --git a/static/fonts/baselGrotesk/Basel-Grotesk-Regular.woff2 b/static/font/baselGrotesk/Basel-Grotesk-Regular.woff2
similarity index 100%
rename from static/fonts/baselGrotesk/Basel-Grotesk-Regular.woff2
rename to static/font/baselGrotesk/Basel-Grotesk-Regular.woff2
diff --git a/static/fonts/riegraf/Riegraf-Bold.otf b/static/font/riegraf/Riegraf-Bold.otf
similarity index 100%
rename from static/fonts/riegraf/Riegraf-Bold.otf
rename to static/font/riegraf/Riegraf-Bold.otf
diff --git a/static/fonts/riegraf/Riegraf-Light.otf b/static/font/riegraf/Riegraf-Light.otf
similarity index 100%
rename from static/fonts/riegraf/Riegraf-Light.otf
rename to static/font/riegraf/Riegraf-Light.otf
diff --git a/static/fonts/riegraf/Riegraf-Medium.otf b/static/font/riegraf/Riegraf-Medium.otf
similarity index 100%
rename from static/fonts/riegraf/Riegraf-Medium.otf
rename to static/font/riegraf/Riegraf-Medium.otf
diff --git a/static/fonts/riegraf/Riegraf-Regular-Italic.otf b/static/font/riegraf/Riegraf-Regular-Italic.otf
similarity index 100%
rename from static/fonts/riegraf/Riegraf-Regular-Italic.otf
rename to static/font/riegraf/Riegraf-Regular-Italic.otf
diff --git a/static/fonts/riegraf/Riegraf-Regular.otf b/static/font/riegraf/Riegraf-Regular.otf
similarity index 100%
rename from static/fonts/riegraf/Riegraf-Regular.otf
rename to static/font/riegraf/Riegraf-Regular.otf