diff --git a/.github/workflows/compile.yaml b/.github/workflows/compile.yaml
index fd0384b..5cd4644 100644
--- a/.github/workflows/compile.yaml
+++ b/.github/workflows/compile.yaml
@@ -8,7 +8,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
diff --git a/CYD-Klipper/boards/esp32-2432S028R.json b/CYD-Klipper/boards/esp32-2432S028R.json
index 1317137..640ec47 100644
--- a/CYD-Klipper/boards/esp32-2432S028R.json
+++ b/CYD-Klipper/boards/esp32-2432S028R.json
@@ -29,8 +29,8 @@
         "-DCYD_SCREEN_GAP_PX=8",
         "-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=35",
         "-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=35",
-        "-DCYD_SCREEN_FONT=&lv_font_montserrat_14",
-        "-DCYD_SCREEN_FONT_SMALL=&lv_font_montserrat_10",
+        "-DCYD_SCREEN_FONT=lv_font_montserrat_14",
+        "-DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_10",
         "-DCYD_SCREEN_SIDEBAR_SIZE_PX=40",
         "-DCYD_SCREEN_DRIVER_ESP32_2432S028R=1"
       ],
diff --git a/CYD-Klipper/boards/esp32-3248S035C.json b/CYD-Klipper/boards/esp32-3248S035C.json
index 1d0ebcf..d62a8bb 100644
--- a/CYD-Klipper/boards/esp32-3248S035C.json
+++ b/CYD-Klipper/boards/esp32-3248S035C.json
@@ -23,14 +23,14 @@
         "-DSPI_READ_FREQUENCY=20000000",
         "-DSPI_TOUCH_FREQUENCY=2500000",
         "-DTOUCH_CS=-1",
-        
+
         "-DCYD_SCREEN_HEIGHT_PX=320",
         "-DCYD_SCREEN_WIDTH_PX=480",
         "-DCYD_SCREEN_GAP_PX=10",
         "-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=40",
         "-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=40",
-        "-DCYD_SCREEN_FONT=&lv_font_montserrat_16",
-        "-DCYD_SCREEN_FONT_SMALL=&lv_font_montserrat_12",
+        "-DCYD_SCREEN_FONT=lv_font_montserrat_16",
+        "-DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_12",
         "-DCYD_SCREEN_SIDEBAR_SIZE_PX=50",
         "-DCYD_SCREEN_DRIVER_ESP32_3248S035C=1",
         "-DCYD_SCREEN_DISABLE_TOUCH_CALIBRATION=1"
diff --git a/CYD-Klipper/platformio.ini b/CYD-Klipper/platformio.ini
index 6aeaa23..e006454 100644
--- a/CYD-Klipper/platformio.ini
+++ b/CYD-Klipper/platformio.ini
@@ -51,7 +51,7 @@ lib_deps =
 # 	-DCYD_SCREEN_GAP_PX=10
 # 	-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=40
 # 	-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=40
-# 	-DCYD_SCREEN_FONT=&lv_font_montserrat_16
-# 	-DCYD_SCREEN_FONT_SMALL=&lv_font_montserrat_12
+# 	-DCYD_SCREEN_FONT=lv_font_montserrat_16
+# 	-DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_12
 # 	-DCYD_SCREEN_SIDEBAR_SIZE_PX=50
 # 	-DCYD_SCREEN_DRIVER_ESP32_SMARTDISPLAY=1
\ No newline at end of file
diff --git a/CYD-Klipper/src/core/lv_setup.cpp b/CYD-Klipper/src/core/lv_setup.cpp
index 2040bb1..4506d04 100644
--- a/CYD-Klipper/src/core/lv_setup.cpp
+++ b/CYD-Klipper/src/core/lv_setup.cpp
@@ -94,7 +94,7 @@ void set_color_scheme()
         main_color = lv_palette_main(color_defs[global_config.color_scheme].primary_color);
     }
 
-    lv_theme_t *theme = lv_theme_default_init(dispp, main_color, lv_palette_main(color_def.secondary_color), !global_config.lightMode, CYD_SCREEN_FONT);
+    lv_theme_t *theme = lv_theme_default_init(dispp, main_color, lv_palette_main(color_def.secondary_color), !global_config.lightMode, &CYD_SCREEN_FONT);
     lv_disp_set_theme(dispp, theme);
 }
 
@@ -103,7 +103,7 @@ static lv_indev_drv_read_cb_t original_driver = NULL;
 void lv_touch_intercept(lv_indev_drv_t *indev_driver, lv_indev_data_t *data) 
 {
     original_driver(indev_driver, data);
-    
+
     if (data->state == LV_INDEV_STATE_PR) {
         if (is_screen_asleep()) {
             while (data->state == LV_INDEV_STATE_PR) {
@@ -121,7 +121,7 @@ void lv_touch_intercept(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
 void lv_setup()
 {
     lv_style_init(&default_label_style);
-    lv_style_set_text_font(&default_label_style, CYD_SCREEN_FONT);
+    lv_style_set_text_font(&default_label_style, &CYD_SCREEN_FONT);
 
     screen_timer_setup();
     screen_timer_start();
diff --git a/CYD-Klipper/src/ui/nav_buttons.cpp b/CYD-Klipper/src/ui/nav_buttons.cpp
index 8639e1a..cc9796d 100644
--- a/CYD-Klipper/src/ui/nav_buttons.cpp
+++ b/CYD-Klipper/src/ui/nav_buttons.cpp
@@ -147,5 +147,5 @@ void nav_style_setup(){
     lv_style_set_radius(&nav_button_style, 0);
 
     lv_style_init(&nav_button_text_style);
-    lv_style_set_text_font(&nav_button_text_style, CYD_SCREEN_FONT_SMALL);
+    lv_style_set_text_font(&nav_button_text_style, &CYD_SCREEN_FONT_SMALL);
 }
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/panels/stats_panel.cpp b/CYD-Klipper/src/ui/panels/stats_panel.cpp
index b4f4adf..f28c03d 100644
--- a/CYD-Klipper/src/ui/panels/stats_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/stats_panel.cpp
@@ -194,7 +194,7 @@ void create_stat_text_block(lv_obj_t * root, const char* label, lv_event_cb_t va
 
     lv_obj_t * label_obj = lv_label_create_ex(panel);
     lv_label_set_text(label_obj, label);
-    lv_obj_set_style_text_font(label_obj, CYD_SCREEN_FONT_SMALL, 0);
+    lv_obj_set_style_text_font(label_obj, &CYD_SCREEN_FONT_SMALL, 0);
 
     lv_obj_t * value_obj = lv_label_create_ex(panel);
     lv_obj_add_event_cb(value_obj, value, LV_EVENT_MSG_RECEIVED, NULL);