diff --git a/Software/data_src/static/css/custom.css b/Software/data_src/static/css/custom.css
index 0f9a97c..cfa42fe 100644
--- a/Software/data_src/static/css/custom.css
+++ b/Software/data_src/static/css/custom.css
@@ -1,5 +1,4 @@
 /*! Themestr.app `Darkster` Bootstrap 4.3.1 theme */
-@import url(https://fonts.googleapis.com/css?family=Comfortaa:200,300,400,700);
 
 /*! Import Bootstrap 4 variables */
 /*!
diff --git a/Software/data_src/static/css/tweaks.css b/Software/data_src/static/css/tweaks.css
index 96dbcbe..cd008a9 100644
--- a/Software/data_src/static/css/tweaks.css
+++ b/Software/data_src/static/css/tweaks.css
@@ -1,3 +1,11 @@
+@font-face {
+    font-family: 'Comfortaa';
+    font-style: normal;
+    font-weight: 300;
+    src: url(../fonts/comfortaa.woff2) format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+  }
+
 body {
     padding-top: 70px;
 }
diff --git a/Software/data_src/static/fonts/comfortaa.woff2 b/Software/data_src/static/fonts/comfortaa.woff2
new file mode 100644
index 0000000..7879217
Binary files /dev/null and b/Software/data_src/static/fonts/comfortaa.woff2 differ
diff --git a/Software/prepare_littlefs.py b/Software/prepare_littlefs.py
index afec20b..a4b6bf1 100644
--- a/Software/prepare_littlefs.py
+++ b/Software/prepare_littlefs.py
@@ -44,7 +44,7 @@ def remove_prefix(text, prefix):
 
 def gzip_webfiles(source, target, env):
     # Filetypes to compress
-    filetypes_to_gzip = ['.css', '.png', '.js', '.ico']
+    filetypes_to_gzip = ['.css', '.png', '.js', '.ico', '.woff2']
     print('\nGZIP: Starting gzip-Process for LittleFS-Image...\n')
     data_src_dir_path = os.path.join(env.get('PROJECT_DIR'), 'data_src')
     data_dir_path = env.get('PROJECT_DATA_DIR')