diff --git a/src/font/encodings.json b/src/font/encodings.json
index a2f1a0b7..1140c6ca 100644
--- a/src/font/encodings.json
+++ b/src/font/encodings.json
@@ -304,7 +304,7 @@
             "Micro sign": "0xB5",
             "Multiplication sign": "0xD7",
             "Division sign": "0xF7",
-            "A": "0x0386",
+            "Greek Capital Letter Alpha with Tonos": "0x0386",
             "Greek capital letters": "0x388-0x3A9",
             "Greek small letters": "0x3AC-0x3CE",
             // "Greek Theta Symbol": "0x03D1",
diff --git a/src/hasp/hasp.cpp b/src/hasp/hasp.cpp
index d4a173c6..9d8ea921 100644
--- a/src/hasp/hasp.cpp
+++ b/src/hasp/hasp.cpp
@@ -3,6 +3,7 @@
 
 #include "hasplib.h"
 #include "dev/device.h"
+#include "lv_datetime.h"
 
 #ifdef ARDUINO
 #include "ArduinoLog.h"
@@ -441,10 +442,10 @@ void haspSetup(void)
 #endif
 #endif
 
-    if(haspFonts[0] == nullptr) haspFonts[0] = &HASP_FONT_1; // LV_THEME_DEFAULT_FONT_SMALL;
-    if(haspFonts[1] == nullptr) haspFonts[1] = &HASP_FONT_2; // LV_THEME_DEFAULT_FONT_NORMAL;
-    if(haspFonts[2] == nullptr) haspFonts[2] = &HASP_FONT_3; // LV_THEME_DEFAULT_FONT_SUBTITLE;
-    if(haspFonts[3] == nullptr) haspFonts[3] = &HASP_FONT_4; // LV_THEME_DEFAULT_FONT_TITLE;
+    if(haspFonts[0] == nullptr) haspFonts[0] = LV_THEME_DEFAULT_FONT_SMALL;
+    if(haspFonts[1] == nullptr) haspFonts[1] = LV_THEME_DEFAULT_FONT_NORMAL;
+    if(haspFonts[2] == nullptr) haspFonts[2] = LV_THEME_DEFAULT_FONT_SUBTITLE;
+    if(haspFonts[3] == nullptr) haspFonts[3] = LV_THEME_DEFAULT_FONT_TITLE;
 
     // haspFonts[0] = lv_font_load("E:/font_1.fnt");
     // haspFonts[2] = lv_font_load("E:/font_2.fnt");