diff --git a/scripts/lua/header.lp b/scripts/lua/header.lp
index afd2468c..60dd4538 100644
--- a/scripts/lua/header.lp
+++ b/scripts/lua/header.lp
@@ -81,7 +81,7 @@ is_authenticated = mg.request_info.is_authenticated
     <link rel="stylesheet" href="<?=pihole.fileversion('vendor/fonts/ubuntu-mono/ubuntu-mono.css')?>">
     <link rel="stylesheet" href="<?=pihole.fileversion('vendor/fonts/antonio/antonio.css')?>">
 <? else ?>
-    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/fonts/SourceSansPro/SourceSansPro.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/fonts/source-sans-pro/source-sans-pro.css')?>">
 <? end ?>
 
     <!-- Common styles -->
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-300.woff b/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-300.woff
deleted file mode 100644
index 98bafe5e..00000000
Binary files a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-300.woff and /dev/null differ
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-300italic.woff b/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-300italic.woff
deleted file mode 100644
index 42232ee2..00000000
Binary files a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-300italic.woff and /dev/null differ
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-600.woff b/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-600.woff
deleted file mode 100644
index 0aba561d..00000000
Binary files a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-600.woff and /dev/null differ
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-600italic.woff b/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-600italic.woff
deleted file mode 100644
index cfdf5ccc..00000000
Binary files a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-600italic.woff and /dev/null differ
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-700.woff b/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-700.woff
deleted file mode 100644
index f2a7dd34..00000000
Binary files a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-700.woff and /dev/null differ
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-italic.woff b/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-italic.woff
deleted file mode 100644
index 4e767cf5..00000000
Binary files a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-italic.woff and /dev/null differ
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-regular.woff b/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-regular.woff
deleted file mode 100644
index 5b6e97be..00000000
Binary files a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-regular.woff and /dev/null differ
diff --git a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-100.woff b/vendor/fonts/antonio/antonio-v1-latin-ext_latin-100.woff
deleted file mode 100644
index 10e1631a..00000000
Binary files a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-100.woff and /dev/null differ
diff --git a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-100.woff2 b/vendor/fonts/antonio/antonio-v1-latin-ext_latin-100.woff2
deleted file mode 100644
index 370c2458..00000000
Binary files a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-100.woff2 and /dev/null differ
diff --git a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-700.woff b/vendor/fonts/antonio/antonio-v1-latin-ext_latin-700.woff
deleted file mode 100644
index 3f929b1d..00000000
Binary files a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-700.woff and /dev/null differ
diff --git a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-700.woff2 b/vendor/fonts/antonio/antonio-v1-latin-ext_latin-700.woff2
deleted file mode 100644
index cf5e2e46..00000000
Binary files a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-700.woff2 and /dev/null differ
diff --git a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-regular.woff b/vendor/fonts/antonio/antonio-v1-latin-ext_latin-regular.woff
deleted file mode 100644
index fc54e72e..00000000
Binary files a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-regular.woff and /dev/null differ
diff --git a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-regular.woff2 b/vendor/fonts/antonio/antonio-v1-latin-ext_latin-regular.woff2
deleted file mode 100644
index a147e3e1..00000000
Binary files a/vendor/fonts/antonio/antonio-v1-latin-ext_latin-regular.woff2 and /dev/null differ
diff --git a/vendor/fonts/antonio/antonio-v19-latin-100.woff2 b/vendor/fonts/antonio/antonio-v19-latin-100.woff2
new file mode 100644
index 00000000..80db6dbe
Binary files /dev/null and b/vendor/fonts/antonio/antonio-v19-latin-100.woff2 differ
diff --git a/vendor/fonts/antonio/antonio-v19-latin-700.woff2 b/vendor/fonts/antonio/antonio-v19-latin-700.woff2
new file mode 100644
index 00000000..caad247c
Binary files /dev/null and b/vendor/fonts/antonio/antonio-v19-latin-700.woff2 differ
diff --git a/vendor/fonts/antonio/antonio-v19-latin-regular.woff2 b/vendor/fonts/antonio/antonio-v19-latin-regular.woff2
new file mode 100644
index 00000000..133890b2
Binary files /dev/null and b/vendor/fonts/antonio/antonio-v19-latin-regular.woff2 differ
diff --git a/vendor/fonts/antonio/antonio.css b/vendor/fonts/antonio/antonio.css
index d815b152..1a9e6c62 100644
--- a/vendor/fonts/antonio/antonio.css
+++ b/vendor/fonts/antonio/antonio.css
@@ -1,32 +1,28 @@
-/* antonio-100 - latin-ext_latin */
+/* https://gwfh.mranftl.com/fonts/antonio?subsets=latin */
+
+/* antonio-100 - latin */
 @font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
   font-family: 'Antonio';
   font-style: normal;
   font-weight: 100;
-  font-display: swap;
-  src: local('Antonio Light'),
-       url('antonio-v1-latin-ext_latin-100.woff2') format('woff2'), /* Super Modern Browsers */
-       url('antonio-v1-latin-ext_latin-100.woff') format('woff') /* Modern Browsers */
+  src: url('antonio-v19-latin-100.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
 }
 
-/* antonio-regular - latin-ext_latin */
+/* antonio-regular - latin */
 @font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
   font-family: 'Antonio';
   font-style: normal;
   font-weight: 400;
-  font-display: swap;
-  src: local('Antonio'),
-       url('antonio-v1-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-       url('antonio-v1-latin-ext_latin-regular.woff') format('woff') /* Modern Browsers */
+  src: url('antonio-v19-latin-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
 }
 
-/* antonio-700 - latin-ext_latin */
+/* antonio-700 - latin */
 @font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
   font-family: 'Antonio';
   font-style: normal;
   font-weight: 700;
-  font-display: swap;
-  src: local('Antonio Bold'),
-       url('antonio-v1-latin-ext_latin-700.woff2') format('woff2'), /* Super Modern Browsers */
-       url('antonio-v1-latin-ext_latin-700.woff') format('woff') /* Modern Browsers */
+  src: url('antonio-v19-latin-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
 }
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-300.woff2 b/vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-300.woff2
similarity index 100%
rename from vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-300.woff2
rename to vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-300.woff2
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-300italic.woff2 b/vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-300italic.woff2
similarity index 100%
rename from vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-300italic.woff2
rename to vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-300italic.woff2
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-600.woff2 b/vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-600.woff2
similarity index 100%
rename from vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-600.woff2
rename to vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-600.woff2
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-600italic.woff2 b/vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-600italic.woff2
similarity index 100%
rename from vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-600italic.woff2
rename to vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-600italic.woff2
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-700.woff2 b/vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-700.woff2
similarity index 100%
rename from vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-700.woff2
rename to vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-700.woff2
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-italic.woff2 b/vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-italic.woff2
similarity index 100%
rename from vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-italic.woff2
rename to vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-italic.woff2
diff --git a/vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-regular.woff2 b/vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-regular.woff2
similarity index 100%
rename from vendor/fonts/SourceSansPro/source-sans-pro-v13-latin-regular.woff2
rename to vendor/fonts/source-sans-pro/source-sans-pro-v13-latin-regular.woff2
diff --git a/vendor/fonts/SourceSansPro/SourceSansPro.css b/vendor/fonts/source-sans-pro/source-sans-pro.css
similarity index 100%
rename from vendor/fonts/SourceSansPro/SourceSansPro.css
rename to vendor/fonts/source-sans-pro/source-sans-pro.css
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700.woff b/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700.woff
deleted file mode 100644
index 1b8d4c39..00000000
Binary files a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700.woff and /dev/null differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700.woff2 b/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700.woff2
deleted file mode 100644
index c4e173d8..00000000
Binary files a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700.woff2 and /dev/null differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700italic.woff b/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700italic.woff
deleted file mode 100644
index d36c4523..00000000
Binary files a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700italic.woff and /dev/null differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700italic.woff2 b/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700italic.woff2
deleted file mode 100644
index e4677046..00000000
Binary files a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700italic.woff2 and /dev/null differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-italic.woff b/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-italic.woff
deleted file mode 100644
index 52ee2a54..00000000
Binary files a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-italic.woff and /dev/null differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-italic.woff2 b/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-italic.woff2
deleted file mode 100644
index 88134fdb..00000000
Binary files a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-italic.woff2 and /dev/null differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-regular.woff b/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-regular.woff
deleted file mode 100644
index f1ef488a..00000000
Binary files a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-regular.woff and /dev/null differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-regular.woff2 b/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-regular.woff2
deleted file mode 100644
index aa01cf99..00000000
Binary files a/vendor/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-regular.woff2 and /dev/null differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-700.woff2 b/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-700.woff2
new file mode 100644
index 00000000..dd6e3fa3
Binary files /dev/null and b/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-700.woff2 differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-700italic.woff2 b/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-700italic.woff2
new file mode 100644
index 00000000..4c6ab75c
Binary files /dev/null and b/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-700italic.woff2 differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-italic.woff2 b/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-italic.woff2
new file mode 100644
index 00000000..367b7279
Binary files /dev/null and b/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-italic.woff2 differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-regular.woff2 b/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-regular.woff2
new file mode 100644
index 00000000..4df7d1e7
Binary files /dev/null and b/vendor/fonts/ubuntu-mono/ubuntu-mono-v17-latin-regular.woff2 differ
diff --git a/vendor/fonts/ubuntu-mono/ubuntu-mono.css b/vendor/fonts/ubuntu-mono/ubuntu-mono.css
index 0a9a77bb..82dedf5d 100644
--- a/vendor/fonts/ubuntu-mono/ubuntu-mono.css
+++ b/vendor/fonts/ubuntu-mono/ubuntu-mono.css
@@ -1,43 +1,37 @@
-/* ubuntu-mono-regular - latin-ext_latin */
+/* https://gwfh.mranftl.com/fonts/ubuntu-mono?subsets=latin */
+
+/* ubuntu-mono-regular - latin */
 @font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
   font-family: 'Ubuntu Mono';
   font-style: normal;
   font-weight: 400;
-  font-display: swap;
-  src: local(''),
-       url('ubuntu-mono-v10-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-       url('ubuntu-mono-v10-latin-ext_latin-regular.woff') format('woff') /* Modern Browsers */
+  src: url('ubuntu-mono-v17-latin-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
 }
 
-/* ubuntu-mono-italic - latin-ext_latin */
+/* ubuntu-mono-italic - latin */
 @font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
   font-family: 'Ubuntu Mono';
   font-style: italic;
   font-weight: 400;
-  font-display: swap;
-  src: local(''),
-       url('ubuntu-mono-v10-latin-ext_latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
-       url('ubuntu-mono-v10-latin-ext_latin-italic.woff') format('woff') /* Modern Browsers */
+  src: url('ubuntu-mono-v17-latin-italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
 }
 
-/* ubuntu-mono-700 - latin-ext_latin */
+/* ubuntu-mono-700 - latin */
 @font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
   font-family: 'Ubuntu Mono';
   font-style: normal;
   font-weight: 700;
-  font-display: swap;
-  src: local(''),
-       url('ubuntu-mono-v10-latin-ext_latin-700.woff2') format('woff2'), /* Super Modern Browsers */
-       url('ubuntu-mono-v10-latin-ext_latin-700.woff') format('woff') /* Modern Browsers */
+  src: url('ubuntu-mono-v17-latin-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
 }
 
-/* ubuntu-mono-700italic - latin-ext_latin */
+/* ubuntu-mono-700italic - latin */
 @font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
   font-family: 'Ubuntu Mono';
   font-style: italic;
   font-weight: 700;
-  font-display: swap;
-  src: local(''),
-       url('ubuntu-mono-v10-latin-ext_latin-700italic.woff2') format('woff2'), /* Super Modern Browsers */
-       url('ubuntu-mono-v10-latin-ext_latin-700italic.woff') format('woff') /* Modern Browsers */
+  src: url('ubuntu-mono-v17-latin-700italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
 }