41 files changed, 29 insertions, 347 deletions
diff --git a/package-lock.json b/package-lock.json
index 7b314f7..2bde488 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
         "videojs-mobile-ui": "^1.1.1"
       },
       "devDependencies": {
+        "@fontsource/nunito-sans": "^5.0.12",
         "@tailwindcss/forms": "^0.5.4",
         "autoprefixer": "^10.4.15",
         "copy-webpack-plugin": "^11.0.0",
@@ -101,6 +102,12 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@fontsource/nunito-sans": {
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/@fontsource/nunito-sans/-/nunito-sans-5.0.12.tgz",
+      "integrity": "sha512-ioEnbfAUb8D6sDa+mqNBBpFTDkydZ3Dwz9NRrEVJRJQe69SAgkeM6YaiWXmlKqWZksakw8KHM77aDWpUC0BUwg==",
+      "dev": true
+    },
     "node_modules/@fortawesome/fontawesome-free": {
       "version": "6.4.2",
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
diff --git a/package.json b/package.json
index 9ce6894..6880cee 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "videojs-mobile-ui": "^1.1.1"
   },
   "devDependencies": {
+    "@fontsource/nunito-sans": "^5.0.12",
     "@tailwindcss/forms": "^0.5.4",
     "autoprefixer": "^10.4.15",
     "copy-webpack-plugin": "^11.0.0",
diff --git a/resources/src/css/_typography.scss b/resources/src/css/_typography.scss
deleted file mode 100644
index a9e24c1..0000000
--- a/resources/src/css/_typography.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@font-face {
-  font-family: "nunito-light";
-  src: url("../fonts/nunito/Nunito-Light.ttf");
-}
-
-@font-face {
-  font-family: "nunito-semibold";
-  src: url("../fonts/nunito/Nunito-SemiBold.ttf");
-}
-
-@font-face {
-  font-family: "nunito-bold";
-  src: url("../fonts/nunito/Nunito-Bold.ttf");
-}
-
-@font-face {
-  font-family: "roboto-light";
-  src: url("../fonts/roboto/Roboto-Light.ttf");
-}
-
-@font-face {
-  font-family: "roboto-regular";
-  src: url("../fonts/roboto/Roboto-Regular.ttf");
-}
-
-@font-face {
-  font-family: "roboto-medium";
-  src: url("../fonts/roboto/Roboto-Medium.ttf");
-}
diff --git a/resources/src/css/_variables.scss b/resources/src/css/_variables.scss
deleted file mode 100644
index 000dd04..0000000
--- a/resources/src/css/_variables.scss
+++ /dev/null
@@ -1 +0,0 @@
-$fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
diff --git a/resources/src/fonts/nunito/Nunito-Black.ttf b/resources/src/fonts/nunito/Nunito-Black.ttf
deleted file mode 100755
index 4d2b70e..0000000
--- a/resources/src/fonts/nunito/Nunito-Black.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-BlackItalic.ttf b/resources/src/fonts/nunito/Nunito-BlackItalic.ttf
deleted file mode 100755
index 4d778a8..0000000
--- a/resources/src/fonts/nunito/Nunito-BlackItalic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-Bold.ttf b/resources/src/fonts/nunito/Nunito-Bold.ttf
deleted file mode 100755
index b5466f7..0000000
--- a/resources/src/fonts/nunito/Nunito-Bold.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-BoldItalic.ttf b/resources/src/fonts/nunito/Nunito-BoldItalic.ttf
deleted file mode 100755
index 1a2d897..0000000
--- a/resources/src/fonts/nunito/Nunito-BoldItalic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-ExtraBold.ttf b/resources/src/fonts/nunito/Nunito-ExtraBold.ttf
deleted file mode 100755
index 36b15a3..0000000
--- a/resources/src/fonts/nunito/Nunito-ExtraBold.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-ExtraBoldItalic.ttf b/resources/src/fonts/nunito/Nunito-ExtraBoldItalic.ttf
deleted file mode 100755
index ac6b031..0000000
--- a/resources/src/fonts/nunito/Nunito-ExtraBoldItalic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-ExtraLight.ttf b/resources/src/fonts/nunito/Nunito-ExtraLight.ttf
deleted file mode 100755
index aff8d33..0000000
--- a/resources/src/fonts/nunito/Nunito-ExtraLight.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-ExtraLightItalic.ttf b/resources/src/fonts/nunito/Nunito-ExtraLightItalic.ttf
deleted file mode 100755
index 962082c..0000000
--- a/resources/src/fonts/nunito/Nunito-ExtraLightItalic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-Italic.ttf b/resources/src/fonts/nunito/Nunito-Italic.ttf
deleted file mode 100755
index f8c2f38..0000000
--- a/resources/src/fonts/nunito/Nunito-Italic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-Light.ttf b/resources/src/fonts/nunito/Nunito-Light.ttf
deleted file mode 100755
index 8e71c1f..0000000
--- a/resources/src/fonts/nunito/Nunito-Light.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-LightItalic.ttf b/resources/src/fonts/nunito/Nunito-LightItalic.ttf
deleted file mode 100755
index 024ccfa..0000000
--- a/resources/src/fonts/nunito/Nunito-LightItalic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-Regular.ttf b/resources/src/fonts/nunito/Nunito-Regular.ttf
deleted file mode 100755
index fdeb018..0000000
--- a/resources/src/fonts/nunito/Nunito-Regular.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-SemiBold.ttf b/resources/src/fonts/nunito/Nunito-SemiBold.ttf
deleted file mode 100755
index 59c41e6..0000000
--- a/resources/src/fonts/nunito/Nunito-SemiBold.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/Nunito-SemiBoldItalic.ttf b/resources/src/fonts/nunito/Nunito-SemiBoldItalic.ttf
deleted file mode 100755
index 74099e5..0000000
--- a/resources/src/fonts/nunito/Nunito-SemiBoldItalic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/nunito/OFL.txt b/resources/src/fonts/nunito/OFL.txt
deleted file mode 100755
index 2be8f77..0000000
--- a/resources/src/fonts/nunito/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2014 The Nunito Project Authors (https://github.com/googlefonts/NunitoFont)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/resources/src/fonts/roboto/LICENSE.txt b/resources/src/fonts/roboto/LICENSE.txt
deleted file mode 100755
index 75b5248..0000000
--- a/resources/src/fonts/roboto/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/resources/src/fonts/roboto/Roboto-Black.ttf b/resources/src/fonts/roboto/Roboto-Black.ttf
deleted file mode 100755
index 2d45238..0000000
--- a/resources/src/fonts/roboto/Roboto-Black.ttf
+++ /dev/null
diff --git a/resources/src/fonts/roboto/Roboto-BlackItalic.ttf b/resources/src/fonts/roboto/Roboto-BlackItalic.ttf
deleted file mode 100755
index 29a4359..0000000
--- a/resources/src/fonts/roboto/Roboto-BlackItalic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/roboto/Roboto-Bold.ttf b/resources/src/fonts/roboto/Roboto-Bold.ttf
deleted file mode 100755
index d998cf5..0000000
--- a/resources/src/fonts/roboto/Roboto-Bold.ttf
+++ /dev/null
diff --git a/resources/src/fonts/roboto/Roboto-BoldItalic.ttf b/resources/src/fonts/roboto/Roboto-BoldItalic.ttf
deleted file mode 100755
index b4e2210..0000000
--- a/resources/src/fonts/roboto/Roboto-BoldItalic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/roboto/Roboto-Italic.ttf b/resources/src/fonts/roboto/Roboto-Italic.ttf
deleted file mode 100755
index 5b390ff..0000000
--- a/resources/src/fonts/roboto/Roboto-Italic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/roboto/Roboto-Light.ttf b/resources/src/fonts/roboto/Roboto-Light.ttf
deleted file mode 100755
index 3526798..0000000
--- a/resources/src/fonts/roboto/Roboto-Light.ttf
+++ /dev/null
diff --git a/resources/src/fonts/roboto/Roboto-LightItalic.ttf b/resources/src/fonts/roboto/Roboto-LightItalic.ttf
deleted file mode 100755
index 46e9bf7..0000000
--- a/resources/src/fonts/roboto/Roboto-LightItalic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/roboto/Roboto-Medium.ttf b/resources/src/fonts/roboto/Roboto-Medium.ttf
deleted file mode 100755
index f714a51..0000000
--- a/resources/src/fonts/roboto/Roboto-Medium.ttf
+++ /dev/null
diff --git a/resources/src/fonts/roboto/Roboto-MediumItalic.ttf b/resources/src/fonts/roboto/Roboto-MediumItalic.ttf
deleted file mode 100755
index 5dc6a2d..0000000
--- a/resources/src/fonts/roboto/Roboto-MediumItalic.ttf
+++ /dev/null
diff --git a/resources/src/fonts/roboto/Roboto-Regular.ttf b/resources/src/fonts/roboto/Roboto-Regular.ttf
deleted file mode 100755
index 2b6392f..0000000
--- a/resources/src/fonts/roboto/Roboto-Regular.ttf
+++ /dev/null
diff --git a/resources/src/fonts/roboto/Roboto-Thin.ttf b/resources/src/fonts/roboto/Roboto-Thin.ttf
deleted file mode 100755
index 4e797cf..0000000
--- a/resources/src/fonts/roboto/Roboto-Thin.ttf
+++ /dev/null
diff --git a/resources/src/fonts/roboto/Roboto-ThinItalic.ttf b/resources/src/fonts/roboto/Roboto-ThinItalic.ttf
deleted file mode 100755
index eea836f..0000000
--- a/resources/src/fonts/roboto/Roboto-ThinItalic.ttf
+++ /dev/null
diff --git a/resources/src/styles/tubo.scss b/resources/src/styles/tubo.scss
index 2ab74f3..1e3150d 100644
--- a/resources/src/styles/tubo.scss
+++ b/resources/src/styles/tubo.scss
@@ -1,5 +1,7 @@
-@import "typography";
-@import "variables";
+@use "@fontsource/nunito-sans/scss/mixins" as NunitoSans;
+$fontsourceDir: "~@fontsource";
+@include NunitoSans.faces($weights: (200, 300, 400, 500, 600, 700, 800, 900));
+$fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
 @import "@fortawesome/fontawesome-free/scss/brands";
 @import "@fortawesome/fontawesome-free/scss/regular";
 @import "@fortawesome/fontawesome-free/scss/solid";
diff --git a/src/frontend/tubo/components/items.cljs b/src/frontend/tubo/components/items.cljs
index cdc062d..79599a3 100644
--- a/src/frontend/tubo/components/items.cljs
+++ b/src/frontend/tubo/components/items.cljs
@@ -51,7 +51,7 @@
           [:div.flex.items-center.my-2
            (if uploader-url
              [:a {:href (rfe/href :tubo.routes/channel nil {:url uploader-url}) :title uploader-name}
-              [:h1.line-clamp-1.text-neutral-800.dark:text-gray-300.font-bold.pr-2.break-all
+              [:h1.line-clamp-1.text-neutral-800.dark:text-gray-300.font-semibold.pr-2.break-all
                {:class "[overflow-wrap:anywhere]"}
                uploader-name]]
              [:h1.line-clamp-1.text-neutral-800.dark:text-gray-300.font-bold.pr-2 uploader-name])
diff --git a/src/frontend/tubo/components/layout.cljs b/src/frontend/tubo/components/layout.cljs
index 0b894ec..ca1ee08 100644
--- a/src/frontend/tubo/components/layout.cljs
+++ b/src/frontend/tubo/components/layout.cljs
@@ -54,7 +54,7 @@
 (defn content-header
   [heading & children]
   [:div.flex.items-center.justify-between.mt-6
-   [:h1.text-3xl.font-nunito-semibold.line-clamp-1.mr-6
+   [:h1.text-3xl.line-clamp-1.mr-6.font-semibold
     {:title heading}
     heading]
    (map-indexed #(with-meta %2 {:key %1}) children)])
@@ -118,7 +118,7 @@
 (defn select-input
   [label key value options on-change]
   [generic-input label
-   [:select.focus:ring-transparent.bg-transparent.font-bold.font-nunito
+   [:select.focus:ring-transparent.bg-transparent.font-bold
     {:value     value
      :on-change on-change}
     (for [[i option] (map-indexed vector options)]
diff --git a/src/frontend/tubo/components/modal.cljs b/src/frontend/tubo/components/modal.cljs
index fcb8463..0624856 100644
--- a/src/frontend/tubo/components/modal.cljs
+++ b/src/frontend/tubo/components/modal.cljs
@@ -7,7 +7,7 @@
   [title body & extra-buttons]
   [:div.bg-white.max-h-full.dark:bg-neutral-900.z-20.p-5.rounded.flex.gap-y-5.flex-col.border.border-neutral-300.dark:border-stone-700.flex-auto.shrink-0
    [:div.flex.justify-between.shrink-0
-    [:h1.text-xl.font-nunito-semibold title]
+    [:h1.text-xl.font-semibold title]
     [:button {:on-click #(rf/dispatch [:tubo.events/close-modal])}
      [:i.fa-solid.fa-close]]]
    [:div.flex-auto.overflow-y-auto body]
diff --git a/src/frontend/tubo/components/navigation.cljs b/src/frontend/tubo/components/navigation.cljs
index cfa5345..f30f183 100644
--- a/src/frontend/tubo/components/navigation.cljs
+++ b/src/frontend/tubo/components/navigation.cljs
@@ -56,7 +56,7 @@
   [:div.relative.flex.flex-col.items-center-justify-center.text-white.px-2
    {:style {:background service-color}}
    [:div.w-full.box-border.z-10.lg:z-0
-    [:select.border-none.focus:ring-transparent.bg-blend-color-dodge.font-bold.font-nunito.w-full
+    [:select.border-none.focus:ring-transparent.bg-blend-color-dodge.font-bold.w-full
      {:on-change #(rf/dispatch [::events/change-service-kiosk (js/parseInt (.. % -target -value))])
       :value     service-id
       :style     {:background "transparent"}}
@@ -104,12 +104,12 @@
    [layout/focus-overlay #(rf/dispatch [::events/toggle-mobile-nav]) show-mobile-nav?]
    [:div.fixed.overflow-x-hidden.min-h-screen.w-60.top-0.ease-in-out.delay-75.bg-white.dark:bg-neutral-900.z-20
     {:class (str "transition-[right] " (if show-mobile-nav? "right-0" "right-[-245px]"))}
-     [:h3.text-3xl.font-bold.px-4.font-roboto "Tubo"]]
     [:div.flex.justify-center.py-4.items-center.text-white {:style {:background service-color}}
      [layout/logo :height 75 :width 75]
+     [:h3.text-3xl.font-bold "Tubo"]]
     [services-dropdown services service-id service-color]
     [:div.relative.py-4
-     [:ul.flex.font-roboto.flex-col
+     [:ul.flex.flex-col
       (for [kiosk available-kiosks]
         ^{:key kiosk}
         [mobile-nav-item
@@ -120,7 +120,7 @@
          :active? (kiosk-active? (assoc kiosk-args :kiosk kiosk))])]]
     [:div.relative.dark:border-neutral-800.border-gray-300.pt-4
      {:class "border-t-[1px]"}
-     [:ul.flex.flex-col.font-roboto
+     [:ul.flex.flex-col
       [mobile-nav-item (rfe/href ::routes/bookmarks) "fa-solid fa-bookmark" "Bookmarks"]
       [mobile-nav-item (rfe/href ::routes/settings) "fa-solid fa-cog" "Settings"]
       [mobile-nav-item "https://github.com/migalmoreno/tubo"
@@ -136,7 +136,7 @@
         show-mobile-nav?                         @(rf/subscribe [:show-mobile-nav])
         show-search-form?                        @(rf/subscribe [:show-search-form])
         {:keys [available-kiosks default-kiosk]} @(rf/subscribe [:kiosks])]
-    [:nav.sticky.flex.items-center.px-2.h-14.top-0.z-20.font-nunito
+    [:nav.sticky.flex.items-center.px-2.h-14.top-0.z-20
      {:style {:background service-color}}
      [:div.flex.flex-auto.items-center
       [:div.ml-2
diff --git a/src/frontend/tubo/views.cljs b/src/frontend/tubo/views.cljs
index 3abc4e2..25070da 100644
--- a/src/frontend/tubo/views.cljs
+++ b/src/frontend/tubo/views.cljs
@@ -12,10 +12,10 @@
   (let [current-match   @(rf/subscribe [:current-match])
         {:keys [theme]} @(rf/subscribe [:settings])]
     [:div {:class (when (= theme "dark") "dark")}
-     [:div.min-h-screen.flex.flex-col.h-full.dark:text-white.dark:bg-neutral-900.relative
+     [:div.min-h-screen.flex.flex-col.h-full.dark:text-white.dark:bg-neutral-900.relative.font-nunito-sans
       [navigation/navbar current-match]
-      [:div.flex.flex-col.flex-auto.justify-between.relative.font-nunito
       [notification/notifications-panel]
+      [:div.flex.flex-col.flex-auto.justify-between.relative
        (when-let [view (-> current-match :data :view)]
          [view current-match])
        [queue/queue]
diff --git a/src/frontend/tubo/views/channel.cljs b/src/frontend/tubo/views/channel.cljs
index 30eab12..6fc61fc 100644
--- a/src/frontend/tubo/views/channel.cljs
+++ b/src/frontend/tubo/views/channel.cljs
@@ -27,7 +27,7 @@
               [:div.flex.items-center.my-4.mx-2
                [layout/uploader-avatar avatar name]
                [:div.m-4
-                [:h1.text-2xl.font-nunito-semibold.line-clamp-1 name]
+                [:h1.text-2xl.line-clamp-1.font-semibold {:title name} name]
                 (when subscriber-count
                   [:div.flex.my-2.items-center
                    [:i.fa-solid.fa-users.text-xs]
diff --git a/src/frontend/tubo/views/stream.cljs b/src/frontend/tubo/views/stream.cljs
index bc0fd5e..097ff90 100644
--- a/src/frontend/tubo/views/stream.cljs
+++ b/src/frontend/tubo/views/stream.cljs
@@ -60,7 +60,7 @@
           [:div.flex.flex-col
            [:div.flex.items-center.justify-between.pt-4.my-3
             [:div.flex-auto
-             [:h1.text-lg.sm:text-2xl.font-nunito-bold.line-clamp-1 name]]
+             [:h1.text-lg.sm:text-2xl.font-bold.line-clamp-1 {:title name} name]]
             [:div.flex.flex-auto.justify-end.items-center
              [layout/popover-menu !stream-menu-active?
               [{:label    "Add to queue"
@@ -86,8 +86,9 @@
              [layout/uploader-avatar uploader-avatar uploader-name
               (rfe/href :tubo.routes/channel nil {:url uploader-url})]
              [:div.mx-3
-              [:a.line-clamp-1.font-nunito-semibold
-               {:href (rfe/href :tubo.routes/channel nil {:url uploader-url})}
+              [:a.line-clamp-1.font-semibold
+               {:href  (rfe/href :tubo.routes/channel nil {:url uploader-url})
+                :title uploader-name}
                uploader-name]
               (when subscriber-count
                 [:div.flex.my-2.items-center
diff --git a/tailwind.config.js b/tailwind.config.js
index a8bd0a8..917f2cf 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -5,11 +5,7 @@ module.exports = {
   theme: {
     extend: {
       fontFamily: {
-        "nunito": ["nunito-light", "sans-serif"],
-        "nunito-semibold": ["nunito-semibold", "sans-serif"],
-        "nunito-bold": ["nunito-bold", "sans-serif"],
-        "roboto": ["roboto-light", "sans-serif"],
-        "roboto-medium": ["roboto-medium", "sans-serif"],
+        "nunito-sans": ["Nunito Sans", "sans-serif"],
       },
       screens: {
         "xs": "480px",